From 1c3a005f3ace6759a1a2bc0792be68bf01fbca04 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 12 Apr 2024 17:12:55 +1000 Subject: [PATCH 01/30] spack.yml: Modifying existing spack.yaml to use virtual package --- spack.yaml | 80 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 22 deletions(-) diff --git a/spack.yaml b/spack.yaml index 95ed9cc..b02c85b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,33 +4,69 @@ # configuration settings. spack: definitions: - - compilers: - - intel@2021.10.0 + # - compilers: + # - intel@2021.10.0 + # FIXME: What is to be done with the definitions for 'mpis' and 'serial_packages' - mpis: - openmpi@4.1.5 - serial_packages: - fortranxml@4.1.2 - - packages: - - esmf@8.5.0+debug - - parallelio@2.6.2 build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert - big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' - cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' - - netcdf-c@4.9.2 build_system=cmake build_type=RelWithDebInfo - - netcdf-fortran@4.6.1 - - fms@2023.02 precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision - build_type=RelWithDebInfo - - access-om3 +install_libraries + # - packages: + # - esmf@8.5.0+debug + # - parallelio@2.6.2 build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert + # big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' + # cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' + # - netcdf-c@4.9.2 build_system=cmake build_type=RelWithDebInfo + # - netcdf-fortran@4.6.1 + # - fms@2023.02 precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision + # build_type=RelWithDebInfo + # - access-om3 +install_libraries specs: - - matrix: - - [$mpis] - - [$%compilers] - - matrix: - - [$packages] - - [$^mpis] - - [$%compilers] - - matrix: - - [$serial_packages] - - [$%compilers] + - access-om3-virtual@git.2024.04.0 # FIXME: Add appropriate first version + packages: + access-om3: + require: + - '@git.v0.2.0' + - '+install_libraries' + esmf: + require: + - '@8.5.0' + - '+debug' + parallelio: + require: + - '@2.6.2' + - 'build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert' + - 'big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' + - 'cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' + netcdf-c: + require: + - '@4.9.2' + - 'build_system=cmake build_type=RelWithDebInfo' + netcdf-fortran: + require: + - '@4.6.1' + fms: + require: + - '@2023.02' + - 'precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision' + - 'build_type=RelWithDebInfo' + openmpi: + require: + - '@4.1.5' + + all: + compiler: [intel@19.0.5.281] + + # - matrix: + # - [$mpis] + # - [$%compilers] + # - matrix: + # - [$packages] + # - [$^mpis] + # - [$%compilers] + # - matrix: + # - [$serial_packages] + # - [$%compilers] view: true concretizer: unify: true From d0cfa71dbae89b3fb3d2f3ac32588e4a1693367e Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 15 Apr 2024 11:02:21 +1000 Subject: [PATCH 02/30] spack.yaml: Merged some of the sections into one line --- spack.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spack.yaml b/spack.yaml index b02c85b..c4f62b9 100644 --- a/spack.yaml +++ b/spack.yaml @@ -35,9 +35,7 @@ spack: parallelio: require: - '@2.6.2' - - 'build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert' - - 'big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' - - 'cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' + - build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' netcdf-c: require: - '@4.9.2' @@ -48,8 +46,7 @@ spack: fms: require: - '@2023.02' - - 'precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision' - - 'build_type=RelWithDebInfo' + - precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision build_type=RelWithDebInfo openmpi: require: - '@4.1.5' From 9c0b02d461a8f346083ef7c4a08f3346051e814a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 15 Apr 2024 13:55:45 +1000 Subject: [PATCH 03/30] spack.yaml: Updated spack.modules to be in line with access-om2-style spack.yaml --- spack.yaml | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index c4f62b9..9701b9a 100644 --- a/spack.yaml +++ b/spack.yaml @@ -69,7 +69,32 @@ spack: unify: true modules: default: + enable: + - tcl roots: - tcl: $spack/../modules/access-om3/0.x.0 + tcl: $spack/../release/modules + lmod: $spack/../release/lmod tcl: - naming_scheme: '{name}/{version}' + hash_length: 0 + include: + - access-om3-virtual + - access-om3 + exclude_implicits: true + all: + autoload: direct + conflict: + - '{name}' + environment: + set: + 'SPACK_{name}_ROOT': '{prefix}' + projections: + all: '{name}/{version}' + access-om3-virtual: '{name}/2024.04.0' + access-om3: '{name}/v0.2.0' + + # modules: + # default: + # roots: + # tcl: $spack/../modules/access-om3/0.x.0 + # tcl: + # naming_scheme: '{name}/{version}' From 453f4212646cd9fa81ab87637613c126bc1643e4 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 15 Apr 2024 15:10:00 +1000 Subject: [PATCH 04/30] spack.yaml: Compiler updated to original 2021.10.0 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 9701b9a..f3bdce0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -52,7 +52,7 @@ spack: - '@4.1.5' all: - compiler: [intel@19.0.5.281] + compiler: [intel@2021.10.0] # - matrix: # - [$mpis] From 7653878541814cae5171ea6397159a7d54a235c4 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 15 Apr 2024 15:32:42 +1000 Subject: [PATCH 05/30] spack.yaml: Removed comments, updated projections, moved last of the definitions into spack.packages --- spack.yaml | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/spack.yaml b/spack.yaml index f3bdce0..b736f20 100644 --- a/spack.yaml +++ b/spack.yaml @@ -3,26 +3,8 @@ # It describes a set of packages to be installed, along with # configuration settings. spack: - definitions: - # - compilers: - # - intel@2021.10.0 - # FIXME: What is to be done with the definitions for 'mpis' and 'serial_packages' - - mpis: - - openmpi@4.1.5 - - serial_packages: - - fortranxml@4.1.2 - # - packages: - # - esmf@8.5.0+debug - # - parallelio@2.6.2 build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert - # big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' - # cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' - # - netcdf-c@4.9.2 build_system=cmake build_type=RelWithDebInfo - # - netcdf-fortran@4.6.1 - # - fms@2023.02 precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision - # build_type=RelWithDebInfo - # - access-om3 +install_libraries specs: - - access-om3-virtual@git.2024.04.0 # FIXME: Add appropriate first version + - access-om3-virtual@git.2024.04.0 packages: access-om3: require: @@ -50,20 +32,12 @@ spack: openmpi: require: - '@4.1.5' - + fortranxml: + require: + - '@4.1.2' + # Defaulting all packages to the given compiler all: compiler: [intel@2021.10.0] - - # - matrix: - # - [$mpis] - # - [$%compilers] - # - matrix: - # - [$packages] - # - [$^mpis] - # - [$%compilers] - # - matrix: - # - [$serial_packages] - # - [$%compilers] view: true concretizer: unify: true @@ -78,7 +52,6 @@ spack: hash_length: 0 include: - access-om3-virtual - - access-om3 exclude_implicits: true all: autoload: direct @@ -89,12 +62,4 @@ spack: 'SPACK_{name}_ROOT': '{prefix}' projections: all: '{name}/{version}' - access-om3-virtual: '{name}/2024.04.0' - access-om3: '{name}/v0.2.0' - - # modules: - # default: - # roots: - # tcl: $spack/../modules/access-om3/0.x.0 - # tcl: - # naming_scheme: '{name}/{version}' + access-om3-virtual: 'access-om3/2024.04.0' From 6478ae308cf738e4a9dfcc88fb1118b9c4113bdb Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 18 Apr 2024 10:03:33 +1000 Subject: [PATCH 06/30] Modified spack.yaml to be in line with the original 0.2.0 spack.yaml --- spack.yaml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/spack.yaml b/spack.yaml index b736f20..f31455c 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,43 +4,41 @@ # configuration settings. spack: specs: - - access-om3-virtual@git.2024.04.0 + - access-om3@git.2024.04.0 packages: - access-om3: + access-om3-nuopc: require: - - '@git.v0.2.0' + - '@git.0.2.0' - '+install_libraries' esmf: require: - - '@8.5.0' - - '+debug' + - '@8.4.2' + - +debug parallelio: require: - - '@2.6.2' - - build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' + - '@2.5.10' + - "build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source -O2 -debug minimal' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99 -O2 -debug minimal'" netcdf-c: require: - '@4.9.2' - - 'build_system=cmake build_type=RelWithDebInfo' + - build_system=cmake build_type=RelWithDebInfo netcdf-fortran: require: - - '@4.6.1' + - '@4.6.0' fms: require: - - '@2023.02' - - precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision build_type=RelWithDebInfo + - '@git.2021.03.01' + - "precision=64 +large_file ~gfs_phys ~openmp ~quad_precision build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source -O2 -debug minimal' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99 -O2 -debug minimal'" openmpi: require: - - '@4.1.5' - fortranxml: - require: - - '@4.1.2' - # Defaulting all packages to the given compiler + - '@4.1.4' all: - compiler: [intel@2021.10.0] + compiler: [intel@2021.6.0] view: true concretizer: unify: true + targets: + granularity: generic modules: default: enable: @@ -51,7 +49,7 @@ spack: tcl: hash_length: 0 include: - - access-om3-virtual + - access-om3 exclude_implicits: true all: autoload: direct @@ -62,4 +60,4 @@ spack: 'SPACK_{name}_ROOT': '{prefix}' projections: all: '{name}/{version}' - access-om3-virtual: 'access-om3/2024.04.0' + access-om3: '{name}/2024.04.0' From a69885ff58bc4bfab1a1fb5296f30bc001b3b0cc Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 18 Apr 2024 17:12:01 +1000 Subject: [PATCH 07/30] spack.yaml: Uses 0.x.0 spack.yaml as a base, and uses new variants field --- spack.yaml | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/spack.yaml b/spack.yaml index f31455c..425e432 100644 --- a/spack.yaml +++ b/spack.yaml @@ -7,38 +7,33 @@ spack: - access-om3@git.2024.04.0 packages: access-om3-nuopc: - require: - - '@git.0.2.0' - - '+install_libraries' + require: '@git.0.3.0' + variants: +install_libraries + esmf: - require: - - '@8.4.2' - - +debug + require: '@8.5.0' + variants: +debug parallelio: - require: - - '@2.5.10' - - "build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source -O2 -debug minimal' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99 -O2 -debug minimal'" + require: @2.6.2 + variants: build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' netcdf-c: - require: - - '@4.9.2' - - build_system=cmake build_type=RelWithDebInfo + require: '@4.9.2' + variants: build_system=cmake build_type=RelWithDebInfo netcdf-fortran: - require: - - '@4.6.0' + require: '@4.6.1' fms: - require: - - '@git.2021.03.01' - - "precision=64 +large_file ~gfs_phys ~openmp ~quad_precision build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source -O2 -debug minimal' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99 -O2 -debug minimal'" + require: '@2023.02' + variants: precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision build_type=RelWithDebInfo openmpi: - require: - - '@4.1.4' + require: '@4.1.5' + fortranxml: + require: '@4.1.2' + all: - compiler: [intel@2021.6.0] + compilers: [intel@2021.6.0] view: true concretizer: unify: true - targets: - granularity: generic modules: default: enable: From bcab7358127757f30fe2f2585dc43a077defbccf Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 18 Apr 2024 17:18:51 +1000 Subject: [PATCH 08/30] versions.json: Updated spack-packages to 2024.04.19 --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index db8e43b..2587197 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "./versions.schema.json", - "spack-packages": "2024.03.22", + "spack-packages": "2024.04.19", "spack-config": "2024.03.22" } \ No newline at end of file From 672d48f9538b9829b310cf25243db5b7ba7f8d16 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 18 Apr 2024 18:05:44 +1000 Subject: [PATCH 09/30] spack.yaml: quoted version of parallelio --- spack.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 425e432..eceffb3 100644 --- a/spack.yaml +++ b/spack.yaml @@ -9,12 +9,11 @@ spack: access-om3-nuopc: require: '@git.0.3.0' variants: +install_libraries - esmf: require: '@8.5.0' variants: +debug parallelio: - require: @2.6.2 + require: '@2.6.2' variants: build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' netcdf-c: require: '@4.9.2' From 0ecf825dc0ce2580cca00870d932ff1f8a77d0c5 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 18 Apr 2024 18:10:19 +1000 Subject: [PATCH 10/30] spack.yaml: Added valid compiler field --- spack.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index eceffb3..429d389 100644 --- a/spack.yaml +++ b/spack.yaml @@ -9,6 +9,7 @@ spack: access-om3-nuopc: require: '@git.0.3.0' variants: +install_libraries + esmf: require: '@8.5.0' variants: +debug @@ -29,7 +30,7 @@ spack: require: '@4.1.2' all: - compilers: [intel@2021.6.0] + compiler: [intel@2021.6.0] view: true concretizer: unify: true From 3ba8b836616c65f429676e26260343e499806909 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 19 Apr 2024 17:38:11 +1000 Subject: [PATCH 11/30] spack.yaml: Now requires variants rather than prefers --- spack.yaml | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/spack.yaml b/spack.yaml index 429d389..04c67d0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -7,27 +7,35 @@ spack: - access-om3@git.2024.04.0 packages: access-om3-nuopc: - require: '@git.0.3.0' - variants: +install_libraries + require: + - '@git.0.3.0' + - +install_libraries esmf: - require: '@8.5.0' - variants: +debug + require: + - '@8.5.0' + - +debug parallelio: - require: '@2.6.2' - variants: build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' + require: + - '@2.6.2' + - build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' netcdf-c: - require: '@4.9.2' - variants: build_system=cmake build_type=RelWithDebInfo + require: + - '@4.9.2' + - build_system=cmake build_type=RelWithDebInfo netcdf-fortran: - require: '@4.6.1' + require: + - '@4.6.1' fms: - require: '@2023.02' - variants: precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision build_type=RelWithDebInfo + require: + - '@2023.02' + - precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision build_type=RelWithDebInfo openmpi: - require: '@4.1.5' + require: + - '@4.1.5' fortranxml: - require: '@4.1.2' + require: + - '@4.1.2' all: compiler: [intel@2021.6.0] From 969a922f420f25870becbbfdf2058901adbfeabb Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 22 Apr 2024 09:04:53 +1000 Subject: [PATCH 12/30] versions.json: Updated spack-packages to 2024.04.20 --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 2587197..8e45f52 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "./versions.schema.json", - "spack-packages": "2024.04.19", + "spack-packages": "2024.04.20", "spack-config": "2024.03.22" } \ No newline at end of file From a4d433211e79c83c87ef10627a6fd4aa89fdbf15 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 22 Apr 2024 11:39:18 +1000 Subject: [PATCH 13/30] versions.json: Deploying using the development version of spack-config --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 8e45f52..892d345 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "./versions.schema.json", "spack-packages": "2024.04.20", - "spack-config": "2024.03.22" + "spack-config": "development" } \ No newline at end of file From e352bd06fe3bf4c2d1b94c058cd8c13d32b812da Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 22 Apr 2024 20:19:11 +1000 Subject: [PATCH 14/30] versions.json: Updated spack config to 2024.04.22 --- config/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/versions.json b/config/versions.json index 892d345..2c56a5d 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "./versions.schema.json", "spack-packages": "2024.04.20", - "spack-config": "development" -} \ No newline at end of file + "spack-config": "2024.04.22" +} From 40d10860cdfc6e46c278b83ae70412e053195a9d Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 23 Apr 2024 12:17:54 +1000 Subject: [PATCH 15/30] versions.json: Updated spack-config to 2024.04.23 (added openmpi 4.x versions) --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 2c56a5d..7a9ba24 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "./versions.schema.json", "spack-packages": "2024.04.20", - "spack-config": "2024.04.22" + "spack-config": "2024.04.23" } From ecb416c7c5a2f0a2e3f8782a9a40d80916d821ec Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 3 May 2024 09:08:51 +1000 Subject: [PATCH 16/30] spack.yaml: Removed variants and compiler flags to https://github.com/ACCESS-NRI/spack-packages/pull/103 --- spack.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index 04c67d0..0ed063f 100644 --- a/spack.yaml +++ b/spack.yaml @@ -9,16 +9,13 @@ spack: access-om3-nuopc: require: - '@git.0.3.0' - - +install_libraries esmf: require: - '@8.5.0' - - +debug parallelio: require: - '@2.6.2' - - build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source' cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99' netcdf-c: require: - '@4.9.2' @@ -29,7 +26,6 @@ spack: fms: require: - '@2023.02' - - precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision build_type=RelWithDebInfo openmpi: require: - '@4.1.5' From 60a163f0393ad532736a74397c238b4ffe8b379c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 3 May 2024 11:20:59 +1000 Subject: [PATCH 17/30] versions.json: Updated spack-packages to https://github.com/ACCESS-NRI/spack-packages/releases/tag/2024.05.03 --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 7a9ba24..ed25aa8 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "./versions.schema.json", - "spack-packages": "2024.04.20", + "spack-packages": "2024.05.03", "spack-config": "2024.04.23" } From ceac574a87ebee57345dc29a08cb4bcd0c248f61 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 6 May 2024 14:14:02 +1000 Subject: [PATCH 18/30] spack.yaml: Renamed exclude_implicits to hide_implicits --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 0ed063f..4dee6a3 100644 --- a/spack.yaml +++ b/spack.yaml @@ -49,7 +49,7 @@ spack: hash_length: 0 include: - access-om3 - exclude_implicits: true + hide_implicits: true all: autoload: direct conflict: From 0ebbbacec39770f2bd3a1b58cca2ea8ed592d403 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 6 May 2024 15:45:16 +1000 Subject: [PATCH 19/30] spack.yaml: Added spack.packages.all.target: x86_64 --- spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack.yaml b/spack.yaml index 4dee6a3..71ac774 100644 --- a/spack.yaml +++ b/spack.yaml @@ -35,6 +35,7 @@ spack: all: compiler: [intel@2021.6.0] + target: [x86_64] view: true concretizer: unify: true From f48963a92c6799aaa0a5131c7f070fc373bea861 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 24 May 2024 16:39:27 +1000 Subject: [PATCH 20/30] config: versions.json now conforms to the 2-0-0 schema, deleted local schema --- config/versions.json | 3 ++- config/versions.schema.json | 19 ------------------- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 config/versions.schema.json diff --git a/config/versions.json b/config/versions.json index ed25aa8..44cdcfc 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,6 @@ { - "$schema": "./versions.schema.json", + "$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.05.03", "spack-config": "2024.04.23" } 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 01726c2742574bb95fd2fe664e6e5a7b1988f1c7 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 9 Jul 2024 08:21:54 +1000 Subject: [PATCH 21/30] versions.json: Update spack to 0.22, bulk update of spack-packages, spack-config --- config/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/versions.json b/config/versions.json index 44cdcfc..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.21", - "spack-packages": "2024.05.03", - "spack-config": "2024.04.23" + "spack": "0.22", + "spack-packages": "2024.07.08", + "spack-config": "2024.07.05" } From f1b9ec5b932b158731eb4629b8ecd10b6abfa613 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 9 Jul 2024 08:22:19 +1000 Subject: [PATCH 22/30] spack.yaml: exclude_implicits, compiler/target requirement --- spack.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 71ac774..6f3f3d4 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,6 +13,7 @@ spack: esmf: require: - '@8.5.0' + - '-fp-model=precise' parallelio: require: - '@2.6.2' @@ -34,8 +35,9 @@ spack: - '@4.1.2' all: - compiler: [intel@2021.6.0] - target: [x86_64] + require: + - '%intel@2021.6.0' + - target=x86_64 view: true concretizer: unify: true @@ -50,7 +52,7 @@ spack: hash_length: 0 include: - access-om3 - hide_implicits: true + exclude_implicits: true all: autoload: direct conflict: From d5c546b6e81a7e1dd6c5dc68c932dc28da6b6177 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 9 Jul 2024 08:27:29 +1000 Subject: [PATCH 23/30] spack.yaml: Remove -fp-model precise --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 6f3f3d4..32a7b01 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,7 +13,7 @@ spack: esmf: require: - '@8.5.0' - - '-fp-model=precise' + # - '-fp-model=precise' parallelio: require: - '@2.6.2' From e6ae976d6d2ed2078b801192ad79b2dea1be1407 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 19 Jul 2024 09:30:21 +1000 Subject: [PATCH 24/30] spack.yaml: Added comments, deploying with latest version of spack --- spack.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack.yaml b/spack.yaml index 32a7b01..c12879b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -6,10 +6,12 @@ spack: specs: - access-om3@git.2024.04.0 packages: + # Main Dependencies access-om3-nuopc: require: - '@git.0.3.0' + # Other Dependencies esmf: require: - '@8.5.0' From 4ee6f99ef02163ef233cb8f0db13c6b1cb3ff4e8 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Fri, 23 Aug 2024 08:59:02 +1000 Subject: [PATCH 25/30] Update compiler to intel@2021.10.0 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index c12879b..635ffa3 100644 --- a/spack.yaml +++ b/spack.yaml @@ -38,7 +38,7 @@ spack: all: require: - - '%intel@2021.6.0' + - '%intel@2021.10.0' - target=x86_64 view: true concretizer: From 26947ae2e154925a0096f962690a92c74a6a4fc9 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:34:12 +1000 Subject: [PATCH 26/30] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 635ffa3..c7e36f0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -15,7 +15,6 @@ spack: esmf: require: - '@8.5.0' - # - '-fp-model=precise' parallelio: require: - '@2.6.2' @@ -54,6 +53,7 @@ spack: hash_length: 0 include: - access-om3 + - access-om3-nuopc exclude_implicits: true all: autoload: direct From bb1496d5995e9d99deb581c389d13ffaf3b6070f Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:45:56 +1000 Subject: [PATCH 27/30] Update spack.yaml --- spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack.yaml b/spack.yaml index c7e36f0..36a5f27 100644 --- a/spack.yaml +++ b/spack.yaml @@ -65,3 +65,4 @@ spack: projections: all: '{name}/{version}' access-om3: '{name}/2024.04.0' + access-om3-nuopc: '{name}/0.3.0' From ca8fd7158f8576e9002dd6163f7dc4a64dcd6539 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:24:40 +1000 Subject: [PATCH 28/30] update to OM3 latest source --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 36a5f27..dc32376 100644 --- a/spack.yaml +++ b/spack.yaml @@ -9,7 +9,7 @@ spack: # Main Dependencies access-om3-nuopc: require: - - '@git.0.3.0' + - '@git.0.3.1' # Other Dependencies esmf: @@ -65,4 +65,4 @@ spack: projections: all: '{name}/{version}' access-om3: '{name}/2024.04.0' - access-om3-nuopc: '{name}/0.3.0' + access-om3-nuopc: '{name}/0.3.1' From ce472bb1bfd5a04f908f95b94cd3d49cb2c42aa2 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:57:52 +1000 Subject: [PATCH 29/30] Update spack.yaml --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index dc32376..31386d2 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,7 +4,7 @@ # configuration settings. spack: specs: - - access-om3@git.2024.04.0 + - access-om3@git.2024.09.0 packages: # Main Dependencies access-om3-nuopc: @@ -64,5 +64,5 @@ spack: 'SPACK_{name}_ROOT': '{prefix}' projections: all: '{name}/{version}' - access-om3: '{name}/2024.04.0' + access-om3: '{name}/2024.09.0' access-om3-nuopc: '{name}/0.3.1' From 0672015917f7b42b4b5a0717d5281f81dded8df6 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 23 Sep 2024 14:27:35 +1000 Subject: [PATCH 30/30] Added quotes to target --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 31386d2..6e100e5 100644 --- a/spack.yaml +++ b/spack.yaml @@ -38,7 +38,7 @@ spack: all: require: - '%intel@2021.10.0' - - target=x86_64 + - 'target=x86_64' view: true concretizer: unify: true