Packages.yaml specific to each environment

ci/setup_spack.sh

@@ -83,34 +83,4 @@ spack/bin/spack buildcache keys \
 
 #spack/bin/spack buildcache update-index /buildcache
 
-target=$(jq -Mrc --arg env "${environment}" '
- .environments
-   | to_entries
-   | map(select(.key==env.environment))
-   | .[].value.target
-' ${STACK_CONFIG})
-
-require=$(jq -Mrc --arg environment "${environment}" '
- .environments
-   | to_entries
-   | map(select(.key==env.environment))
-   | .[].value
-   | if has("require") then
-      .require
-       | map("     - spec: \(.spec)\n       when: \(.when)")
-       | .[]
-     else
-      ""
-     end' ${STACK_CONFIG})
-
-cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/packages_env.yaml
-packages:
-  all:
-    target: [$target]
-EOF
-
-if [ "x$require" != "x" ]
-then
-  echo "    require:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages_env.yaml
-  echo "${require}" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages_env.yaml
-fi
+cp ${STACK_CONFIG_PATH}/packages_${environment}.yaml ${SPACK_SYSTEM_CONFIG_PATH}/packages_env.yaml

stacks/pinot-noir/config.json

@@ -54,17 +54,5 @@
             }
 
         }
-    },
-    "environments": {
-        "jed": {
-            "target": "icelake",
-            "require": [            {
-                "spec": "cuda_arch=90",
-                "when": "+cuda"
-            }]
-        },
-        "helvetios": {
-            "target": "skylake_avx512"
-        }
     }
 }

stacks/pinot-noir/packages.yaml

@@ -10,6 +10,9 @@ packages:
       - spec: ^openmpi
         when: '%gcc ^mpi'
 
+      - spec: "+ipo"
+        when: '%gcc'
+
   # System dependencies  # ----------------------------------------------------------------------------
   rdma-core:
     buildable: false

stacks/pinot-noir/packages_helvetios.yaml

+packages:
+  all:
+    target: ["skylake_avx512"]
+    require:
+      - '~cuda'

stacks/pinot-noir/packages_jed.yaml

+packages:
+  all:
+    target: ["icelake"]
+    require:
+      - spec: ^openmpi +cuda
+        when: '%gcc ^mpi'
+
+      - spec: cuda_arch=90
+        when: '+cuda'
+
+      - '+cuda'