From dbd040bbbdc6dbedd04e96b204ea61a46f513f1f Mon Sep 17 00:00:00 2001
From: Germann Elsa Sylvia <germann_e@merlin-l-001.psi.ch>
Date: Tue, 30 Aug 2022 09:19:36 +0200
Subject: [PATCH] ADD: testing of compiler pckgs

---
 env/merlin/spack.yaml | 61 ++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 36 deletions(-)

diff --git a/env/merlin/spack.yaml b/env/merlin/spack.yaml
index 7fefdad..119750e 100644
--- a/env/merlin/spack.yaml
+++ b/env/merlin/spack.yaml
@@ -14,26 +14,29 @@ spack:
     - Batchsystem_pckgs: &Batchsystem_pckgs
         - slurm
     - Compiler_pckgs: &Compiler_pckgs
-        - atlas
-        - boost
-        - clapack
-        - clhep
-        - eigen
-        - geant4
-        - googletest
-        - gsl
-        - intel-oneapi-mpi
-        - kokkos
-        - libint tune=cp2k-lmax-6
-        - libxc
-        - libxsmm
-        - mpich
-        - openblas threads=none
-        - openblas threads=openmp
-        - openmpi
-        - root
-        - superlu
-        - vtk
+        # - atlas E.G: removing atlas from testing, since it taking way too much time. Installation working though.
+        - boost%gcc
+        - boost%oneapi
+        - boost%clang
+        - boost%nvhpc
+        - clapack%gcc
+        - clhep%gcc
+        - eigen%gcc
+        - geant4%gcc
+        - googletest%gcc
+        - gsl%gcc
+        - intel-oneapi-mpi%oneapi
+        - kokkos%gcc
+        - libint%oneapi tune=cp2k-lmax-6
+        - libxc%oneapi
+        - libxsmm%oneapi
+        - mpich%gcc netmod=ucx
+        - openblas%gcc threads=none
+        - openblas%gcc threads=openmp
+        - openmpi%gcc
+        - root%gcc
+        - superlu%gcc
+        - vtk%gcc
     - Cuda_pckgs: &Cuda_pckgs
         - cuda
     - EM_pckgs: &EM_pckgs
@@ -107,7 +110,7 @@ spack:
         - m4
         - nasm
         - perl
-        - nvhpc
+        - nvhpc+mpi
         - python
         - py-tensorflow
         - qt
@@ -544,21 +547,7 @@ spack:
         - PKG_CONFIG_PATH
 #<<<
   specs:
-    - matrix: 
-      - [cmake,cuda,fftw,gromacs,kokkos,mpich netmod=ucx,nvhpc+mpi,openblas threads=none,openblas threads=openmp,
-         python,root~tbb~x,slurm,gsl]
-      - ['%gcc']
-    - matrix:
-      - [boost]
-      - ['%clang','%gcc','%nvhpc','%oneapi']
-    - matrix:
-      - [hdf5~mpi, openmpi]
-      - ['%gcc','%oneapi']
-    - matrix:
-      - [hdf5+mpi +fortran +hl +shared, netcdf-fortran, netcdf-c +parallel-netcdf]
-      - ['%gcc','%oneapi']
-      - [^openmpi]
-    - intel-oneapi-mpi%oneapi
+    - $Compiler_pckgs
   view:
     Batchsystem:
       link: all