Skip to content

Commit 52f2f14

Browse files
authored
Merge branch 'main' into refactor-repeat-n
2 parents 42c7641 + 89022a8 commit 52f2f14

2 files changed

Lines changed: 10 additions & 18 deletions

File tree

.github/workflows/ci.cpu.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@ jobs:
6868
SCCACHE_SERVER_LOG: "sccache=debug"
6969
SCCACHE_SERVER_PORT: "4225"
7070
run: |
71-
set -ex;
71+
set -e;
72+
source /etc/profile
73+
set -x;
7274
73-
devcontainer-utils-install-sccache --repo rapidsai/sccache --version rapids;
7475
devcontainer-utils-init-sccache-dist \
7576
--enable-sccache-dist - <<< " \
7677
--auth-type 'token' \

.github/workflows/ci.gpu.yml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include:
23-
- { name: "clang 21", cuda: "12.0", cxx: "clang++", build: "Release", tag: "llvm21-cuda12.0", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
24-
- { name: "clang 21", cuda: "12.9", cxx: "clang++", build: "Release", tag: "llvm21-cuda12.9", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
25-
- { name: "nvc++ 25.7", cuda: "12.9", cxx: "mpic++", build: "Release", tag: "nvhpc25.7", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
26-
- { name: "nvc++ 25.7", cuda: "12.9", cxx: "mpic++", build: "Debug", tag: "nvhpc25.7", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
27-
- { name: "nvc++ 25.9", cuda: "12.9", cxx: "mpic++", build: "Release", tag: "nvhpc25.9", gpu: "l4", sm: "75", driver: "latest", arch: "amd64" }
28-
- { name: "nvc++ 25.9", cuda: "12.9", cxx: "mpic++", build: "Debug", tag: "nvhpc25.9", gpu: "l4", sm: "75", driver: "latest", arch: "amd64" }
23+
- { name: "clang 21", cuda: "12.0", cxx: "clang++", build: "Release", tag: "llvm21-cuda12.0", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
24+
- { name: "clang 21", cuda: "12.9", cxx: "clang++", build: "Release", tag: "llvm21-cuda12.9", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
25+
- { name: "nvc++ 25.9", cuda: "12.9", cxx: "mpic++", build: "Release", tag: "nvhpc25.9", gpu: "l4", sm: "75", driver: "latest", arch: "amd64" }
26+
- { name: "nvc++ 25.9", cuda: "12.9", cxx: "mpic++", build: "Debug", tag: "nvhpc25.9", gpu: "l4", sm: "75", driver: "latest", arch: "amd64" }
27+
- { name: "nvc++ 25.11", cuda: "13.0", cxx: "mpic++", build: "Release", tag: "nvhpc25.11", gpu: "l4", sm: "75", driver: "latest", arch: "amd64" }
28+
- { name: "nvc++ 25.11", cuda: "13.0", cxx: "mpic++", build: "Debug", tag: "nvhpc25.11", gpu: "l4", sm: "75", driver: "latest", arch: "amd64" }
2929
runs-on: linux-${{ matrix.arch }}-gpu-${{ matrix.gpu }}-${{ matrix.driver }}-1
3030
container:
3131
options: -u root
@@ -73,18 +73,9 @@ jobs:
7373
SCCACHE_SERVER_PORT: "4225"
7474
run: |
7575
set -e;
76-
77-
if test -n "${NVHPC_ROOT:+x}"; then
78-
HPCX_INIT="$(find -L "$NVHPC_ROOT"/comm_libs/ -path '*/latest/hpcx-init.sh')";
79-
if test -n "${HPCX_INIT:+x}"; then
80-
. "$HPCX_INIT";
81-
hpcx_load;
82-
fi
83-
fi
84-
76+
source /etc/profile
8577
set -x;
8678
87-
devcontainer-utils-install-sccache --repo rapidsai/sccache --version rapids;
8879
devcontainer-utils-init-sccache-dist \
8980
--enable-sccache-dist - <<< " \
9081
--auth-type 'token' \

0 commit comments

Comments
 (0)