Skip to content

Commit 32f4e36

Browse files
committed
Enable libfabric testing on alps machines
1 parent c421973 commit 32f4e36

1 file changed

Lines changed: 49 additions & 38 deletions

File tree

.cscs-ci/default.yaml

Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include:
2-
- remote: 'https://gitlab.com/cscs-ci/recipes/-/raw/master/templates/v2/.ci-ext.yml'
2+
- remote: "https://gitlab.com/cscs-ci/recipes/-/raw/master/templates/v2/.ci-ext.yml"
33

44
variables:
55
BASE_IMAGE: jfrog.svc.cscs.ch/docker-group-csstaff/alps-images/ngc-pytorch:26.01-py3-alps4-dev
@@ -10,16 +10,22 @@ variables:
1010
.build_deps_template:
1111
timeout: 1 hour
1212
before_script:
13-
- echo $DOCKERHUB_TOKEN | podman login docker.io -u $DOCKERHUB_USERNAME --password-stdin || true
14-
- export DOCKERFILE_SHA=`sha256sum .cscs-ci/container/deps.Containerfile | head -c 16`
13+
- echo $DOCKERHUB_TOKEN | podman login docker.io -u $DOCKERHUB_USERNAME
14+
--password-stdin || true
15+
- export DOCKERFILE_SHA=`sha256sum .cscs-ci/container/deps.Containerfile |
16+
head -c 16`
1517
- export ENV_FILE_SHA=`sha256sum ${SPACK_ENV_FILE} | head -c 16`
16-
- export CONFIG_TAG=`echo $DOCKERFILE_SHA-$BASE_IMAGE-$SPACK_SHA-$SPACK_PACKAGES_SHA-$ENV_FILE_SHA | sha256sum - | head -c 16`
17-
- export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/public/oomph-spack-deps-$BACKEND:$CONFIG_TAG
18+
- export CONFIG_TAG=`echo
19+
$DOCKERFILE_SHA-$BASE_IMAGE-$SPACK_SHA-$SPACK_PACKAGES_SHA-$ENV_FILE_SHA |
20+
sha256sum - | head -c 16`
21+
- export
22+
PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/public/oomph-spack-deps-$BACKEND:$CONFIG_TAG
1823
- echo -e "CONFIG_TAG=$CONFIG_TAG" >> base-${BACKEND}.env
1924
- echo -e "DEPS_IMAGE=$PERSIST_IMAGE_NAME" >> base-${BACKEND}.env
2025
variables:
2126
DOCKERFILE: .cscs-ci/container/deps.Containerfile
22-
DOCKER_BUILD_ARGS: '["BASE_IMAGE", "SPACK_SHA", "SPACK_PACKAGES_SHA", "SPACK_ENV_FILE"]'
27+
DOCKER_BUILD_ARGS: "[\"BASE_IMAGE\", \"SPACK_SHA\", \"SPACK_PACKAGES_SHA\",
28+
\"SPACK_ENV_FILE\"]"
2329
SPACK_ENV_FILE: .cscs-ci/spack/$BACKEND.yaml
2430
artifacts:
2531
reports:
@@ -48,23 +54,25 @@ build_deps_ucx:
4854
- .build_deps_template
4955

5056
# TODO: Libfabric tests are currently failing on Alps and need to be fixed.
51-
# build_deps_libfabric:
52-
# variables:
53-
# BACKEND: libfabric
54-
# extends:
55-
# - .container-builder-cscs-gh200
56-
# - .build_deps_template
57+
build_deps_libfabric:
58+
variables:
59+
BACKEND: libfabric
60+
extends:
61+
- .container-builder-cscs-gh200
62+
- .build_deps_template
5763

