Skip to content

Commit f551ffe

Browse files
committed
Explicitly export environment variable
1 parent 47290c5 commit f551ffe

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

.github/workflows/tests_eessi_extend_module.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
7575
# Set an environment variable to use when we want to target accelerators
7676
export STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE="accel/nvidia/cc80"
77+
export STORED_CUDA_CC="80"
7778
7879
# Configure for CVMFS install
7980
export EESSI_CVMFS_INSTALL=1
@@ -94,12 +95,15 @@ jobs:
9495
export EESSI_ACCELERATOR_TARGET_OVERRIDE=$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE
9596
module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
9697
check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SOFTWARE_PATH" # installation path should be the same unless we ask for an explicit GPU installation
97-
EESSI_ACCELERATOR_INSTALL=1 module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
98+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES "$STORED_CUDA_CC"
99+
export EESSI_ACCELERATOR_INSTALL=1
100+
module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild # reload for an actual GPU installation
98101
check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SOFTWARE_PATH}/accel/${EESSI_ACCELERATOR_TARGET_OVERRIDE}" # installation path should be the same unless we ask for an explicit GPU installation
99102
# unload and make sure the environment is clean again
100103
module unload EESSI-extend
101104
check_disallowed_env_prefix EASYBUILD_
102105
unset EESSI_ACCELERATOR_TARGET_OVERRIDE
106+
unset EESSI_ACCELERATOR_INSTALL
103107
unset EESSI_CVMFS_INSTALL
104108
105109
# Now configure for a site
@@ -114,12 +118,15 @@ jobs:
114118
export EESSI_ACCELERATOR_TARGET_OVERRIDE=$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE
115119
module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
116120
check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SITE_SOFTWARE_PATH" # installation path should be the same unless we ask for an explicit GPU installation
117-
EESSI_ACCELERATOR_INSTALL=1 module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
121+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES "$STORED_CUDA_CC"
122+
export EESSI_ACCELERATOR_INSTALL=1
123+
module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild # reload for an actual GPU installation
118124
check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SITE_SOFTWARE_PATH}/accel/${EESSI_ACCELERATOR_TARGET_OVERRIDE}" # installation path should be the same unless we ask for an explicit GPU installation
119125
# unload and make sure the environment is clean again
120126
module unload EESSI-extend
121127
check_disallowed_env_prefix EASYBUILD_
122128
unset EESSI_ACCELERATOR_TARGET_OVERRIDE
129+
unset EESSI_ACCELERATOR_INSTALL
123130
unset EESSI_SITE_INSTALL
124131
125132
# Now for a project
@@ -136,12 +143,15 @@ jobs:
136143
export EESSI_ACCELERATOR_TARGET_OVERRIDE=$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE
137144
module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
138145
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same unless we ask for an explicit GPU installation
139-
EESSI_ACCELERATOR_INSTALL=1 module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
146+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES "$STORED_CUDA_CC"
147+
export EESSI_ACCELERATOR_INSTALL=1
148+
module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild # reload for an GPU actual installation
140149
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same for project case
141150
# unload and make sure the environment is clean again
142151
module unload EESSI-extend
143152
check_disallowed_env_prefix EASYBUILD_
144153
unset EESSI_ACCELERATOR_TARGET_OVERRIDE
154+
unset EESSI_ACCELERATOR_INSTALL
145155
unset EESSI_PROJECT_INSTALL
146156
147157
# Now for a user
@@ -158,11 +168,14 @@ jobs:
158168
export EESSI_ACCELERATOR_TARGET_OVERRIDE=$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE
159169
module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
160170
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same unless we ask for an explicit GPU installation
161-
EESSI_ACCELERATOR_INSTALL=1 module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
171+
check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES "$STORED_CUDA_CC"
172+
export EESSI_ACCELERATOR_INSTALL=1
173+
module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild # reload for an actual GPU installation
162174
check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH" # installation path should be the same for user case
163175
# unload and make sure the environment is clean again
164176
module unload EESSI-extend
165177
check_disallowed_env_prefix EASYBUILD_
166178
unset EESSI_ACCELERATOR_TARGET_OVERRIDE
179+
unset EESSI_ACCELERATOR_INSTALL
167180
unset EESSI_USER_INSTALL
168181

0 commit comments

Comments
 (0)