Skip to content

Commit 9013873

Browse files
committed
Add some more verbose checks
1 parent 4218a7a commit 9013873

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

.github/workflows/tests_eessi_extend_module.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,13 @@ jobs:
182182
export EESSI_CVMFS_INSTALL=1
183183
module load EESSI-extend/${{matrix.eessi_version}}-easybuild
184184
check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SOFTWARE_PATH" # installation path should be the same unless we ask for an explicit GPU installation
185+
check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
185186
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
186187
module unload EESSI-extend
187188
export EESSI_ACCELERATOR_INSTALL=1
188189
module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
189190
check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
191+
check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
190192
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
191193
# unload and make sure the environment is clean again
192194
module unload EESSI-extend
@@ -199,11 +201,13 @@ jobs:
199201
export EESSI_SITE_INSTALL=1
200202
module load EESSI-extend/${{matrix.eessi_version}}-easybuild
201203
check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SITE_SOFTWARE_PATH" # installation path should be the same unless we ask for an explicit GPU installation
204+
check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
202205
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
203206
module unload EESSI-extend
204207
export EESSI_ACCELERATOR_INSTALL=1
205208
module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
206209
check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SITE_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
210+
check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
207211
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
208212
# unload and make sure the environment is clean again
209213
module unload EESSI-extend
@@ -217,11 +221,13 @@ jobs:
217221
export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
218222
module load EESSI-extend/${{matrix.eessi_version}}-easybuild
219223
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same unless we ask for an explicit GPU installation
224+
check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
220225
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
221226
module unload EESSI-extend
222227
export EESSI_ACCELERATOR_INSTALL=1
223228
module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an GPU actual installation
224229
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same for project case
230+
check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
225231
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
226232
# unload and make sure the environment is clean again
227233
module unload EESSI-extend
@@ -238,11 +244,13 @@ jobs:
238244
export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/$USER/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
239245
module load EESSI-extend/${{matrix.eessi_version}}-easybuild
240246
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same unless we ask for an explicit GPU installation
247+
check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
241248
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
242249
module unload EESSI-extend
243250
export EESSI_ACCELERATOR_INSTALL=1
244251
module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
245252
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same for user case
253+
check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
246254
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
247255
# unload and make sure the environment is clean again
248256
module unload EESSI-extend

0 commit comments

Comments
 (0)