From c054ee2dfc939af41a98a2bbc205d24ac5831e8c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 3 Jul 2024 17:54:09 +1000 Subject: [PATCH 1/8] spack.yaml: Updated version, added comments --- spack.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index a0d69ea..63840e9 100644 --- a/spack.yaml +++ b/spack.yaml @@ -8,8 +8,9 @@ spack: # add package specs to the `specs` list specs: - - access-om2-bgc@git.2024.03.1 + - access-om2-bgc@git.2024.03.2 packages: + # Direct ACCESS-NRI Dependencies cice5: require: - '@git.2023.10.19' @@ -22,6 +23,7 @@ spack: oasis3-mct: require: - '@git.2023.11.09' + # Other Dependencies netcdf-c: require: - '@4.9.2' @@ -63,7 +65,7 @@ spack: 'SPACK_{name}_ROOT': '{prefix}' projections: all: '{name}/{version}' - access-om2-bgc: '{name}/2024.03.1' + access-om2-bgc: '{name}/2024.03.2' cice5: '{name}/2023.10.19' mom5: '{name}-bgc/2023.11.09' libaccessom2: '{name}/2023.10.26' From 6c97c9f1c4eafbcb1935efd1f5809c255a858e51 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 3 Jul 2024 17:54:38 +1000 Subject: [PATCH 2/8] versions.json: Updated spack-config to avoid buggy hdf5, updated spack-packages --- config/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/versions.json b/config/versions.json index 20d4952..23b4506 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,6 +1,6 @@ { "$schema": "http://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json", "spack": "0.21", - "spack-packages": "2024.04.20", - "spack-config": "2024.04.23" + "spack-packages": "2024.07.03", + "spack-config": "2024.07.02" } From 9b6d7d5ca1428a2f521936e107ead3877440a51d Mon Sep 17 00:00:00 2001 From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com> Date: Mon, 8 Jul 2024 09:42:12 +1000 Subject: [PATCH 3/8] Revert parallelio to 2.5.2 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 63840e9..c07b67a 100644 --- a/spack.yaml +++ b/spack.yaml @@ -32,7 +32,7 @@ spack: - '@4.6.1' parallelio: require: - - '@2.6.2' + - '@2.5.2' openmpi: require: - '@4.1.5' From e6623a6af890fc36b6a6c57c381cf951e979e3b2 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 8 Jul 2024 13:54:37 +1000 Subject: [PATCH 4/8] spack.yaml: cppflags arg for openmpi handled by https://github.com/ACCESS-NRI/spack/commit/42e310074a69cb4ee052a73e830e07ad26a15440 --- spack.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index c07b67a..eeb7043 100644 --- a/spack.yaml +++ b/spack.yaml @@ -36,7 +36,6 @@ spack: openmpi: require: - '@4.1.5' - - 'cppflags="-diag-disable=10441"' all: require: - '%intel@2021.10.0' From e9b7637795a8b6f0f12944661a0b44e2b8ad6fd6 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 8 Jul 2024 14:02:08 +1000 Subject: [PATCH 5/8] versions.json: Updated to spack 0.22 --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 23b4506..b504d6f 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,6 +1,6 @@ { "$schema": "http://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json", - "spack": "0.21", + "spack": "0.22", "spack-packages": "2024.07.03", "spack-config": "2024.07.02" } From 8c7d4bdb3774f9fa0a4bff0d56ab2e6505d77eb9 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 8 Jul 2024 14:06:57 +1000 Subject: [PATCH 6/8] versions.json: Updated spack-packages, spack-config --- config/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/versions.json b/config/versions.json index b504d6f..b31d731 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,6 +1,6 @@ { "$schema": "http://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json", "spack": "0.22", - "spack-packages": "2024.07.03", - "spack-config": "2024.07.02" + "spack-packages": "2024.07.07", + "spack-config": "2024.07.05" } From 49cdd825605ad16934df3c764132c5899c50228a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 8 Jul 2024 14:32:42 +1000 Subject: [PATCH 7/8] spack.yaml: exclude_implicits and autoload: run changes --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index eeb7043..a6f8819 100644 --- a/spack.yaml +++ b/spack.yaml @@ -54,9 +54,9 @@ spack: hash_length: 0 include: - access-om2-bgc - hide_implicits: true + exclude_implicits: true all: - autoload: direct + autoload: run conflict: - '{name}' environment: From 98eb1297548103f252dcbe4ed141eb44cdae025b Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 8 Jul 2024 18:17:59 +1000 Subject: [PATCH 8/8] spack-packages 2024.07.08, added includes --- config/versions.json | 2 +- spack.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index b31d731..7341f3a 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,6 +1,6 @@ { "$schema": "http://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json", "spack": "0.22", - "spack-packages": "2024.07.07", + "spack-packages": "2024.07.08", "spack-config": "2024.07.05" } diff --git a/spack.yaml b/spack.yaml index a6f8819..0c13a4b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -54,6 +54,10 @@ spack: hash_length: 0 include: - access-om2-bgc + - cice5 + - mom5 + - libaccessom2 + - oasis3-mct exclude_implicits: true all: autoload: run