From 909912399f75c1f66af91d707824877f4b10a552 Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Mon, 7 Oct 2024 15:42:28 +1100 Subject: [PATCH 1/7] spack.yaml: depend on generic tracers Spack components --- spack.yaml | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/spack.yaml b/spack.yaml index 79ceed8..174df30 100644 --- a/spack.yaml +++ b/spack.yaml @@ -8,23 +8,43 @@ spack: - access-om2@git.2024.03.0 packages: cice5: - require: '@git.2023.10.19' + require: + - '@git.2023.10.19' mom5: - require: '@git.2023.11.09' + require: + - '@git.development' libaccessom2: - require: '@git.2023.10.26' + require: + - '@git.2023.10.26' oasis3-mct: - require: '@git.2023.11.09' + require: + - '@git.2023.11.09' netcdf-c: - require: '@4.7.4' + require: + - '@4.7.4' netcdf-fortran: - require: '@4.5.2' + require: + - '@4.5.2' parallelio: - require: '@2.5.2' + require: + - '@2.5.2' openmpi: - require: '@4.0.2' + require: + - '@4.0.2' + access-fms: + require: + - '@development' + access-generic-tracers: + require: + - '@development' + access-mocsy: + require: + - '@mom5' + # Specifications that apply to all packages all: - compiler: [intel@19.0.5.281] + require: + - '%intel@19.0.5.281' + - 'target=x86_64' view: true concretizer: unify: true From 7e7a627d9ceff6107e4263997814edb9b1e9c94d Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Mon, 7 Oct 2024 15:57:09 +1100 Subject: [PATCH 2/7] versions.json: use the latest versions * "spack": "0.22", * "spack-packages": "development", * "spack-config": "2024.10.03" --- config/versions.json | 9 +++++---- config/versions.schema.json | 19 ------------------- 2 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 config/versions.schema.json diff --git a/config/versions.json b/config/versions.json index db8e43b..261ad09 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,6 @@ { - "$schema": "./versions.schema.json", - "spack-packages": "2024.03.22", - "spack-config": "2024.03.22" -} \ No newline at end of file + "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json", + "spack": "0.22", + "spack-packages": "development", + "spack-config": "2024.10.03" +} diff --git a/config/versions.schema.json b/config/versions.schema.json deleted file mode 100644 index 9184352..0000000 --- a/config/versions.schema.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2020-12/schema", - "title": "Deployment Environments", - "description": "A list of deployment targets that are supported", - "type": "object", - "properties": { - "$schema": { - "type": "string" - }, - "spack-packages": { - "type": "string" - }, - "spack-config": { - "type": "string" - } - }, - "required": [ "$schema", "spack-packages", "spack-config" ], - "additionalProperties": false -} \ No newline at end of file From ffdfc8406624cbfd1b78ce14e366ee5031aa046f Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 8 Oct 2024 09:20:04 +1100 Subject: [PATCH 3/7] Removed spack-config from versions.json, bumped access-om2 version to 2024.10.0 --- config/versions.json | 3 +-- spack.yaml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/versions.json b/config/versions.json index 261ad09..077aaf2 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,6 +1,5 @@ { "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json", "spack": "0.22", - "spack-packages": "development", - "spack-config": "2024.10.03" + "spack-packages": "development" } diff --git a/spack.yaml b/spack.yaml index 174df30..cb1ef19 100644 --- a/spack.yaml +++ b/spack.yaml @@ -5,7 +5,7 @@ spack: # add package specs to the `specs` list specs: - - access-om2@git.2024.03.0 + - access-om2@git.2024.10.0 packages: cice5: require: @@ -73,7 +73,7 @@ spack: 'SPACK_{name}_ROOT': '{prefix}' projections: all: '{name}/{version}' - access-om2: '{name}/2024.03.0' + access-om2: '{name}/2024.10.0' cice5: '{name}/2023.10.19' mom5: '{name}/2023.11.09' libaccessom2: '{name}/2023.10.26' From 09ce32edbf99b284b63fb3a0eb8f0ebf74a2ffd2 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 8 Oct 2024 09:22:13 +1100 Subject: [PATCH 4/7] Updated mom5 projection to 'development' --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index cb1ef19..a659483 100644 --- a/spack.yaml +++ b/spack.yaml @@ -75,6 +75,6 @@ spack: all: '{name}/{version}' access-om2: '{name}/2024.10.0' cice5: '{name}/2023.10.19' - mom5: '{name}/2023.11.09' + mom5: '{name}/development' libaccessom2: '{name}/2023.10.26' oasis3-mct: '{name}/2023.11.09' From 79ad46a3fd04b303087f18cf0c897bcc203a47cb Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 8 Oct 2024 10:56:28 +1100 Subject: [PATCH 5/7] Added comments, reset spack-packages to origin/development on target --- spack.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spack.yaml b/spack.yaml index a659483..8ab1dd2 100644 --- a/spack.yaml +++ b/spack.yaml @@ -12,6 +12,7 @@ spack: - '@git.2023.10.19' mom5: require: + # FIXME: This would need to be changed to a stable version before release - '@git.development' libaccessom2: require: @@ -33,9 +34,11 @@ spack: - '@4.0.2' access-fms: require: + # FIXME: This would need to be changed to a stable version before release - '@development' access-generic-tracers: require: + # FIXME: This would need to be changed to a stable version before release. - '@development' access-mocsy: require: From 75144711f3366e36f0f6a18296044a0ecd3ba3f3 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 8 Oct 2024 11:57:46 +1100 Subject: [PATCH 6/7] Updated versions.json schema to 3-0-0 --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 077aaf2..94a0c23 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json", + "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", "spack-packages": "development" } From 799674fa13c479b6d74c29069394b7e3e9e4f824 Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Wed, 9 Oct 2024 23:02:40 +1100 Subject: [PATCH 7/7] spack.yaml: Use tag dev_2024.08.14 instead of branch name --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 8ab1dd2..6e9326f 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,7 +13,7 @@ spack: mom5: require: # FIXME: This would need to be changed to a stable version before release - - '@git.development' + - '@git.dev_2024.08.14' libaccessom2: require: - '@git.2023.10.26' @@ -38,7 +38,7 @@ spack: - '@development' access-generic-tracers: require: - # FIXME: This would need to be changed to a stable version before release. + # FIXME: This would need to be changed to a stable version before release. - '@development' access-mocsy: require: @@ -78,6 +78,6 @@ spack: all: '{name}/{version}' access-om2: '{name}/2024.10.0' cice5: '{name}/2023.10.19' - mom5: '{name}/development' + mom5: '{name}/dev_2024.08.14' libaccessom2: '{name}/2023.10.26' oasis3-mct: '{name}/2023.11.09'