elpa~openmp and elpa+openmpi in all toolchains

toolchains/gcc-11_5_0-openmpi-4_1_4-cuda-11_4/spack.yaml.jinja

@@ -30,7 +30,8 @@ spack:
     - fftw@3.3.10+openmp+mpi+pfft_patches
     - netlib-scalapack@2.1.0
     # octopus dependencies:
-    - elpa@2021.11.001+cuda cuda_arch=70 ^cuda@11.4+allow-unsupported-compilers  # elpa@2020.05.001
+    - elpa@2021.11.001+openmp+cuda cuda_arch=70 ^cuda@11.4+allow-unsupported-compilers
+    - elpa@2021.11.001~openmp+cuda cuda_arch=70 ^cuda@11.4+allow-unsupported-compilers
     - libvdwxc@0.4.0+mpi+pfft
     - berkeleygw@3.0.1+mpi
     - parmetis@4.0.3+int64
@@ -52,10 +53,10 @@ spack:
     - [$packages_with_mpi]
     - [$^mpis]
     - [$%compilers]
-  view: true
+  view: false
   concretizer:
+    unify: when_possible
     reuse: false
-    unify: true
   packages:
     all:
       require: "%{{ toolchain_compiler }}"

toolchains/gcc-11_5_0-openmpi-4_1_4/spack.yaml.jinja

@@ -29,7 +29,8 @@ spack:
     - fftw@3.3.10+openmp+mpi+pfft_patches
     - netlib-scalapack@2.1.0
     # octopus dependencies:
-    - elpa@2021.11.001
+    - elpa@2021.11.001+openmp
+    - elpa@2021.11.001~openmp
     - libvdwxc@0.4.0+mpi+pfft
     - berkeleygw@3.0.1+mpi
     - parmetis@4.0.3+int64
@@ -51,9 +52,9 @@ spack:
     - [$packages_with_mpi]
     - [$^mpis]
     - [$%compilers]
-  view: true
+  view: false
   concretizer:
-    unify: true
+    unify: when_possible
     reuse: false
   packages:
     all:

toolchains/gcc-12_3_0-openmpi-4_1_5/spack.yaml.jinja

@@ -29,7 +29,8 @@ spack:
     - fftw@3.3.10+openmp+mpi+pfft_patches
     - netlib-scalapack@2.2.0
     # octopus dependencies:
-    - elpa@2023.05.001
+    - elpa@2023.05.001+openmp
+    - elpa@2023.05.001~openmp
     - libvdwxc@0.4.0+mpi+pfft
     - berkeleygw@3.0.1+mpi
     - parmetis@4.0.3+int64
@@ -51,9 +52,9 @@ spack:
     - [$packages_with_mpi]
     - [$^mpis]
     - [$%compilers]
-  view: true
+  view: false
   concretizer:
-    unify: true
+    unify: when_possible
     reuse: false
   packages:
     all:

toolchains/gcc-13_2_0-openmpi-4_1_6/spack.yaml.jinja

@@ -29,7 +29,8 @@ spack:
     - fftw@3.3.10+openmp+mpi+pfft_patches
     - netlib-scalapack@2.2.0
     # octopus dependencies:
-    - elpa@2023.11.001-patched
+    - elpa@2023.11.001-patched+openmp
+    - elpa@2023.11.001-patched~openmp
     - libvdwxc@0.4.0+mpi+pfft
     - berkeleygw@3.1.0+mpi
     - parmetis@4.0.3+int64
@@ -51,9 +52,9 @@ spack:
     - [$packages_with_mpi]
     - [$^mpis]
     - [$%compilers]
-  view: true
+  view: false
   concretizer:
-    unify: true
+    unify: when_possible
     reuse: false
   packages:
     all:

toolchains/gcc-14_2-openmpi-5_0_5/spack.yaml.jinja

@@ -29,7 +29,8 @@ spack:
     - fftw@3.3.10+openmp+mpi+pfft_patches
     - netlib-scalapack@2.2.0
     # octopus dependencies:
