Update blueprints to reflect spack module split

GoogleCloudPlatform · Jul 14, 2023 · 9713fe4 · 9713fe4
1 parent fcf1377
commit 9713fe4
Show file tree

Hide file tree

Showing 16 changed files with 109 additions and 67 deletions.
diff --git a/community/examples/AMD/hpc-amd-slurm.yaml b/community/examples/AMD/hpc-amd-slurm.yaml
@@ -39,11 +39,16 @@ deployment_groups:
     settings:
       local_mount: /sw
 
-  - id: spack
+  - id: spack-setup
     source: community/modules/scripts/spack-install
     settings:
       install_dir: /sw/spack
       spack_ref: v0.18.1
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       log_file: /var/log/spack.log
       data_files:
       - destination: /tmp/projections-config.yaml
@@ -113,8 +118,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+      - $(spack-execute.spack_runner)
       - type: shell
         destination: shutdown.sh
         content: |
@@ -128,7 +132,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.setup_spack_runner)
+      - $(spack-setup.setup_spack_runner)
       # the following installation of AOCC may be automated in the future
       # with a clear direction to the user to read the EULA at
       # https://developer.amd.com/aocc-compiler-eula/

diff --git a/community/examples/hpc-slurm-gromacs.yaml b/community/examples/hpc-slurm-gromacs.yaml
@@ -45,10 +45,15 @@ deployment_groups:
       local_mount: /home
 
   ## Install Scripts
-  - id: spack
+  - id: spack-setup
     source: community/modules/scripts/spack-install
     settings:
       install_dir: /sw/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       log_file: /var/log/spack.log
       data_files:
       - destination: /tmp/projections-config.yaml
@@ -77,13 +82,6 @@ deployment_groups:
         spack install intel-mpi@2018.4.274%gcc@10.3.0
         spack install gromacs@2023.1 %gcc@10.3.0 ^intel-mpi@2018.4.274 ^cmake@3.26.3 %gcc@4.8.5
 
-  - id: spack-startup
-    source: modules/scripts/startup-script
-    settings:
-      runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
-
   - id: compute_partition
     source: community/modules/compute/SchedMD-slurm-on-gcp-partition
     use:
@@ -111,7 +109,7 @@ deployment_groups:
     - homefs
     - appsfs
     - slurm_controller
-    - spack-startup
+    - spack-execute
     settings:
       login_machine_type: c2-standard-4
       login_scopes:

diff --git a/community/examples/hpc-slurm-ramble-gromacs.yaml b/community/examples/hpc-slurm-ramble-gromacs.yaml
@@ -35,10 +35,15 @@ deployment_groups:
     source: modules/network/vpc
 
   ## Install Scripts
-  - id: spack
+  - id: spack-install
     source: community/modules/scripts/spack-install
     settings:
       install_dir: /opt/apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-install]
+    settings:
       log_file: /var/log/spack.log
       commands: |
         # Un-comment and update mirror_url to install from spack cache
@@ -55,7 +60,7 @@ deployment_groups:
 
   - id: ramble-execute
     source: community/modules/scripts/ramble-execute
-    use: [spack, ramble-setup]
+    use: [spack-install, ramble-setup]
     settings:
       commands: |
         ramble workspace create gromacs -c /opt/apps/gromacs_scaling.yaml -t /opt/apps/execute_experiment.tpl
@@ -66,8 +71,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+      - $(spack-execute.spack_runner)
       - type: data
         destination: /opt/apps/gromacs_scaling.yaml
         content: |

diff --git a/docs/tutorials/gromacs/spack-gromacs.yaml b/docs/tutorials/gromacs/spack-gromacs.yaml
@@ -32,10 +32,15 @@ deployment_groups:
     source: modules/monitoring/dashboard
 
   ## Install Scripts
-  - id: spack
+  - id: spack-setup
     source: community/modules/scripts/spack-install
     settings:
       install_dir: /apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       log_file: /var/log/spack.log
       data_files:
       - destination: /tmp/projections-config.yaml
@@ -99,8 +104,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+      - $(spack-execute.spack_runner)
       - type: shell
         destination: setup_gromacs.sh
         content: |

diff --git a/docs/tutorials/openfoam/spack-openfoam.yaml b/docs/tutorials/openfoam/spack-openfoam.yaml
@@ -32,10 +32,15 @@ deployment_groups:
     source: modules/monitoring/dashboard
 
   ## Install Scripts
-  - id: spack
+  - id: spack-setup
     source: community/modules/scripts/spack-install
     settings:
       install_dir: /apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       log_file: /var/log/spack.log
       data_files:
       - destination: /tmp/projections-config.yaml
@@ -106,8 +111,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+      - $(spack-execute.spack_runner)
       - type: shell
         destination: setup_openfoam.sh
         content: |

diff --git a/docs/tutorials/wrfv3/spack-wrfv3.yaml b/docs/tutorials/wrfv3/spack-wrfv3.yaml
@@ -32,10 +32,15 @@ deployment_groups:
     source: modules/monitoring/dashboard
 
   ## Install Scripts
-  - id: spack
+  - id: spack-setup
     source: community/modules/scripts/spack-install
     settings:
       install_dir: /apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       log_file: /var/log/spack.log
       data_files:
       - destination: /tmp/projections-config.yaml
@@ -99,8 +104,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+      - $(spack-execute.spack_runner)
       - type: shell
         destination: wrfv3_setup.sh
         content: |

