Skip to content

Commit 5b274fb

Browse files
committed
Make sure we check the EB CUDA settings for all cases
1 parent 2ea186d commit 5b274fb

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.github/workflows/tests_eessi_extend_module.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,11 @@ jobs:
177177
export EESSI_CVMFS_INSTALL=1
178178
module load EESSI-extend/${{matrix.eessi_version}}-easybuild
179179
check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SOFTWARE_PATH" # installation path should be the same unless we ask for an explicit GPU installation
180-
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
180+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
181181
export EESSI_ACCELERATOR_INSTALL=1
182182
module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
183183
check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
184+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
184185
# unload and make sure the environment is clean again
185186
module unload EESSI-extend
186187
check_disallowed_env_prefix EASYBUILD_
@@ -191,10 +192,11 @@ jobs:
191192
export EESSI_SITE_INSTALL=1
192193
module load EESSI-extend/${{matrix.eessi_version}}-easybuild
193194
check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SITE_SOFTWARE_PATH" # installation path should be the same unless we ask for an explicit GPU installation
194-
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
195+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
195196
export EESSI_ACCELERATOR_INSTALL=1
196197
module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
197198
check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SITE_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
199+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
198200
# unload and make sure the environment is clean again
199201
module unload EESSI-extend
200202
check_disallowed_env_prefix EASYBUILD_
@@ -206,10 +208,11 @@ jobs:
206208
export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
207209
module load EESSI-extend/${{matrix.eessi_version}}-easybuild
208210
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same unless we ask for an explicit GPU installation
209-
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
211+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
210212
export EESSI_ACCELERATOR_INSTALL=1
211213
module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an GPU actual installation
212214
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same for project case
215+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
213216
# unload and make sure the environment is clean again
214217
module unload EESSI-extend
215218
check_disallowed_env_prefix EASYBUILD_
@@ -224,10 +227,11 @@ jobs:
224227
export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/$USER/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
225228
module load EESSI-extend/${{matrix.eessi_version}}-easybuild
226229
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same unless we ask for an explicit GPU installation
227-
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
230+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
228231
export EESSI_ACCELERATOR_INSTALL=1
229232
module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
230233
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same for user case
234+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
231235
# unload and make sure the environment is clean again
232236
module unload EESSI-extend
233237
check_disallowed_env_prefix EASYBUILD_

0 commit comments

Comments
 (0)