Few more changes

ci/setup_spack.sh

@@ -11,6 +11,13 @@ else
   git -C spack pull
 fi
 
+cat > spack/etc/spack/config.yaml << EOF
+config:
+  install_tree:
+    root: /stack/spack/opt/spack
+EOF
+
+
 echo "Adding spack system config file"
 mkdir -p ${SPACK_SYSTEM_CONFIG_PATH}
 

packages.yaml

@@ -6,7 +6,11 @@ packages:
 
     require:
       - spec: "cuda_arch=70"
-        when: "+cuda"
+        when: "+cuda target=cascadelake"
+
+      - spec: "cuda_arch=90"
+        when: "+cuda target=icelake"
+
       - spec: "+ipo"
         when: "%gcc"
   # ----------------------------------------------------------------------------
@@ -18,6 +22,7 @@ packages:
     externals:
       - spec: rdma-core@44.1
         prefix: /usr
+
   slurm:
     version: [23-11-0-1]
     buildable: False
@@ -32,8 +37,8 @@ packages:
     require:
       - spec: "+ownlibs"
 
-  cuda:
-    variants: "+allow-unsupported-compilers"
+  # cuda:
+  #   variants: "+allow-unsupported-compilers"
 
   hdf5:
     variants: "+hl +threadsafe +szip +cxx +fortran"
@@ -53,6 +58,7 @@ packages:
       - spec: "+rdmacm +rc +dc +ud +cma +mlx5_dv +parameter_checking +thread_multiple +verbs"
       - spec: "cuda_arch=70 +gdrcopy"
         when: "+cuda"
+
   # ----------------------------------------------------------------------------
   # External find
   # ----------------------------------------------------------------------------

spack.yaml

 spack:
   include:
-    - mirrors.yaml
-    - packages.yaml
-    - repos.yaml
     - compiler_definitions.yaml
 
-  config:
-    install_tree:
-      root: /stack/spack/opt/spack
-
   definitions:
     - serial_codes_per_cluster:
         - python
@@ -21,7 +14,7 @@ spack:
     - when: env['environment'] in ['helvetios', 'jed']
       mpis:
         - openmpi
-    - when: env['environment'] == 'izar'
+    - when: env['environment'] in ['izar']
       mpis:
         - openmpi +cuda