diff --git a/docs/videos/healthcare-and-life-sciences/hcls-blueprint.yaml b/docs/videos/healthcare-and-life-sciences/hcls-blueprint.yaml
@@ -113,10 +113,15 @@ deployment_groups:
 
   ### Software ###
 
-  - id: spack
+  - id: spack-setup
     source: community/modules/scripts/spack-install
     settings:
       install_dir: /apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       data_files:
       - destination: /tmp/projections-config.yaml
         content: |
@@ -185,7 +190,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
+      - $(spack-execute.spack_runner)
 
       - type: data
         destination: /tmp/install_spack.sh

diff --git a/examples/serverless-batch-mpi.yaml b/examples/serverless-batch-mpi.yaml
@@ -34,11 +34,16 @@ deployment_groups:
     settings:
       local_mount: /share
 
-  - id: spack
+  - id: spack-setup
     source: community/modules/scripts/spack-install
     settings:
       spack_ref: v0.19.0
       install_dir: /share/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       data_files:
       - destination: /tmp/projections-config.yaml
         content: |
@@ -92,8 +97,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+      - $(spack-execute.spack_runner)
       - type: shell
         destination: wrfv3_setup.sh
         content: |
@@ -153,7 +157,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.setup_spack_runner)
+      - $(spack-setup.setup_spack_runner)
 
   - id: batch-login
     source: modules/scheduler/batch-login-node

diff --git a/tools/validate_configs/ramble.yaml b/tools/validate_configs/ramble.yaml
@@ -49,8 +49,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+      - $(spack.spack_runner)
       - $(ramble-execute.ramble_runner)
 
   - id: ramble-vm

diff --git a/tools/validate_configs/test_configs/centos8-ss.yaml b/tools/validate_configs/test_configs/centos8-ss.yaml
@@ -41,10 +41,15 @@ deployment_groups:
     settings:
       auto_delete_disk: true
 
-  - id: spack
+  - id: spack-setup
     source: ./community//modules/scripts/spack-install
     settings:
       install_dir: /apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       commands: |
         spack install gcc@10.3.0 target=x86_64
         spack load gcc@10.3.0 target=x86_64
@@ -66,10 +71,7 @@ deployment_groups:
           echo $2
           tar zxvf /tmp/$1 -C /
         args: "foo.tgz 'Expanding the file'"
-      - $(spack.install_spack_deps_runner)
-      - type: shell
-        content: $(spack.startup_script)
-        destination: "/apps/spack-install.sh"
+      - $(spack-execute.spack_runner)
 
   - id: instance
     source: ./modules/compute/vm-instance

diff --git a/tools/validate_configs/test_configs/debian-ss.yaml b/tools/validate_configs/test_configs/debian-ss.yaml
@@ -41,10 +41,15 @@ deployment_groups:
     settings:
       auto_delete_disk: true
 
-  - id: spack
+  - id: spack-setup
     source: ./community//modules/scripts/spack-install
     settings:
       install_dir: /apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       commands: |
         spack install gcc@10.3.0 target=x86_64
         spack load gcc@10.3.0 target=x86_64
@@ -66,10 +71,7 @@ deployment_groups:
           echo $2
           tar zxvf /tmp/$1 -C /
         args: "foo.tgz 'Expanding the file'"
-      - $(spack.install_spack_deps_runner)
-      - type: shell
-        content: $(spack.startup_script)
-        destination: "/apps/spack-install.sh"
+      - $(spack-execute.spack_runner)
 
   - id: instance
     source: ./modules/compute/vm-instance

diff --git a/tools/validate_configs/test_configs/hpc-centos-ss.yaml b/tools/validate_configs/test_configs/hpc-centos-ss.yaml
@@ -41,10 +41,15 @@ deployment_groups:
     settings:
       auto_delete_disk: true
 
-  - id: spack
+  - id: spack-setup
     source: ./community//modules/scripts/spack-install
     settings:
       install_dir: /apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       commands: |
         spack install gcc@10.3.0 target=x86_64
         spack load gcc@10.3.0 target=x86_64
@@ -66,10 +71,7 @@ deployment_groups:
           echo $2
           tar zxvf /tmp/$1 -C /
         args: "foo.tgz 'Expanding the file'"
-      - $(spack.install_spack_deps_runner)
-      - type: shell
-        content: $(spack.startup_script)
-        destination: "/apps/spack-install.sh"
+      - $(spack-execute.spack_runner)
 
   - id: instance
     source: ./modules/compute/vm-instance

diff --git a/tools/validate_configs/test_configs/rocky-ss.yaml b/tools/validate_configs/test_configs/rocky-ss.yaml
@@ -42,10 +42,15 @@ deployment_groups:
       image: rocky-linux-cloud/rocky-linux-8
       auto_delete_disk: true
 
-  - id: spack
+  - id: spack-setup
     source: ./community//modules/scripts/spack-install
     settings:
       install_dir: /apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       commands: |
         spack install gcc@10.3.0 target=x86_64
         spack load gcc@10.3.0 target=x86_64
@@ -67,10 +72,7 @@ deployment_groups:
           echo $2
           tar zxvf /tmp/$1 -C /
         args: "foo.tgz 'Expanding the file'"
-      - $(spack.install_spack_deps_runner)
-      - type: shell
-        content: $(spack.startup_script)
-        destination: "/apps/spack-install.sh"
+      - $(spack-execute.spack_runner)
 
   - id: instance
     source: ./modules/compute/vm-instance