-    - elpa@2024.03.001
+    - elpa@2024.03.001+openmp
+    - elpa@2024.03.001~openmp
     - libvdwxc@0.4.0+mpi+pfft
     - berkeleygw@4.0+mpi
     - parmetis@4.0.3+int64
@@ -51,9 +52,9 @@ spack:
     - [$packages_with_mpi]
     - [$^mpis]
     - [$%compilers]
-  view: true
+  view: false
   concretizer:
-    unify: true
+    unify: when_possible
     reuse: false
   packages:
     all:

toolchains/intel-2021_10_0-impi-2021_10_0/spack.yaml.jinja

@@ -21,7 +21,8 @@ spack:
     - dftbplus@23.1~arpack~gpu~mpi~sockets~transport+api+shared~openmp
   - packages_with_mpi:
     - intel-oneapi-mkl@2023.2.0+cluster threads=openmp ^intel-oneapi-tbb
-    - elpa@2023.11.001-patched
+    - elpa@2023.11.001-patched+openmp
+    - elpa@2023.11.001-patched~openmp
     - parmetis@4.0.3+int64
     - hdf5@1.14.3+mpi
     - netcdf-fortran@4.6.1 ^netcdf-c+mpi
@@ -34,9 +35,9 @@ spack:
   - matrix:
     - [$packages_with_mpi]
     - [$^mpis]
-  view: true
+  view: false
   concretizer:
-    unify: true
+    unify: when_possible
     reuse: false
   packages:
     all:

toolchains/intel-2021_6_0-impi-2021_6_0/spack.yaml.jinja

@@ -21,7 +21,8 @@ spack:
     - dftbplus@21.2~arpack~gpu~mpi~sockets~transport+api+shared~openmp
   - packages_with_mpi:
     - intel-oneapi-mkl@2022.1.0+cluster threads=openmp
-    - elpa@2021.11.001
+    - elpa@2021.11.001+openmp
+    - elpa@2021.11.001~openmp
     - parmetis@4.0.3+int64
     - hdf5@1.12.2+mpi
     - netcdf-fortran@4.6.0 ^netcdf-c+mpi
@@ -34,9 +35,9 @@ spack:
   - matrix:
     - [$packages_with_mpi]
     - [$^mpis]
-  view: true
+  view: false
   concretizer:
-    unify: true
+    unify: when_possible
     reuse: false
   packages:
     all:

toolchains/intel-2021_9_0-impi-2021_9_0/spack.yaml.jinja

@@ -21,7 +21,8 @@ spack:
     - dftbplus@22.2~arpack~gpu~mpi~sockets~transport+api+shared~openmp
   - packages_with_mpi:
     - intel-oneapi-mkl@2023.1.0+cluster threads=openmp ^intel-oneapi-tbb
-    - elpa@2023.05.001
+    - elpa@2023.05.001+openmp
+    - elpa@2023.05.001~openmp
     - parmetis@4.0.3+int64
     - hdf5@1.14.0+mpi
     - netcdf-fortran@4.6.1 ^netcdf-c+mpi
@@ -34,9 +35,9 @@ spack:
   - matrix:
     - [$packages_with_mpi]
     - [$^mpis]
-  view: true
+  view: false
   concretizer:
-    unify: true
+    unify: when_possible
     reuse: false
   packages:
     all:

toolchains/oneapi-2025_0_0-impi-2021_14_0/spack.yaml.jinja

@@ -23,7 +23,8 @@ spack:
   - packages_with_mpi:
     - intel-oneapi-mkl@2025.0.0+cluster threads=openmp ^intel-oneapi-tbb
     - parmetis@4.0.3+int64
-    #- elpa@2024.03.001
+    #- elpa@2024.03.001+openmp
+    #- elpa@2024.03.001~openmp
     - hdf5@1.14.5+mpi
     - netcdf-fortran@4.6.1 ^netcdf-c+mpi
     #- bigdft-futile@1.9.5+shared+mpi
@@ -35,7 +36,7 @@ spack:
   - matrix:
     - [$packages_with_mpi]
     - [$^mpis]
-  view: true
+  view: false
   concretizer:
     unify: when_possible
     reuse: false