5864
.build_template:
5965
extends: .container-builder-cscs-gh200
6066
timeout: 15 minutes
6167
before_script:
62-
- echo $DOCKERHUB_TOKEN | podman login docker.io -u $DOCKERHUB_USERNAME --password-stdin || true
63-
- export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/public/oomph-build-$BACKEND:$CI_COMMIT_SHA
68+
- echo $DOCKERHUB_TOKEN | podman login docker.io -u $DOCKERHUB_USERNAME
69+
--password-stdin || true
70+
- export
71+
PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/public/oomph-build-$BACKEND:$CI_COMMIT_SHA
6472
- echo -e "BUILD_IMAGE=$PERSIST_IMAGE_NAME" >> build-${BACKEND}.env
6573
variables:
6674
DOCKERFILE: .cscs-ci/container/build.Containerfile
67-
DOCKER_BUILD_ARGS: '["DEPS_IMAGE", "BACKEND"]'
75+
DOCKER_BUILD_ARGS: "[\"DEPS_IMAGE\", \"BACKEND\"]"
6876
artifacts:
6977
reports:
7078
dotenv: build-${BACKEND}.env
@@ -95,20 +103,20 @@ build_ucx:
95103
artifacts: true
96104

97105
# TODO: Libfabric tests are currently failing on Alps and need to be fixed.
98-
# build_libfabric:
99-
# variables:
100-
# BACKEND: libfabric
101-
# extends: .build_template
102-
# needs:
103-
# - job: build_deps_libfabric
104-
# artifacts: true
106+
build_libfabric:
107+
variables:
108+
BACKEND: libfabric
109+
extends: .build_template
110+
needs:
111+
- job: build_deps_libfabric
112+
artifacts: true
105113

106114
.test_template_base:
107115
extends: .container-runner-clariden-gh200
108116
variables:
109117
SLURM_JOB_NUM_NODES: 1
110118
SLURM_GPUS_PER_TASK: 1
111-
SLURM_TIMELIMIT: '5:00'
119+
SLURM_TIMELIMIT: "5:00"
112120
SLURM_PARTITION: normal
113121
SLURM_MPI_TYPE: pmix
114122
SLURM_NETWORK: disable_rdzv_get
@@ -123,7 +131,8 @@ build_ucx:
123131
variables:
124132
SLURM_NTASKS: 1
125133
script:
126-
- ctest --test-dir /oomph/build -L "serial" --output-on-failure --timeout 60 --parallel 8
134+
- ctest --test-dir /oomph/build -L "serial" --output-on-failure --timeout 60
135+
--parallel 8
127136

128137
.test_parallel_template:
129138
extends: .test_template_base
@@ -132,9 +141,11 @@ build_ucx:
132141
script:
133142
# All ranks write to ctest files in Testing, but this can deadlock when
134143
# writing inside the container.
135-
- if [[ "${SLURM_PROCID}" == 0 ]]; then rm -rf /oomph/build/Testing; mkdir /tmp/Testing; ln -s /tmp/Testing /oomph/build/Testing; fi
144+
- if [[ "${SLURM_PROCID}" == 0 ]]; then rm -rf /oomph/build/Testing; mkdir
145+
/tmp/Testing; ln -s /tmp/Testing /oomph/build/Testing; fi
136146
- sleep 1
137-
- ctest --test-dir /oomph/build -L "parallel-ranks-4" --output-on-failure --timeout 60
147+
- ctest --test-dir /oomph/build -L "parallel-ranks-4" --output-on-failure
148+
--timeout 60
138149

139150
# TODO: NCCL will be enabled in https://github.com/ghex-org/oomph/pull/55
140151
# test_serial_nccl:
@@ -180,16 +191,16 @@ test_parallel_ucx:
180191
image: $BUILD_IMAGE
181192

182193
# TODO: Libfabric tests are currently failing on Alps and need to be fixed.
183-
# test_serial_libfabric:
184-
# extends: .test_serial_template
185-
# needs:
186-
# - job: build_libfabric
187-
# artifacts: true
188-
# image: $BUILD_IMAGE
194+
test_serial_libfabric:
195+
extends: .test_serial_template
196+
needs:
197+
- job: build_libfabric
198+
artifacts: true
199+
image: $BUILD_IMAGE
189200

190-
# test_parallel_libfabric:
191-
# extends: .test_parallel_template
192-
# needs:
193-
# - job: build_libfabric
194-
# artifacts: true
195-
# image: $BUILD_IMAGE
201+
test_parallel_libfabric:
202+
extends: .test_parallel_template
203+
needs:
204+
- job: build_libfabric
205+
artifacts: true
206+
image: $BUILD_IMAGE

0 commit comments

Comments
 (0)