Merge pull request #88 from rbberger/ci_fixes

lanl · Apr 16, 2024 · cb4de5b · cb4de5b
2 parents a0ebeac + fbcb165
commit cb4de5b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
   SPINER_GCC_VERSION: "10.3.0"
   SPINER_CUDA_VERSION: "11.6.0"
   SPINER_OPENMPI_VERSION: "4.1.1"
-  SPINER_SPACK_SPEC: "spiner@main+python+test%gcc@=${SPINER_GCC_VERSION}"
+  SPINER_SPACK_SPEC: "spiner@main+python+test%gcc@=${SPINER_GCC_VERSION} ^openblas"
   COLOR_CYAN: "\e[1;36m"
   COLOR_PLAIN: "\e[0m"
   # uncomment to have the CI Spack installation for debugging
@@ -103,7 +103,7 @@ default:
       if [[ ${CI_JOB_NAME} =~ "a100" ]];
       then
         module load openmpi/${SPINER_OPENMPI_VERSION}-gcc_${SPINER_GCC_VERSION}
-        export SPINER_SPACK_SPEC="${SPINER_SPACK_SPEC}+hdf5+mpi+kokkos ^kokkos+wrapper+cuda cuda_arch=80 ^openmpi@${SPINER_OPENMPI_VERSION}";
+        export SPINER_SPACK_SPEC="${SPINER_SPACK_SPEC}+hdf5+mpi+kokkos ^kokkos+wrapper+cuda cuda_arch=80 ^openmpi@${SPINER_OPENMPI_VERSION} ^openblas";
       fi
     - |
       section start "spack_build[collapsed=true]" "Building via Spack"
@@ -112,7 +112,7 @@ default:
       spack repo add ${DEVEL_SPACK_ROOT}/var/spack/repos/xcap_deployment
       spack repo add spack-repo
       spack repo list
-      spack config add upstreams:default:install_tree:${SPINER_SPACK_DIR}/opt/spack/
+      spack config add upstreams:default:install_tree:${PROJECT_SPACK_ROOT}/opt/spack/
       spack dev-build -q -j $(nproc) ${SPINER_SPACK_SPEC}
       spack env deactivate
       section end spack_build