From a51c30361c9d3e3a8127da4111d33df20f91ce2c Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:45:48 +1100 Subject: [PATCH 01/18] Update spack.yaml to demonstrate new spack components --- spack.yaml | 59 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/spack.yaml b/spack.yaml index 514b28eb..f753b6fd 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,43 +4,54 @@ # configuration settings. # Instructions for editing this file are found in # https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml +# This is a Spack Environment file. +# +# It describes a set of packages to be installed, along with +# configuration settings. spack: + # add package specs to the `specs` list specs: - - access-om3@git.2024.09.0 + - access-om3@git.2025.x.0 packages: - # Main Dependencies - access-om3-nuopc: + access3-exe: + require: + - '@git.share_prototype' + - 'configurations=CICE6' + access-cice: + require: + - '@git.5-port_cmake_build io_type=PIO' + # access-mom6: + # require: + # - '@git.5-port_cmake_build io_type=PIO' + # access-ww3: + # require: + # - '@git.5-port_cmake_build io_type=PIO' + access3-share: require: - - '@git.0.3.1' - - # Other Dependencies + - '@git.share_prototype' esmf: require: - - '@8.5.0' + - '@git.v8.7.0' + fms: + require: + - '@git.2024.03' parallelio: require: - - '@2.6.2' + - '@2.6.2' netcdf-c: require: - - '@4.9.2' - - build_system=cmake build_type=RelWithDebInfo + - '@4.9.2' + - build_system=cmake build_type=RelWithDebInfo netcdf-fortran: require: - - '@4.6.1' - fms: - require: - - '@2023.02' + - '@4.6.1' openmpi: require: - - '@4.1.5' - fortranxml: - require: - - '@4.1.2' - + - '@4.1.7' all: require: - - '%intel@2021.10.0' - - 'target=x86_64' + - '%intel@2021.10.0' + - target=x86_64 view: true concretizer: unify: true @@ -49,7 +60,7 @@ spack: tcl: include: - access-om3 - - access-om3-nuopc + - access3-exe projections: - access-om3: '{name}/2024.09.0' - access-om3-nuopc: '{name}/0.3.1-{hash:7}' + access-om3: '{name}/2025.x.0' + access3-exe: '{name}/git.share_prototype-{hash:7}' From 99a3c68652f2d72b2ab281c200016cb1b466aaa6 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:46:37 +1100 Subject: [PATCH 02/18] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index a06ba925..4a92e5c3 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "http://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "2024.07.08" + "spack-packages": "163-om3-components" } From 8d650f772867f3f5e2791bbcceffd336068900d0 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:48:40 +1100 Subject: [PATCH 03/18] Update spack.yaml --- spack.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spack.yaml b/spack.yaml index f753b6fd..5be92878 100644 --- a/spack.yaml +++ b/spack.yaml @@ -31,23 +31,23 @@ spack: - '@git.share_prototype' esmf: require: - - '@git.v8.7.0' + - '@git.v8.7.0' fms: require: - '@git.2024.03' parallelio: require: - - '@2.6.2' + - '@2.6.2' netcdf-c: require: - - '@4.9.2' - - build_system=cmake build_type=RelWithDebInfo + - '@4.9.2' + - build_system=cmake build_type=RelWithDebInfo netcdf-fortran: require: - - '@4.6.1' + - '@4.6.1' openmpi: require: - - '@4.1.7' + - '@4.1.7' all: require: - '%intel@2021.10.0' From e24e70187877cd9bac53fb337ba1415ab526f731 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:50:57 +1100 Subject: [PATCH 04/18] Update spack.yaml --- spack.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index 5be92878..06edda9f 100644 --- a/spack.yaml +++ b/spack.yaml @@ -19,7 +19,7 @@ spack: - 'configurations=CICE6' access-cice: require: - - '@git.5-port_cmake_build io_type=PIO' + - '@git.5-port_cmake_build io_type=PIO' # access-mom6: # require: # - '@git.5-port_cmake_build io_type=PIO' @@ -28,7 +28,7 @@ spack: # - '@git.5-port_cmake_build io_type=PIO' access3-share: require: - - '@git.share_prototype' + - '@git.share_prototype' esmf: require: - '@git.v8.7.0' @@ -50,8 +50,8 @@ spack: - '@4.1.7' all: require: - - '%intel@2021.10.0' - - target=x86_64 + - '%intel@2021.10.0' + - target=x86_64 view: true concretizer: unify: true From 03144e0c0d83ba4b05f5c6efbdab49d7ade9133d Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:54:48 +1100 Subject: [PATCH 05/18] Update spack.yaml --- spack.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 06edda9f..5fa3c890 100644 --- a/spack.yaml +++ b/spack.yaml @@ -19,7 +19,8 @@ spack: - 'configurations=CICE6' access-cice: require: - - '@git.5-port_cmake_build io_type=PIO' + - '@git.5-port_cmake_build' + - 'io_type=PIO' # access-mom6: # require: # - '@git.5-port_cmake_build io_type=PIO' From e750ce81ce380e54cf8c1c57bc15d100ff5a7059 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:55:51 +1100 Subject: [PATCH 06/18] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 5fa3c890..da2e979b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -64,4 +64,4 @@ spack: - access3-exe projections: access-om3: '{name}/2025.x.0' - access3-exe: '{name}/git.share_prototype-{hash:7}' + access3-exe: '{name}/share_prototype-{hash:7}' From a9748ed58aae62b2b27b76b14808506558130ebb Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:56:15 +1100 Subject: [PATCH 07/18] Update spack.yaml --- spack.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index da2e979b..2624d616 100644 --- a/spack.yaml +++ b/spack.yaml @@ -21,9 +21,11 @@ spack: require: - '@git.5-port_cmake_build' - 'io_type=PIO' - # access-mom6: - # require: - # - '@git.5-port_cmake_build io_type=PIO' + access-mom6: + require: + - '@git.cmake_build' + #access-generic-tracers: + #... # access-ww3: # require: # - '@git.5-port_cmake_build io_type=PIO' From 5e067396cb284ee451fd355364a22f12df554e6d Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:02:48 +1100 Subject: [PATCH 08/18] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 2624d616..1346a285 100644 --- a/spack.yaml +++ b/spack.yaml @@ -16,7 +16,7 @@ spack: access3-exe: require: - '@git.share_prototype' - - 'configurations=CICE6' + - 'configurations=MOM6-CICE6' access-cice: require: - '@git.5-port_cmake_build' From e7cb77a651fc5fa44a42dcd1cfff51bd31da6d29 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 13 Mar 2025 16:33:40 +1100 Subject: [PATCH 09/18] Update spack.yaml --- spack.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/spack.yaml b/spack.yaml index 1346a285..f01b4614 100644 --- a/spack.yaml +++ b/spack.yaml @@ -16,7 +16,7 @@ spack: access3-exe: require: - '@git.share_prototype' - - 'configurations=MOM6-CICE6' + - 'configurations=MOM6-CICE6-WW3' access-cice: require: - '@git.5-port_cmake_build' @@ -24,11 +24,9 @@ spack: access-mom6: require: - '@git.cmake_build' - #access-generic-tracers: - #... - # access-ww3: - # require: - # - '@git.5-port_cmake_build io_type=PIO' + access-ww3: + require: + - '@git.1-cmake_build' access3-share: require: - '@git.share_prototype' @@ -51,10 +49,13 @@ spack: openmpi: require: - '@4.1.7' + gcc-runtime: + require: + - '%gcc' all: require: - - '%intel@2021.10.0' - - target=x86_64 + - '%oneapi@2025.0.4' + - target=x86_64_v4 view: true concretizer: unify: true From 07c8aa51560a91aefae4afa5e49df111c910cdab Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Mon, 17 Mar 2025 16:52:09 +1100 Subject: [PATCH 10/18] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index f01b4614..82d4d536 100644 --- a/spack.yaml +++ b/spack.yaml @@ -16,7 +16,7 @@ spack: access3-exe: require: - '@git.share_prototype' - - 'configurations=MOM6-CICE6-WW3' + - 'configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3' access-cice: require: - '@git.5-port_cmake_build' From b7a9299c1f9331e5d883d679ea0932fd81b2b19c Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 20 Mar 2025 13:31:41 +1100 Subject: [PATCH 11/18] use git hash for share --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 82d4d536..a79b69ca 100644 --- a/spack.yaml +++ b/spack.yaml @@ -29,7 +29,7 @@ spack: - '@git.1-cmake_build' access3-share: require: - - '@git.share_prototype' + - '@git.db7726a75de14a02acb3ee09efe6b3adf8db5c5e' esmf: require: - '@git.v8.7.0' From e8820396da6e4f605a2d0b0c49f3282089917e76 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Wed, 26 Mar 2025 16:54:35 +1100 Subject: [PATCH 12/18] Update spack.yaml --- spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack.yaml b/spack.yaml index a79b69ca..22db6ee1 100644 --- a/spack.yaml +++ b/spack.yaml @@ -24,6 +24,7 @@ spack: access-mom6: require: - '@git.cmake_build' + - '+asymmetric_mem' access-ww3: require: - '@git.1-cmake_build' From 495adc006537411d95a1d8444448f1e6756cad15 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 27 Mar 2025 10:55:31 +1100 Subject: [PATCH 13/18] Force spack to use the right cice commit --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 22db6ee1..9c0f70ed 100644 --- a/spack.yaml +++ b/spack.yaml @@ -19,7 +19,7 @@ spack: - 'configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3' access-cice: require: - - '@git.5-port_cmake_build' + - '@git.421a90ccc47b7861afa48f5384f642715c5560e1' - 'io_type=PIO' access-mom6: require: From 23cfecd4bb7107ae0852d36efef8cbcc60eb1c00 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 27 Mar 2025 13:30:56 +1100 Subject: [PATCH 14/18] Use commit hashes --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 9c0f70ed..d2478a4e 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,11 +23,11 @@ spack: - 'io_type=PIO' access-mom6: require: - - '@git.cmake_build' + - '@git.ddd3902d851ccb50fc3e62f27398b48b5294085d' - '+asymmetric_mem' access-ww3: require: - - '@git.1-cmake_build' + - '@git.97655811bb003567c0f87b8aecb0489e85a5d446' access3-share: require: - '@git.db7726a75de14a02acb3ee09efe6b3adf8db5c5e' From 9b9cea229491492c3b0bc383f26fd77908b54dbd Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 27 Mar 2025 14:02:36 +1100 Subject: [PATCH 15/18] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index d2478a4e..fa91ecb9 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,7 +23,7 @@ spack: - 'io_type=PIO' access-mom6: require: - - '@git.ddd3902d851ccb50fc3e62f27398b48b5294085d' + - '@git.cmake_build' - '+asymmetric_mem' access-ww3: require: From 775024b31ed24cee0893c091e4ba33ec10571912 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:03:16 +1100 Subject: [PATCH 16/18] Use some release tags --- spack.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spack.yaml b/spack.yaml index fa91ecb9..eb01ddff 100644 --- a/spack.yaml +++ b/spack.yaml @@ -15,22 +15,22 @@ spack: packages: access3-exe: require: - - '@git.share_prototype' + - '@git.2025.03.0' - 'configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3' access-cice: require: - - '@git.421a90ccc47b7861afa48f5384f642715c5560e1' + - '@git.2025.01.1' - 'io_type=PIO' access-mom6: - require: - - '@git.cmake_build' - - '+asymmetric_mem' + require: + - '@git.cmake_build' + - '+asymmetric_mem' access-ww3: require: - - '@git.97655811bb003567c0f87b8aecb0489e85a5d446' + - '@git.2025.03.0' access3-share: require: - - '@git.db7726a75de14a02acb3ee09efe6b3adf8db5c5e' + - '@git.2025.03.0' esmf: require: - '@git.v8.7.0' @@ -55,7 +55,7 @@ spack: - '%gcc' all: require: - - '%oneapi@2025.0.4' + - %oneapi@2025.0.4 - target=x86_64_v4 view: true concretizer: From 426829494d8a2840c56717bff31e1b348bae9676 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:06:03 +1100 Subject: [PATCH 17/18] Some ' --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index eb01ddff..4677d2de 100644 --- a/spack.yaml +++ b/spack.yaml @@ -16,11 +16,11 @@ spack: access3-exe: require: - '@git.2025.03.0' - - 'configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3' + - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3 access-cice: require: - '@git.2025.01.1' - - 'io_type=PIO' + - io_type=PIO access-mom6: require: - '@git.cmake_build' @@ -55,7 +55,7 @@ spack: - '%gcc' all: require: - - %oneapi@2025.0.4 + - '%oneapi@2025.0.4' - target=x86_64_v4 view: true concretizer: From 5d3d92c7ee204d270f44ab471d838cd60617fc39 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:53:25 +1100 Subject: [PATCH 18/18] Name change access3-exe to access3 --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 4677d2de..89fe7847 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,7 +13,7 @@ spack: specs: - access-om3@git.2025.x.0 packages: - access3-exe: + access3: require: - '@git.2025.03.0' - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3 @@ -68,4 +68,4 @@ spack: - access3-exe projections: access-om3: '{name}/2025.x.0' - access3-exe: '{name}/share_prototype-{hash:7}' + access3: '{name}/share_prototype-{hash:7}'