Skip to content

Commit cb4de5b

Browse files
authored
Merge pull request #88 from rbberger/ci_fixes
2 parents a0ebeac + fbcb165 commit cb4de5b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.gitlab-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111
SPINER_GCC_VERSION: "10.3.0"
1212
SPINER_CUDA_VERSION: "11.6.0"
1313
SPINER_OPENMPI_VERSION: "4.1.1"
14-
SPINER_SPACK_SPEC: "spiner@main+python+test%gcc@=${SPINER_GCC_VERSION}"
14+
SPINER_SPACK_SPEC: "spiner@main+python+test%gcc@=${SPINER_GCC_VERSION} ^openblas"
1515
COLOR_CYAN: "\e[1;36m"
1616
COLOR_PLAIN: "\e[0m"
1717
# uncomment to have the CI Spack installation for debugging
@@ -103,7 +103,7 @@ default:
103103
if [[ ${CI_JOB_NAME} =~ "a100" ]];
104104
then
105105
module load openmpi/${SPINER_OPENMPI_VERSION}-gcc_${SPINER_GCC_VERSION}
106-
export SPINER_SPACK_SPEC="${SPINER_SPACK_SPEC}+hdf5+mpi+kokkos ^kokkos+wrapper+cuda cuda_arch=80 ^openmpi@${SPINER_OPENMPI_VERSION}";
106+
export SPINER_SPACK_SPEC="${SPINER_SPACK_SPEC}+hdf5+mpi+kokkos ^kokkos+wrapper+cuda cuda_arch=80 ^openmpi@${SPINER_OPENMPI_VERSION} ^openblas";
107107
fi
108108
- |
109109
section start "spack_build[collapsed=true]" "Building via Spack"
@@ -112,7 +112,7 @@ default:
112112
spack repo add ${DEVEL_SPACK_ROOT}/var/spack/repos/xcap_deployment
113113
spack repo add spack-repo
114114
spack repo list
115-
spack config add upstreams:default:install_tree:${SPINER_SPACK_DIR}/opt/spack/
115+
spack config add upstreams:default:install_tree:${PROJECT_SPACK_ROOT}/opt/spack/
116116
spack dev-build -q -j $(nproc) ${SPINER_SPACK_SPEC}
117117
spack env deactivate
118118
section end spack_build

0 commit comments

Comments
 (0)