Adapting the oneapi definitions

ci/setup_spack.sh

@@ -29,27 +29,38 @@ then
     --without-view ${environment}
 fi
 
-
-echo "Copying cp ${STACK_CONFIG_PATH}/spack.yaml to ${SPACK_SYSTEM_CONFIG_PATH}/"
-cp ${STACK_CONFIG_PATH}/spack.yaml ${SPACK_SYSTEM_CONFIG_PATH}
-
-cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
-
 declare -A file_mapping
 file_mapping["_common"]=""
 file_mapping["_stack"]="_stack"
 file_mapping["_acc_${acc_type}"]="_accel"
 file_mapping["_${environment}"]="_env"
 
-declare -A placeholders
-placeholders["{target}"]="${target}"
-placeholders["{gcc_version}"]=$(jq -Mrc '.stack.compilers.gcc.version' ${STACK_CONFIG})
-if [ "${accelerator}" != "none" ]
-then
-  placeholders["{${acc_type}_arch}"]="${acc_arch}"
-fi
+replace_placholders() {
+  dst=$1
+  declare -A placeholders
+  placeholders["{target}"]="${target}"
+  placeholders["{gcc_version}"]=$(jq -Mrc '.stack.compilers.gcc.version' ${STACK_CONFIG})
+  if [ "${accelerator}" != "none" ]
+  then
+    placeholders["{${acc_type}_arch}"]="${acc_arch}"
+  fi
+
+  for ph in ${!placeholders[@]}
+  do
+    rep=${placeholders[$ph]}
+    sed -i -e "s/$ph/$rep/g" "$dst"
+  done
+}
+
+
+echo "Copying cp ${STACK_CONFIG_PATH}/spack.yaml to ${SPACK_SYSTEM_CONFIG_PATH}/"
+cp ${STACK_CONFIG_PATH}/spack.yaml ${SPACK_SYSTEM_CONFIG_PATH}
+
+replace_placholders ${SPACK_SYSTEM_CONFIG_PATH}/spack.yaml
+
+cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
+
 
-echo blip
 
 for file in mirrors packages concretizer config definitions modules
 do
@@ -62,11 +73,7 @@ do
       echo "Copying $src to $dst"
       cp "$src" "$dst"
 
-      for ph in ${!placeholders[@]}
-      do
-        rep=${placeholders[$ph]}
-        sed -i -e "s/$ph/$rep/g" "$dst"
-      done
+      replace_placholders ${dst}
     fi
   done
 done
@@ -244,5 +251,6 @@ do
   if [ -e ${STACK_CONFIG_PATH}/spack_${name}.yaml ]
   then
     cp ${STACK_CONFIG_PATH}/spack_${name}.yaml ${SPACK_SYSTEM_CONFIG_PATH}/spack.yaml
+    replace_placholders ${SPACK_SYSTEM_CONFIG_PATH}/spack.yaml
   fi
 done

stacks/pinot-noir/definitions_stack.yaml

@@ -224,7 +224,7 @@ definitions:
   - mpi_blas_codes:
       - arpack-ng ++mpi
       - hypre@2.31.0
-      - mumps@5.6.2
+      - mumps ++mpi@5.6.2
       - superlu-dist@8.2.1
 
   - gcc_mpi_blas_codes:
@@ -243,7 +243,7 @@ definitions:
       - quantum-espresso
 
   - mpi_blas_python_codes:
-      - petsc
+      - petsc ++mpi
       - slepc
 
   - gcc_mpi_blas_python_codes:

stacks/pinot-noir/spack_oneapi.yaml

@@ -32,7 +32,7 @@ spack:
       require: ['intel-oneapi-mpi']
 
     scalapack:
-      require: ['intel-oneapi-mkl']
+      require: ['intel-oneapi-mkl +cluster']
 
     icu4c:
       require: ['%gcc']
@@ -42,6 +42,19 @@ spack:
       - spec: '+allow-unsupported-compilers'
         when: '%oneapi'
 
+    intel-oneapi-mkl:
+      require:
+      - '%oneapi ^intel-oneapi-runtime target={target}'
+
+    intel-oneapi-mpi:
+      require: ['%oneapi ^intel-oneapi-runtime target={target}']
+
+    intel-oneapi-tbb:
+      require: ['%oneapi ^intel-oneapi-runtime target={target}']
+
+    intel-oneapi-runtime:
+      require: ['%oneapi target={target} ^gcc-runtime target=x86_64_v3']
+
   definitions:
     # -------------------------------------------------------------------------
     # PE definition
@@ -88,7 +101,6 @@ spack:
 
     - matrix:
         - [$python_blas_codes]
-        - [$^python_oneapi]
         - [$^blas_oneapi]
         - [$%compiler_oneapi]
 
@@ -99,20 +111,16 @@ spack:
 
     - matrix:
         - [$mpi_python_codes]
-        - [$^python_oneapi]
         - [$^mpi_oneapi]
         - [$%compiler_oneapi]
 
     - matrix:
         - [$mpi_blas_codes]
-        - [$^blas_oneapi]
         - [$^mpi_oneapi]
         - [$%compiler_oneapi]
 
     - matrix:
         - [$mpi_blas_python_codes]
-        - [$^python_oneapi]
-        - [$^blas_oneapi]
         - [$^mpi_oneapi]
         - [$%compiler_oneapi]