diff --git a/community/examples/AMD/hpc-amd-slurm.yaml b/community/examples/AMD/hpc-amd-slurm.yaml index 710aec046e..ca17bc65b7 100644 --- 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 index b284915c46..3f87fb02a8 100644 --- 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 index 306a2de624..d66523a394 100644 --- 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 index 85c6b93fc0..b1036d5bb6 100644 --- 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 index 1cd694f9f0..973692e926 100644 --- 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 index 15944153ab..9bb7571054 100644 --- 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 index 7e8b8a86e5..64ff214639 100644 --- 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 index 36a6d63bae..aa0766a146 100644 --- 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 index e0de6ed2a8..3e4b26897f 100644 --- 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 index 58bd6f769b..b6f5722bf4 100644 --- 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 index 7d02949510..15fe0d40e7 100644 --- 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 index e364b3528a..385b399c89 100644 --- 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 index 8234e720d8..9852a9ee95 100644 --- 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 diff --git a/tools/validate_configs/test_configs/spack-buildcache.yaml b/tools/validate_configs/test_configs/spack-buildcache.yaml index f70f0ee7f2..d11d108e7b 100644 --- a/tools/validate_configs/test_configs/spack-buildcache.yaml +++ b/tools/validate_configs/test_configs/spack-buildcache.yaml @@ -28,10 +28,15 @@ deployment_groups: - id: network1 source: modules/network/pre-existing-vpc - - 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: - source: /path/to/local/spack_gpg_key.pub @@ -70,9 +75,7 @@ deployment_groups: - type: ansible-local source: modules/spack-install/scripts/install_spack_deps.yml destination: install_spack_deps.yml - - type: shell - content: $(spack.startup_script) - destination: install_spack.sh + - $(spack-execute.spack_runner) - type: shell destination: shutdown.sh content: shutdown -h diff --git a/tools/validate_configs/test_configs/spack-environments.yaml b/tools/validate_configs/test_configs/spack-environments.yaml index 8ca29f1fed..bcdd731d3e 100644 --- a/tools/validate_configs/test_configs/spack-environments.yaml +++ b/tools/validate_configs/test_configs/spack-environments.yaml @@ -28,12 +28,17 @@ deployment_groups: - id: network1 source: modules/network/pre-existing-vpc - - id: spack + - id: spack-setup source: ./community/modules/scripts/spack-install settings: install_dir: /apps/spack spack_url: https://github.com/spack/spack spack_ref: v0.17.1 + + - id: spack-execute + source: community/modules/scripts/spack-execute + use: [spack-setup] + settings: log_file: /var/log/spack.log data_files: - destination: /apps/spack/env_file.yaml @@ -114,9 +119,7 @@ deployment_groups: - type: ansible-local source: modules/spack-install/scripts/install_spack_deps.yml destination: install_spack_deps.yml - - type: shell - content: $(spack.startup_script) - destination: install_spack.sh + - $(spack-execute.spack_runner) - type: shell destination: shutdown.sh content: shutdown -h diff --git a/tools/validate_configs/test_configs/ubuntu-ss.yaml b/tools/validate_configs/test_configs/ubuntu-ss.yaml index ca16c98f6f..761c0d71c5 100644 --- a/tools/validate_configs/test_configs/ubuntu-ss.yaml +++ b/tools/validate_configs/test_configs/ubuntu-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 @@ -70,10 +75,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