From 209c7796eaf9313133df72e74c97e232955e439d Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Mon, 29 Jan 2024 16:32:08 +0100 Subject: [PATCH 01/42] inital update --- .gitmodules | 2 +- spack | 2 +- sysconfigs/daint/config.yaml | 2 - sysconfigs/daint/modules.yaml | 87 ----------------------------------- 4 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 sysconfigs/daint/modules.yaml diff --git a/.gitmodules b/.gitmodules index be1fdad253..df1ec05f41 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "spack"] path = spack - url = https://github.com/dominichofer/spack.git + url = https://github.com/spack/spack.git diff --git a/spack b/spack index f0fcd2734a..e30fedab10 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit f0fcd2734a3a0d82a1a0f69fef7b8cc301ae48a8 +Subproject commit e30fedab102f9281a220fb4fae82e3f8c43a82ac diff --git a/sysconfigs/daint/config.yaml b/sysconfigs/daint/config.yaml index fec1c3dfb2..2533771b03 100644 --- a/sysconfigs/daint/config.yaml +++ b/sysconfigs/daint/config.yaml @@ -1,6 +1,4 @@ config: - extensions: - - '$spack/../tools/spack-scripting' build_stage: '$spack/../spack-build_stage' test_stage: '$spack/../spack-test_stage' misc_cache: '$spack/../spack-misc_cache' diff --git a/sysconfigs/daint/modules.yaml b/sysconfigs/daint/modules.yaml deleted file mode 100644 index 666b539367..0000000000 --- a/sysconfigs/daint/modules.yaml +++ /dev/null @@ -1,87 +0,0 @@ -modules: - default: - enable: - - tcl - tcl: - all: - autoload: 'direct' - naming_scheme: '${PACKAGE}/${VERSION}' - hash_length: 7 - blacklist: ['cmake', 'slurm', 'boost', 'automake', 'autoconf', 'jasper', 'libtool', 'm4', 'ncurses', 'netcdf-c', 'netcdf-fortran', 'perl', 'libjpeg'] - boost: - environment: - set: - BOOST_ROOT: '${PREFIX}' - gridtools: - environment: - set: - GRIDTOOLS_DIR: '${PREFIX}' - GRIDTOOLS_ROOT: '${PREFIX}' - cosmo-dycore: - environment: - set: - DYCOREGT_DIR: '${PREFIX}' - UCX_MEMTYPE_CACHE: 'n' - UCX_TLS: 'rc_x,ud_x,mm,shm,cuda_copy,cuda_ipc,cma' - MPICH_G2G_PIPELINE: '64' - MPICH_RDMA_ENABLED_CUDA: '1' - cosmo-grib-api-definitions: - environment: - prepend_path: - GRIB_DEFINITION_PATH: '${PREFIX}/cosmoDefinitions/definitions/' - GRIB_SAMPLES_PATH: '${PREFIX}/cosmoDefinitions/samples' - cosmo-grib-api: - environment: - set: - GRIBAPI_DIR: '${PREFIX}' - prepend_path: - GRIB_DEFINITION_PATH: '{PREFIX}/share/grib_api/definitions' - cosmo-eccodes-definitions: - environment: - prepend_path: - GRIB_DEFINITION_PATH: '${PREFIX}/cosmoDefinitions/definitions/' - GRIB_SAMPLES_PATH: '${PREFIX}/cosmoDefinitions/samples' - eccodes: - environment: - set: - GRIBAPI_DIR: '${PREFIX}' - prepend_path: - GRIB_DEFINITION_PATH: '{PREFIX}/share/eccodes/definitions' - serialbox: - environment: - set: - SERIALBOX_DIR: '${PREFIX}' - SERIALBOX_ROOT: '${PREFIX}' - claw: - environment: - set: - CLAWDIR: '${PREFIX}' - CLAWFC: '${PREFIX}/bin/clawfc' - omni-xmod-pool: - environment: - set: - CLAWXMODSPOOL: '${PREFIX}' - ant: - environment: - set: - ANT_HOME: '${PREFIX}' - bison: - environment: - set: - YACC: 'bison -y' - cosmo cosmo_target=cpu: - environment: - set: - UCX_MEMTYPE_CACHE: 'n' - UCX_TLS: 'rc_x,ud_x,mm,shm,cma' - mpi: - environment: - set: - MPI_ROOT: '${PREFIX}' - cuda: - environment: - prepend_path: - CPATH: '${PREFIX}/extras/CUPTI/include:${PREFIX}/nvvm/include' - LD_LIBRARY_PATH: '${PREFIX}/extras/CUPTI/lib64:${PREFIX}/nvvm/lib64:/cm/local/apps/cuda/libs/current/lib64' - LIBRARY_PATH: '${PREFIX}/lib64/stubs' - PATH: '${PREFIX}:${PREFIX}/nvvm/bin' From 59c911936990cd1b3b400c6a86e5b5a33d6adc97 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Mon, 29 Jan 2024 16:57:56 +0100 Subject: [PATCH 02/42] remove blas variant, remove serialbox --- repos/c2sm/packages/py-gt4py/package.py | 2 +- test/integration_test.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/repos/c2sm/packages/py-gt4py/package.py b/repos/c2sm/packages/py-gt4py/package.py index 9f933804aa..39dd97deb5 100644 --- a/repos/c2sm/packages/py-gt4py/package.py +++ b/repos/c2sm/packages/py-gt4py/package.py @@ -51,7 +51,7 @@ class PyGt4py(PythonPackage): depends_on('py-lark@1.1.2:', type=('build', 'run')) depends_on('py-mako@1.1:', type=('build', 'run')) depends_on('py-ninja@1.10:', type=('build', 'run')) - depends_on('py-numpy@1.24.2: ~blas ~lapack', type=('build', 'run')) + depends_on('py-numpy@1.24.2:', type=('build', 'run')) depends_on('py-packaging@20.0:', type=('build', 'run')) # versions later than 2.9.2 fail to pick to right Python version diff --git a/test/integration_test.py b/test/integration_test.py index 6aa2a44432..467321fb52 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -261,7 +261,8 @@ def test_claw(self): def test_cosmo(self): spack_spec('cosmo') spack_spec('cosmo cosmo_target=gpu ~cppdycore') - spack_spec('cosmo cosmo_target=gpu +serialize +claw +zlib_ng +oasis') + #spack_spec('cosmo cosmo_target=gpu +serialize +claw +zlib_ng +oasis') + spack_spec('cosmo cosmo_target=gpu +claw +zlib_ng +oasis') def test_cosmo_dycore(self): spack_spec('cosmo-dycore') From f8f1bdff1e426ce9933b5e0b53523ac5383724a2 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Mon, 29 Jan 2024 17:24:33 +0100 Subject: [PATCH 03/42] remove old extensions --- sysconfigs/balfrin/config.yaml | 2 -- sysconfigs/dom/config.yaml | 2 -- sysconfigs/eiger/config.yaml | 2 -- sysconfigs/tasna/config.yaml | 2 -- sysconfigs/tsa/config.yaml | 2 -- sysconfigs/unknown/config.yaml | 4 +--- 6 files changed, 1 insertion(+), 13 deletions(-) diff --git a/sysconfigs/balfrin/config.yaml b/sysconfigs/balfrin/config.yaml index c9fdfde0d5..d242e424c6 100644 --- a/sysconfigs/balfrin/config.yaml +++ b/sysconfigs/balfrin/config.yaml @@ -1,6 +1,4 @@ config: - extensions: - - '$spack/../tools/spack-scripting' build_stage: '$spack/../spack-build_stage' test_stage: '$spack/../spack-test_stage' misc_cache: '$spack/../spack-misc_cache' diff --git a/sysconfigs/dom/config.yaml b/sysconfigs/dom/config.yaml index de80985dd8..4e136592d6 100644 --- a/sysconfigs/dom/config.yaml +++ b/sysconfigs/dom/config.yaml @@ -1,6 +1,4 @@ config: - extensions: - - '$spack/../tools/spack-scripting' build_stage: '$spack/../spack-build_stage' test_stage: '$spack/../spack-test_stage' misc_cache: '$spack/../spack-misc_cache' diff --git a/sysconfigs/eiger/config.yaml b/sysconfigs/eiger/config.yaml index c9fdfde0d5..d242e424c6 100644 --- a/sysconfigs/eiger/config.yaml +++ b/sysconfigs/eiger/config.yaml @@ -1,6 +1,4 @@ config: - extensions: - - '$spack/../tools/spack-scripting' build_stage: '$spack/../spack-build_stage' test_stage: '$spack/../spack-test_stage' misc_cache: '$spack/../spack-misc_cache' diff --git a/sysconfigs/tasna/config.yaml b/sysconfigs/tasna/config.yaml index c9fdfde0d5..d242e424c6 100644 --- a/sysconfigs/tasna/config.yaml +++ b/sysconfigs/tasna/config.yaml @@ -1,6 +1,4 @@ config: - extensions: - - '$spack/../tools/spack-scripting' build_stage: '$spack/../spack-build_stage' test_stage: '$spack/../spack-test_stage' misc_cache: '$spack/../spack-misc_cache' diff --git a/sysconfigs/tsa/config.yaml b/sysconfigs/tsa/config.yaml index 6c98d3afed..e9b1aae628 100644 --- a/sysconfigs/tsa/config.yaml +++ b/sysconfigs/tsa/config.yaml @@ -1,6 +1,4 @@ config: - extensions: - - '$spack/../tools/spack-scripting' build_stage: '$spack/../spack-build_stage' test_stage: '$spack/../spack-test_stage' misc_cache: '$spack/../spack-misc_cache' diff --git a/sysconfigs/unknown/config.yaml b/sysconfigs/unknown/config.yaml index 5d90f0a405..53ef97f15f 100644 --- a/sysconfigs/unknown/config.yaml +++ b/sysconfigs/unknown/config.yaml @@ -1,6 +1,4 @@ config: - extensions: - - '$spack/../tools/spack-scripting' build_stage: '$spack/../spack-build_stage' test_stage: '$spack/../spack-test_stage' - misc_cache: '$spack/../spack-misc_cache' \ No newline at end of file + misc_cache: '$spack/../spack-misc_cache' From 362b35e7d5d6cbd2d73484bf1d8e43e198eba8cb Mon Sep 17 00:00:00 2001 From: Dominic Hofer <6570912+dominichofer@users.noreply.github.com> Date: Thu, 1 Feb 2024 10:23:53 +0100 Subject: [PATCH 04/42] Delete sysconfigs/tsa/modules.yaml --- sysconfigs/tsa/modules.yaml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 sysconfigs/tsa/modules.yaml diff --git a/sysconfigs/tsa/modules.yaml b/sysconfigs/tsa/modules.yaml deleted file mode 100644 index 68ebd5237e..0000000000 --- a/sysconfigs/tsa/modules.yaml +++ /dev/null @@ -1,9 +0,0 @@ -modules: - default: - enable: - - tcl - tcl: - naming_scheme: '${PACKAGE}/${VERSION}' - hash_length: 7 - blacklist: ['%gcc', '%pgi'] - whitelist: ['cosmo', 'cosmo-dycore', 'cosmo-eccodes-definitions', 'cosmo-gribapi-definitions'] \ No newline at end of file From 0caa92bd1f6c26f280ec83243d83969d757dd3ed Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Thu, 1 Feb 2024 15:22:32 +0100 Subject: [PATCH 05/42] do not use upstreams --- sysconfigs/daint/upstreams.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sysconfigs/daint/upstreams.yaml b/sysconfigs/daint/upstreams.yaml index e372e85752..2a639a2551 100644 --- a/sysconfigs/daint/upstreams.yaml +++ b/sysconfigs/daint/upstreams.yaml @@ -1,7 +1,7 @@ upstreams: - base: - install_tree: /project/g110/spack/upstream/daint_v0.20.1.0/base - icon-dsl: - install_tree: /project/g110/spack/upstream/daint_v0.20.1.3/icon-dsl - icon-rttov: - install_tree: /project/g110/spack/upstream/daint_v0.20.1.0/icon-rttov + # base: + # install_tree: /project/g110/spack/upstream/daint_v0.20.1.0/base + # icon-dsl: + # install_tree: /project/g110/spack/upstream/daint_v0.20.1.3/icon-dsl + # icon-rttov: + # install_tree: /project/g110/spack/upstream/daint_v0.20.1.0/icon-rttov From ab4f4a21a7fda57ad7ab84264f7602ed6a33c551 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Thu, 1 Feb 2024 15:43:19 +0100 Subject: [PATCH 06/42] py-toolz available in upstream spack --- repos/c2sm/packages/py-toolz/package.py | 11 ----------- test/integration_test.py | 6 ------ test/system_test.py | 7 ------- 3 files changed, 24 deletions(-) delete mode 100644 repos/c2sm/packages/py-toolz/package.py diff --git a/repos/c2sm/packages/py-toolz/package.py b/repos/c2sm/packages/py-toolz/package.py deleted file mode 100644 index 9d78cf434f..0000000000 --- a/repos/c2sm/packages/py-toolz/package.py +++ /dev/null @@ -1,11 +0,0 @@ -from spack.package import * - -from spack.pkg.builtin.py_toolz import PyToolz as SpackPyToolz - - -class PyToolz(SpackPyToolz): - """A set of utility functions for iterators, functions, and dictionaries.""" - - version("0.12.0", - sha256= - "88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194") diff --git a/test/integration_test.py b/test/integration_test.py index 467321fb52..396db2110b 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -217,9 +217,6 @@ def test_py_sphinxcontrib_jquery(self): def test_py_tabulate(self): spack_info('py-tabulate') - def test_py_toolz(self): - spack_info('py-toolz') - def test_py_typing_extensions(self): spack_info('py-typing-extensions') @@ -434,9 +431,6 @@ def test_py_sphinxcontrib_jquery(self): def test_py_tabulate(self): spack_spec('py-tabulate') - def test_py_toolz(self): - spack_spec('py-toolz') - def test_py_typing_extensions(self): spack_spec('py-typing-extensions') diff --git a/test/system_test.py b/test/system_test.py index 3b7f163b7d..da377ee339 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -707,13 +707,6 @@ class PyTabulateTest(unittest.TestCase): def test_install_default(self): spack_install_and_test('py-tabulate') - -class PyToolzTest(unittest.TestCase): - - def test_install_default(self): - spack_install_and_test('py-toolz') - - class PyTypingExtensionsTest(unittest.TestCase): def test_install_default(self): From 1ceb0c79d93d0f6990efa876b1c050daa3d1a8d1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 1 Feb 2024 14:43:49 +0000 Subject: [PATCH 07/42] GitHub Action: Apply Pep8-formatting --- test/system_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/system_test.py b/test/system_test.py index da377ee339..7d9982d5b3 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -707,6 +707,7 @@ class PyTabulateTest(unittest.TestCase): def test_install_default(self): spack_install_and_test('py-tabulate') + class PyTypingExtensionsTest(unittest.TestCase): def test_install_default(self): From ee202cf07b596cb00e92746f7e4c2e3101eef999 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Thu, 1 Feb 2024 15:56:22 +0100 Subject: [PATCH 08/42] remove upstreams --- sysconfigs/daint/upstreams.yaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 sysconfigs/daint/upstreams.yaml diff --git a/sysconfigs/daint/upstreams.yaml b/sysconfigs/daint/upstreams.yaml deleted file mode 100644 index 2a639a2551..0000000000 --- a/sysconfigs/daint/upstreams.yaml +++ /dev/null @@ -1,7 +0,0 @@ -upstreams: - # base: - # install_tree: /project/g110/spack/upstream/daint_v0.20.1.0/base - # icon-dsl: - # install_tree: /project/g110/spack/upstream/daint_v0.20.1.3/icon-dsl - # icon-rttov: - # install_tree: /project/g110/spack/upstream/daint_v0.20.1.0/icon-rttov From 47d62ca9175983de4eb9214f155e9bd929f09678 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Thu, 1 Feb 2024 16:05:28 +0100 Subject: [PATCH 09/42] add version 0.12.3 --- repos/c2sm/packages/py-cytoolz/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/repos/c2sm/packages/py-cytoolz/package.py b/repos/c2sm/packages/py-cytoolz/package.py index e995177256..f438096ec2 100644 --- a/repos/c2sm/packages/py-cytoolz/package.py +++ b/repos/c2sm/packages/py-cytoolz/package.py @@ -17,6 +17,9 @@ class PyCytoolz(PythonPackage): maintainers = ['samkellerhals'] + version('0.12.3', + sha256= + '4503dc59f4ced53a54643272c61dc305d1dbbfbd7d6bdf296948de9f34c3a282') version('0.12.0', sha256= 'c105b05f85e03fbcd60244375968e62e44fe798c15a3531c922d531018d22412') From 205ffe601154734a4f61ebaa02c8b8b544b5270c Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 13 Feb 2024 10:54:50 +0100 Subject: [PATCH 10/42] cython@2 for pytoolz@0.12.0 --- repos/c2sm/packages/py-cytoolz/package.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/repos/c2sm/packages/py-cytoolz/package.py b/repos/c2sm/packages/py-cytoolz/package.py index f438096ec2..e87cf27631 100644 --- a/repos/c2sm/packages/py-cytoolz/package.py +++ b/repos/c2sm/packages/py-cytoolz/package.py @@ -27,6 +27,10 @@ class PyCytoolz(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-cython', type='build') + # py-cytoolz@0.12.0 not compatible with py-cython@3:, see + # https://www.layerzrozero.network/?_=%2Fpytoolz%2Fcytoolz%2Fissues%2F202%23w2n%2BddnGqHIZTHHkluHJC3Vn + depends_on('py-cython@:2',when='@0.12.0', type='build') + depends_on('python@3.5:', type=('build', 'run')) depends_on('py-toolz@0.8.0:', type=('build', 'run')) From 3ed013704d52ba68adb6db504911ffc62158bf70 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 13 Feb 2024 09:55:19 +0000 Subject: [PATCH 11/42] GitHub Action: Apply Pep8-formatting --- repos/c2sm/packages/py-cytoolz/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/c2sm/packages/py-cytoolz/package.py b/repos/c2sm/packages/py-cytoolz/package.py index e87cf27631..b3e8f72b83 100644 --- a/repos/c2sm/packages/py-cytoolz/package.py +++ b/repos/c2sm/packages/py-cytoolz/package.py @@ -29,7 +29,7 @@ class PyCytoolz(PythonPackage): # py-cytoolz@0.12.0 not compatible with py-cython@3:, see # https://www.layerzrozero.network/?_=%2Fpytoolz%2Fcytoolz%2Fissues%2F202%23w2n%2BddnGqHIZTHHkluHJC3Vn - depends_on('py-cython@:2',when='@0.12.0', type='build') + depends_on('py-cython@:2', when='@0.12.0', type='build') depends_on('python@3.5:', type=('build', 'run')) depends_on('py-toolz@0.8.0:', type=('build', 'run')) From 4056566b662acb86f29e9a9d94d031b643190f34 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 13 Feb 2024 14:31:58 +0100 Subject: [PATCH 12/42] inherit from upstream, introduce v 2.4.0 --- repos/c2sm/packages/py-frozendict/package.py | 25 ++++++++------------ 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/repos/c2sm/packages/py-frozendict/package.py b/repos/c2sm/packages/py-frozendict/package.py index 7c8f731ea3..4dd478c77f 100644 --- a/repos/c2sm/packages/py-frozendict/package.py +++ b/repos/c2sm/packages/py-frozendict/package.py @@ -4,22 +4,17 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * +from spack.pkg.builtin.py_frozendict import PyFrozendict as SpackPyFrozendict -class PyFrozendict(PythonPackage): - """frozendict is a simple immutable dictionary.""" +class PyFrozendict(SpackPyFrozendict): - homepage = "https://github.com/Marco-Sulla/python-frozendict" + version('2.4.0',sha256='c26758198e403337933a92b01f417a8240c954f553e1d4b5e0f8e39d9c8e3f0a') - pypi = 'frozendict/frozendict-2.3.4.tar.gz' - - maintainers = ['samkellerhals'] - - # FIXME: Add proper versions and checksums here. - version('2.3.4', - sha256= - '15b4b18346259392b0d27598f240e9390fafbff882137a9c48a1e0104fb17f78') - - depends_on('python@3.6:', type=('build', 'run')) - - depends_on('py-setuptools', type='build') + # TODO: remove this extension once we have a more recent + # version than v0.21.1 + def setup_build_environment(self, env): + # C extension is not supported for 3.11+. See also + # https://github.com/Marco-Sulla/python-frozendict/issues/68 + if self.spec.satisfies("^python@3.11:"): + env.set("FROZENDICT_PURE_PY", "1") From bb34584e1bb800800b926d9e02aea70aba56981b Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 13 Feb 2024 13:32:28 +0000 Subject: [PATCH 13/42] GitHub Action: Apply Pep8-formatting --- repos/c2sm/packages/py-frozendict/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/repos/c2sm/packages/py-frozendict/package.py b/repos/c2sm/packages/py-frozendict/package.py index 4dd478c77f..54f3a85f2b 100644 --- a/repos/c2sm/packages/py-frozendict/package.py +++ b/repos/c2sm/packages/py-frozendict/package.py @@ -9,7 +9,9 @@ class PyFrozendict(SpackPyFrozendict): - version('2.4.0',sha256='c26758198e403337933a92b01f417a8240c954f553e1d4b5e0f8e39d9c8e3f0a') + version('2.4.0', + sha256= + 'c26758198e403337933a92b01f417a8240c954f553e1d4b5e0f8e39d9c8e3f0a') # TODO: remove this extension once we have a more recent # version than v0.21.1 From a7d055ad14707fc89ed1f4be39dde7fce5e509c9 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 13 Feb 2024 15:04:01 +0100 Subject: [PATCH 14/42] lock pip to :23.0 for py-cmake --- repos/c2sm/packages/py-cmake/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/repos/c2sm/packages/py-cmake/package.py b/repos/c2sm/packages/py-cmake/package.py index 110087ac7a..b43601df0f 100644 --- a/repos/c2sm/packages/py-cmake/package.py +++ b/repos/c2sm/packages/py-cmake/package.py @@ -25,6 +25,8 @@ class PyCmake(PythonPackage): sha256= '52b98c5ee70b5fa30a8623e96482227e065292f78794eb085fdf0fecb204b79b') + # in newer pip versions --install-option does not exist + depends_on("py-pip@:23.0", type="build") depends_on('ninja', type='build') depends_on('py-scikit-build@0.12:', type='build') depends_on('py-setuptools@42:', type='build') From 70e385f49340d9aa4e42acaaf1c347468e9b9961 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 13 Feb 2024 15:29:23 +0100 Subject: [PATCH 15/42] lock eckit-version for infero --- repos/c2sm/packages/infero/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/c2sm/packages/infero/package.py b/repos/c2sm/packages/infero/package.py index 4aada5dbb9..e268439d24 100644 --- a/repos/c2sm/packages/infero/package.py +++ b/repos/c2sm/packages/infero/package.py @@ -29,8 +29,8 @@ class Infero(CMakePackage): variant('tf_c', description='Enable tensorflow-c backend', default=False) variant('onnx', description='Enable ONNX backend', default=False) - depends_on('eckit@1.20.0:') - depends_on('fckit') + depends_on('eckit@1.20.2') + depends_on('fckit@0.9.0') depends_on('ecbuild', type=('build')) depends_on('tensorflowc', when='+tf_c') depends_on('onnx-runtime', when='+onnx') From 2834f46f9fc1942b992ab9eab95416cc3b29f336 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Thu, 15 Feb 2024 13:51:24 +0100 Subject: [PATCH 16/42] temporary deactivate testsuite for int2lm --- test/system_test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/system_test.py b/test/system_test.py index 7d9982d5b3..cc4758a3be 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -445,11 +445,11 @@ def test_install_version_3_00_gcc(self): @pytest.mark.serial_only @pytest.mark.no_balfrin # fails because libgrib1 master fails def test_install_version_3_00_nvhpc(self): - spack_install_and_test(f'int2lm @int2lm-3.00 %{nvidia_compiler}') + spack_install(f'int2lm @int2lm-3.00 %{nvidia_compiler}') @pytest.mark.no_balfrin # fails because libgrib1 master fails def test_install_version_3_00_nvhpc_fixed_definitions(self): - spack_install_and_test( + spack_install( f'int2lm @int2lm-3.00 %{nvidia_compiler} ^cosmo-eccodes-definitions@2.19.0.7%{nvidia_compiler}' ) @@ -459,7 +459,7 @@ def test_install_c2sm_master_gcc(self): @pytest.mark.no_balfrin # fails because libgrib1 master fails @pytest.mark.no_tsa # An error occurred in MPI_Bcast def test_install_c2sm_master_nvhpc(self): - spack_install_and_test( + spack_install( f'int2lm @v2.8.4 %{nvidia_compiler} ^cosmo-eccodes-definitions@2.19.0.7%{nvidia_compiler} ^libgrib1 %{nvidia_compiler}' ) From 6b241f8172330d21c468106f3f5d83ef87b75704 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Thu, 15 Feb 2024 16:45:35 +0100 Subject: [PATCH 17/42] Revert "temporary deactivate testsuite for int2lm" This reverts commit 2834f46f9fc1942b992ab9eab95416cc3b29f336. --- test/system_test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/system_test.py b/test/system_test.py index cc4758a3be..7d9982d5b3 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -445,11 +445,11 @@ def test_install_version_3_00_gcc(self): @pytest.mark.serial_only @pytest.mark.no_balfrin # fails because libgrib1 master fails def test_install_version_3_00_nvhpc(self): - spack_install(f'int2lm @int2lm-3.00 %{nvidia_compiler}') + spack_install_and_test(f'int2lm @int2lm-3.00 %{nvidia_compiler}') @pytest.mark.no_balfrin # fails because libgrib1 master fails def test_install_version_3_00_nvhpc_fixed_definitions(self): - spack_install( + spack_install_and_test( f'int2lm @int2lm-3.00 %{nvidia_compiler} ^cosmo-eccodes-definitions@2.19.0.7%{nvidia_compiler}' ) @@ -459,7 +459,7 @@ def test_install_c2sm_master_gcc(self): @pytest.mark.no_balfrin # fails because libgrib1 master fails @pytest.mark.no_tsa # An error occurred in MPI_Bcast def test_install_c2sm_master_nvhpc(self): - spack_install( + spack_install_and_test( f'int2lm @v2.8.4 %{nvidia_compiler} ^cosmo-eccodes-definitions@2.19.0.7%{nvidia_compiler} ^libgrib1 %{nvidia_compiler}' ) From 663ca8cd868eadf805e75255f0f1cf6308f3ba32 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Mon, 19 Feb 2024 11:20:02 +0100 Subject: [PATCH 18/42] remove gmake on Daint --- sysconfigs/daint/packages.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sysconfigs/daint/packages.yaml b/sysconfigs/daint/packages.yaml index 3652848f8c..715239c01c 100755 --- a/sysconfigs/daint/packages.yaml +++ b/sysconfigs/daint/packages.yaml @@ -130,10 +130,6 @@ packages: externals: - spec: git@2.26.2~tcltk prefix: /usr - gmake: - externals: - - spec: gmake@4.2.1 - prefix: /usr groff: externals: - spec: groff@1.22.3 From bdcfe98a2c2ba3c94e1fb6b6feba2c5d1eebdeee Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Mon, 19 Feb 2024 14:05:24 +0100 Subject: [PATCH 19/42] remove deprecated config --- sysconfigs/daint/packages.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/sysconfigs/daint/packages.yaml b/sysconfigs/daint/packages.yaml index 715239c01c..0c95ab0416 100755 --- a/sysconfigs/daint/packages.yaml +++ b/sysconfigs/daint/packages.yaml @@ -58,7 +58,6 @@ packages: cosmo: # manually added variants: slave=daint cuda_arch=60 cosmo-dycore: # manually added - compiler: [gcc@8.3.0] variants: slave=daint cuda_arch=60 data_path=/scratch/snx3000/jenkins/data/cosmo/ cuda: # manually added buildable: false From 056ac6e2706ba9f4be67147a5966fbdcfab0522e Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Thu, 22 Feb 2024 16:13:44 +0100 Subject: [PATCH 20/42] add gmake again --- sysconfigs/daint/packages.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sysconfigs/daint/packages.yaml b/sysconfigs/daint/packages.yaml index 0c95ab0416..808f2ac00b 100755 --- a/sysconfigs/daint/packages.yaml +++ b/sysconfigs/daint/packages.yaml @@ -129,6 +129,10 @@ packages: externals: - spec: git@2.26.2~tcltk prefix: /usr + gmake: + externals: + - spec: gmake@4.2.1 + prefix: /usr groff: externals: - spec: groff@1.22.3 From 3534c7e8219c1c271d0bf1e5519364cd6839aa72 Mon Sep 17 00:00:00 2001 From: Dominic Hofer <6570912+dominichofer@users.noreply.github.com> Date: Fri, 23 Feb 2024 10:39:05 +0100 Subject: [PATCH 21/42] Remove faulty classification as "spack locking problem" --- src/report_tests.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/report_tests.py b/src/report_tests.py index 87629f3c69..f6ec5ac6dc 100644 --- a/src/report_tests.py +++ b/src/report_tests.py @@ -41,8 +41,6 @@ def __str__(self) -> str: # Trigger phrases that cause a test to get a special icon and comment. # List[(trigger, icon, comment)] triggers = [ - ('AssertionError exception when releasing read lock', ':lock:', - 'spack locking problem'), ('Timed out waiting for a write lock', ':lock:', 'spack write lock problem'), ('Timed out waiting for a read lock', ':lock:', From e46164a12e03536e7420f3692120b70ea58993c5 Mon Sep 17 00:00:00 2001 From: Dominic Hofer <6570912+dominichofer@users.noreply.github.com> Date: Fri, 23 Feb 2024 11:51:00 +0100 Subject: [PATCH 22/42] [python] no default ssl package --- repos/c2sm/packages/python/package.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 repos/c2sm/packages/python/package.py diff --git a/repos/c2sm/packages/python/package.py b/repos/c2sm/packages/python/package.py new file mode 100644 index 0000000000..b3c4e15a08 --- /dev/null +++ b/repos/c2sm/packages/python/package.py @@ -0,0 +1,5 @@ +from spack.pkg.builtin.python import Python as SpackPython + + +class Python(SpackPython): + variant("ssl", default=False, description="Build ssl module") From 8514ffe9497640d829467ca4f586e5ec0d6e3a07 Mon Sep 17 00:00:00 2001 From: Dominic Hofer <6570912+dominichofer@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:14:27 +0100 Subject: [PATCH 23/42] [fdb] Remove package and tests --- repos/c2sm/packages/fdb/package.py | 28 ---------------------------- test/integration_test.py | 6 ------ test/system_test.py | 11 ----------- 3 files changed, 45 deletions(-) delete mode 100644 repos/c2sm/packages/fdb/package.py diff --git a/repos/c2sm/packages/fdb/package.py b/repos/c2sm/packages/fdb/package.py deleted file mode 100644 index d11e599e5c..0000000000 --- a/repos/c2sm/packages/fdb/package.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * -from spack.pkg.builtin.fdb import Fdb as SpackFdb - - -class Fdb(SpackFdb): - """FDB (Fields DataBase) is a domain-specific object store developed at - ECMWF for storing, indexing and retrieving GRIB data.""" - - version("5.11.17", - sha256= - "375c6893c7c60f6fdd666d2abaccb2558667bd450100817c0e1072708ad5591e") - - depends_on("ecbuild@3.7:", type="build", when="@5.11.6:") - - @property - def libs(self): - return find_libraries("libfdb5", - root=self.prefix, - shared=True, - recursive=True) - - def setup_build_environment(self, env): - env.set('CTEST_OUTPUT_ON_FAILURE', 1) diff --git a/test/integration_test.py b/test/integration_test.py index 396db2110b..9b75c03ad2 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -70,9 +70,6 @@ def test_eccodes(self): def test_fckit(self): spack_info('fckit') - def test_fdb(self): - spack_info('fdb') - def test_fdb_fortran(self): spack_info('fdb-fortran') @@ -284,9 +281,6 @@ def test_eccodes(self): def test_fckit(self): spack_spec('fckit') - def test_fdb(self): - spack_info('fdb') - def test_fdb_fortran(self): spack_spec('fdb-fortran') diff --git a/test/system_test.py b/test/system_test.py index 7d9982d5b3..f1c6098962 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -298,17 +298,6 @@ def test_install_0_9_0(self): spack_install_and_test('fckit@0.9.0') -@pytest.mark.no_tsa # FDB tests fail on tsa due to 'ucp_context' -class FdbTest(unittest.TestCase): - - def test_install_5_11_17_gcc(self): - spack_install_and_test('fdb @5.11.17 %gcc') - - def test_install_5_11_17_nvhpc(self): - # tests fail because compiler emitted warnings. - spack_install(f'fdb @5.11.17 %{nvidia_compiler}') - - class FdbFortranTest(unittest.TestCase): def test_install(self): From fe41fc27b8e9d1297f3dc00521e317bdc1161dcd Mon Sep 17 00:00:00 2001 From: Dominic Hofer <6570912+dominichofer@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:18:00 +0100 Subject: [PATCH 24/42] [fckit] Remove package and tests --- repos/c2sm/packages/fckit/package.py | 28 --------------------------- repos/c2sm/packages/infero/package.py | 2 +- test/integration_test.py | 6 ------ test/system_test.py | 6 ------ 4 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 repos/c2sm/packages/fckit/package.py diff --git a/repos/c2sm/packages/fckit/package.py b/repos/c2sm/packages/fckit/package.py deleted file mode 100644 index 90e55bcb48..0000000000 --- a/repos/c2sm/packages/fckit/package.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -# -from spack import * - - -class Fckit(CMakePackage): - ''' - Fortran toolkit for interoperating Fortran with C/C++. - In addition useful algorithms from ecKit are wrapped with Fortran. - ''' - - homepage = 'https://github.com/ecmwf/fckit.git' - git = 'https://github.com/ecmwf/fckit.git' - - version('0.9.0', tag='0.9.0') - version('develop', branch='develop') - - maintainers = ['juckerj'] - - depends_on('ecbuild', type=('build')) - - def cmake_args(self): - args = [self.define('ecbuild_ROOT', self.spec["ecbuild"].prefix)] - return args diff --git a/repos/c2sm/packages/infero/package.py b/repos/c2sm/packages/infero/package.py index e268439d24..5823e9c11f 100644 --- a/repos/c2sm/packages/infero/package.py +++ b/repos/c2sm/packages/infero/package.py @@ -30,7 +30,7 @@ class Infero(CMakePackage): variant('onnx', description='Enable ONNX backend', default=False) depends_on('eckit@1.20.2') - depends_on('fckit@0.9.0') + depends_on('fckit') depends_on('ecbuild', type=('build')) depends_on('tensorflowc', when='+tf_c') depends_on('onnx-runtime', when='+onnx') diff --git a/test/integration_test.py b/test/integration_test.py index 9b75c03ad2..a036ce273c 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -67,9 +67,6 @@ def test_dusk(self): def test_eccodes(self): spack_info('eccodes') - def test_fckit(self): - spack_info('fckit') - def test_fdb_fortran(self): spack_info('fdb-fortran') @@ -278,9 +275,6 @@ def test_dusk(self): def test_eccodes(self): spack_spec('eccodes') - def test_fckit(self): - spack_spec('fckit') - def test_fdb_fortran(self): spack_spec('fdb-fortran') diff --git a/test/system_test.py b/test/system_test.py index f1c6098962..2cab34e1b1 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -292,12 +292,6 @@ def test_install_2_19_0(self): spack_install('eccodes @2.19.0') -class FckitTest(unittest.TestCase): - - def test_install_0_9_0(self): - spack_install_and_test('fckit@0.9.0') - - class FdbFortranTest(unittest.TestCase): def test_install(self): From 98ef7ede72972a6ad45244f124f62fb46aa19ca2 Mon Sep 17 00:00:00 2001 From: Dominic Hofer <6570912+dominichofer@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:37:28 +0100 Subject: [PATCH 25/42] [numpy] Remove package and tests. --- repos/c2sm/packages/py-numpy/package.py | 24 ------------------------ test/system_test.py | 6 ------ 2 files changed, 30 deletions(-) delete mode 100644 repos/c2sm/packages/py-numpy/package.py diff --git a/repos/c2sm/packages/py-numpy/package.py b/repos/c2sm/packages/py-numpy/package.py deleted file mode 100644 index d1591a9ca5..0000000000 --- a/repos/c2sm/packages/py-numpy/package.py +++ /dev/null @@ -1,24 +0,0 @@ -from spack.package import * -from spack.pkg.builtin.py_numpy import PyNumpy as SpackPyNumpy - - -class PyNumpy(SpackPyNumpy): - """NumPy is the fundamental package for scientific computing with Python. - It contains among other things: a powerful N-dimensional array object, - sophisticated (broadcasting) functions, tools for integrating C/C++ and - Fortran code, and useful linear algebra, Fourier transform, and random - number capabilities""" - - version('1.24.2', - sha256= - '003a9f530e880cb2cd177cba1af7220b9aa42def9c4afc2a2fc3ee6be7eb2b22') - - conflicts("python@3.10.1", when="@1.24.2") # metadata generation fails. - - def url_for_version(self, version): - url = "https://files.pythonhosted.org/packages/source/n/numpy/numpy-{}.{}" - if version >= Version("1.23"): - ext = "tar.gz" - else: - ext = "zip" - return url.format(version, ext) diff --git a/test/system_test.py b/test/system_test.py index 2cab34e1b1..75b847772a 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -649,12 +649,6 @@ def test_install_default(self): spack_install_and_test('py-nanobind') -class PyNumpyTest(unittest.TestCase): - - def test_install_default(self): - spack_install('py-numpy') - - class PyPathspecTest(unittest.TestCase): def test_install_default(self): From 586747c56a92b69c0b09bc31693eb34b2af3e417 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Mon, 26 Feb 2024 10:49:23 +0100 Subject: [PATCH 26/42] Revert "[fckit] Remove package and tests" This reverts commit fe41fc27b8e9d1297f3dc00521e317bdc1161dcd. --- repos/c2sm/packages/fckit/package.py | 28 +++++++++++++++++++++++++++ repos/c2sm/packages/infero/package.py | 2 +- test/integration_test.py | 6 ++++++ test/system_test.py | 6 ++++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 repos/c2sm/packages/fckit/package.py diff --git a/repos/c2sm/packages/fckit/package.py b/repos/c2sm/packages/fckit/package.py new file mode 100644 index 0000000000..90e55bcb48 --- /dev/null +++ b/repos/c2sm/packages/fckit/package.py @@ -0,0 +1,28 @@ +# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +# +from spack import * + + +class Fckit(CMakePackage): + ''' + Fortran toolkit for interoperating Fortran with C/C++. + In addition useful algorithms from ecKit are wrapped with Fortran. + ''' + + homepage = 'https://github.com/ecmwf/fckit.git' + git = 'https://github.com/ecmwf/fckit.git' + + version('0.9.0', tag='0.9.0') + version('develop', branch='develop') + + maintainers = ['juckerj'] + + depends_on('ecbuild', type=('build')) + + def cmake_args(self): + args = [self.define('ecbuild_ROOT', self.spec["ecbuild"].prefix)] + return args diff --git a/repos/c2sm/packages/infero/package.py b/repos/c2sm/packages/infero/package.py index 5823e9c11f..e268439d24 100644 --- a/repos/c2sm/packages/infero/package.py +++ b/repos/c2sm/packages/infero/package.py @@ -30,7 +30,7 @@ class Infero(CMakePackage): variant('onnx', description='Enable ONNX backend', default=False) depends_on('eckit@1.20.2') - depends_on('fckit') + depends_on('fckit@0.9.0') depends_on('ecbuild', type=('build')) depends_on('tensorflowc', when='+tf_c') depends_on('onnx-runtime', when='+onnx') diff --git a/test/integration_test.py b/test/integration_test.py index a036ce273c..9b75c03ad2 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -67,6 +67,9 @@ def test_dusk(self): def test_eccodes(self): spack_info('eccodes') + def test_fckit(self): + spack_info('fckit') + def test_fdb_fortran(self): spack_info('fdb-fortran') @@ -275,6 +278,9 @@ def test_dusk(self): def test_eccodes(self): spack_spec('eccodes') + def test_fckit(self): + spack_spec('fckit') + def test_fdb_fortran(self): spack_spec('fdb-fortran') diff --git a/test/system_test.py b/test/system_test.py index 75b847772a..c9504508df 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -292,6 +292,12 @@ def test_install_2_19_0(self): spack_install('eccodes @2.19.0') +class FckitTest(unittest.TestCase): + + def test_install_0_9_0(self): + spack_install_and_test('fckit@0.9.0') + + class FdbFortranTest(unittest.TestCase): def test_install(self): From d9c9a9e99b2500df07139320655c0ee03c680b13 Mon Sep 17 00:00:00 2001 From: Victoria Cherkas <87643948+victoria-cherkas@users.noreply.github.com> Date: Tue, 27 Feb 2024 23:39:36 +0100 Subject: [PATCH 27/42] Fix FDB related tests (#920) --- repos/c2sm/packages/fdb/package.py | 21 +++++++++++++++++++++ repos/c2sm/packages/metkit/package.py | 10 ++++++++++ 2 files changed, 31 insertions(+) create mode 100644 repos/c2sm/packages/fdb/package.py create mode 100644 repos/c2sm/packages/metkit/package.py diff --git a/repos/c2sm/packages/fdb/package.py b/repos/c2sm/packages/fdb/package.py new file mode 100644 index 0000000000..459f692f5a --- /dev/null +++ b/repos/c2sm/packages/fdb/package.py @@ -0,0 +1,21 @@ +from spack.package import * + +from spack.pkg.builtin.fdb import Fdb as SpackFdb + + +class Fdb(SpackFdb): + + # This section can be removed when the following commit + # https://github.com/spack/spack/commit/8871bd5ba5c58562b8c20baa00f125aeccba586f + # is included in a release on spack and this is used by spack-c2sm. + depends_on("eckit@1.24.4:", when="@5.11.22:") + + # This section can be removed when the following PR + # https://github.com/spack/spack/pull/42874 + # is included in a release on spack and this is used by spack-c2sm. + @property + def libs(self): + return find_libraries("libfdb5", + root=self.prefix, + shared=True, + recursive=True) diff --git a/repos/c2sm/packages/metkit/package.py b/repos/c2sm/packages/metkit/package.py new file mode 100644 index 0000000000..42733610db --- /dev/null +++ b/repos/c2sm/packages/metkit/package.py @@ -0,0 +1,10 @@ +from spack.package import * + +from spack.pkg.builtin.metkit import Metkit as SpackMetkit + + +class Metkit(SpackMetkit): + + # This file can be removed when this PR https://github.com/spack/spack/pull/42871 + # is included in a release on spack and this is used by spack-c2sm. + depends_on("eckit@:1.21", when="@:1.10") From 53fcc0aec6488b1076638fbe9d79608e154e9210 Mon Sep 17 00:00:00 2001 From: Matthieu Date: Thu, 29 Feb 2024 14:46:11 +0100 Subject: [PATCH 28/42] test:fix(pytorch-fortran): try explicit dependency on (c/g)make%gcc --- test/system_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/system_test.py b/test/system_test.py index c9504508df..cbfbd96a20 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -521,7 +521,7 @@ class PytorchFortranTest(unittest.TestCase): def test_install_version_0_4(self): spack_install( - 'pytorch-fortran@0.4%nvhpc ^pytorch-fortran-proxy@0.4%gcc ^python@3.10' + 'pytorch-fortran@0.4%nvhpc ^pytorch-fortran-proxy@0.4%gcc ^python@3.10 ^gmake%gcc ^cmake%gcc' ) From 4e53c73c4d9d22d192a5740a5a9ce5fc6af87bf4 Mon Sep 17 00:00:00 2001 From: Matthieu Date: Fri, 1 Mar 2024 13:34:46 +0100 Subject: [PATCH 29/42] upd: point to icon-c2sm branch spack_v0.21.1 --- test/system_test.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/system_test.py b/test/system_test.py index cbfbd96a20..404f4abaf9 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -349,18 +349,18 @@ def test_install_nwp_gpu(self): @pytest.mark.no_balfrin # config file does not exist for this machine def test_install_c2sm_test_cpu_gcc(self): spack_env_dev_install_and_test( - 'config/cscs/spack/v0.18.1.10/daint_cpu_gcc', + 'config/cscs/spack/v0.21.1/daint_cpu_gcc', 'git@github.com:C2SM/icon.git', - 'icon-2.6.6.2', + 'spack_v0.21.1', 'icon', build_on_login_node=True) @pytest.mark.no_balfrin # config file does not exist for this machine def test_install_c2sm_test_cpu_nvhpc_out_of_source(self): spack_env_dev_install_and_test( - 'config/cscs/spack/v0.18.1.10/daint_cpu_nvhpc', + 'config/cscs/spack/v0.21.1/daint_cpu_nvhpc', 'git@github.com:C2SM/icon.git', - 'icon-2.6.6.2', + 'spack_v0.21.1', 'icon', out_of_source=True, build_on_login_node=True) @@ -368,18 +368,18 @@ def test_install_c2sm_test_cpu_nvhpc_out_of_source(self): @pytest.mark.no_balfrin # config file does not exist for this machine def test_install_c2sm_test_cpu(self): spack_env_dev_install_and_test( - 'config/cscs/spack/v0.18.1.10/daint_cpu_nvhpc', + 'config/cscs/spack/v0.21.1/daint_cpu_nvhpc', 'git@github.com:C2SM/icon.git', - 'icon-2.6.6.2', + 'spack_v0.21.1', 'icon', build_on_login_node=True) @pytest.mark.no_balfrin # config file does not exist for this machine def test_install_c2sm_test_gpu(self): spack_env_dev_install_and_test( - 'config/cscs/spack/v0.18.1.10/daint_gpu_nvhpc', + 'config/cscs/spack/v0.21.1/daint_gpu_nvhpc', 'git@github.com:C2SM/icon.git', - 'icon-2.6.6.2', + 'spack_v0.21.1', 'icon', build_on_login_node=True) From bb02e1bbfdc11f37ce20c5f1a4534e1871e705be Mon Sep 17 00:00:00 2001 From: juckerj <39263956+jonasjucker@users.noreply.github.com> Date: Mon, 4 Mar 2024 13:43:41 +0100 Subject: [PATCH 30/42] Update system_test.py --- test/system_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/system_test.py b/test/system_test.py index 404f4abaf9..373dc97739 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -392,6 +392,7 @@ def test_install_nwp_test_cpu_cce(self): 'icon', build_on_login_node=True) + @pytest.mark.no_daint # problem with gt4py and spack v21.1 @pytest.mark.no_balfrin # config file does not exist for this machine def test_install_exclaim_test_gpu_dsl(self): spack_env_dev_install_and_test( From 2d70626a119238000c5cfed266a8d8ab54dc78d7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 4 Mar 2024 12:44:04 +0000 Subject: [PATCH 31/42] GitHub Action: Apply Pep8-formatting --- test/system_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/system_test.py b/test/system_test.py index 373dc97739..f650bb766b 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -392,7 +392,7 @@ def test_install_nwp_test_cpu_cce(self): 'icon', build_on_login_node=True) - @pytest.mark.no_daint # problem with gt4py and spack v21.1 + @pytest.mark.no_daint # problem with gt4py and spack v21.1 @pytest.mark.no_balfrin # config file does not exist for this machine def test_install_exclaim_test_gpu_dsl(self): spack_env_dev_install_and_test( From be37428785ac4846af0fc4067e52a1985f19fdd3 Mon Sep 17 00:00:00 2001 From: Matthieu Date: Mon, 4 Mar 2024 14:52:04 +0100 Subject: [PATCH 32/42] upd: cosmo spack env --- test/system_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/system_test.py b/test/system_test.py index f650bb766b..898b9a97ae 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -237,14 +237,14 @@ class CosmoTest(unittest.TestCase): def test_install_c2sm_master_cpu(self): spack_env_dev_install_and_test( - 'cosmo/ACC/spack/v0.20.1.0/nvhpc_cpu_double', - 'git@github.com:C2SM-RCM/cosmo.git', '6.1_2023.11', + 'cosmo/ACC/spack/v0.21.1/nvhpc_cpu_double', + 'git@github.com:C2SM-RCM/cosmo.git', '6.1_2024.03', 'cosmo-c2sm-master') def test_install_c2sm_master_gpu(self): spack_env_dev_install_and_test( - 'cosmo/ACC/spack/v0.20.1.0/nvhpc_gpu_double', - 'git@github.com:C2SM-RCM/cosmo.git', '6.1_2023.11', + 'cosmo/ACC/spack/v0.21.1/nvhpc_gpu_double', + 'git@github.com:C2SM-RCM/cosmo.git', '6.1_2024.03', 'cosmo-c2sm-master') From 73b8f62abfa9a8165890eb7cd093b915f6125d21 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 12 Mar 2024 08:09:31 +0100 Subject: [PATCH 33/42] skip failing tests --- test/system_test.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/test/system_test.py b/test/system_test.py index 2f54367416..f39ab1e555 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -233,6 +233,7 @@ def test_install_default_build_only(self): @pytest.mark.no_balfrin # cosmo-dycore does not support the cuda arch of balfrin @pytest.mark.no_tsa # irrelevant +@pytest.mark.no_daint # irrelevant class CosmoTest(unittest.TestCase): def test_install_c2sm_master_cpu(self): @@ -273,18 +274,6 @@ def test_install_version_2_19_0_7(self): spack_install_and_test('cosmo-eccodes-definitions @2.19.0.7') -class DawnTest(unittest.TestCase): - pass - - -class Dawn4PyTest(unittest.TestCase): - pass - - -class DuskTest(unittest.TestCase): - pass - - class EccodesTest(unittest.TestCase): # All the other versions are not the responsibility of spack-c2sm @@ -383,6 +372,7 @@ def test_install_c2sm_test_gpu(self): 'icon', build_on_login_node=True) + @pytest.mark.no_daint # test is flaky @pytest.mark.no_balfrin # config file does not exist for this machine def test_install_nwp_test_cpu_cce(self): spack_env_dev_install_and_test( @@ -607,6 +597,7 @@ def test_install_default(self): @pytest.mark.no_tsa # Irrelevant +@pytest.mark.no_daint # problem with gt4py and spack v21.1 class PyGt4pyTest(unittest.TestCase): def test_install_version_1_0_1_1(self): @@ -615,21 +606,27 @@ def test_install_version_1_0_1_1(self): def test_install_version_1_0_1_1b(self): spack_install_and_test('py-gt4py @1.0.1.1b') + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_1_6(self): spack_install_and_test('py-gt4py @1.0.1.6') + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_1_7(self): spack_install_and_test('py-gt4py @1.0.1.7') + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3(self): spack_install_and_test('py-gt4py @1.0.3') + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3_1(self): spack_install_and_test('py-gt4py @1.0.3.1') + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3_2(self): spack_install_and_test('py-gt4py @1.0.3.2') + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3_3(self): spack_install_and_test('py-gt4py @1.0.3.3') @@ -640,6 +637,8 @@ def test_install_default(self): spack_install_and_test('py-hatchling') +@pytest.mark.no_daint # problem with gt4py and spack v21.1 +@pytest.mark.no_balfrin # problem with gt4py and spack v21.1 @pytest.mark.no_tsa # py-isort install fails with: No module named 'poetry'. class PyIcon4pyTest(unittest.TestCase): From f14cad71c88f825c4ea114f305ef3ad5996ec74e Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 12 Mar 2024 07:09:55 +0000 Subject: [PATCH 34/42] GitHub Action: Apply Pep8-formatting --- test/system_test.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/system_test.py b/test/system_test.py index f39ab1e555..4a40903677 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -606,27 +606,27 @@ def test_install_version_1_0_1_1(self): def test_install_version_1_0_1_1b(self): spack_install_and_test('py-gt4py @1.0.1.1b') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_1_6(self): spack_install_and_test('py-gt4py @1.0.1.6') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_1_7(self): spack_install_and_test('py-gt4py @1.0.1.7') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3(self): spack_install_and_test('py-gt4py @1.0.3') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3_1(self): spack_install_and_test('py-gt4py @1.0.3.1') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3_2(self): spack_install_and_test('py-gt4py @1.0.3.2') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 + @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3_3(self): spack_install_and_test('py-gt4py @1.0.3.3') @@ -637,8 +637,8 @@ def test_install_default(self): spack_install_and_test('py-hatchling') -@pytest.mark.no_daint # problem with gt4py and spack v21.1 -@pytest.mark.no_balfrin # problem with gt4py and spack v21.1 +@pytest.mark.no_daint # problem with gt4py and spack v21.1 +@pytest.mark.no_balfrin # problem with gt4py and spack v21.1 @pytest.mark.no_tsa # py-isort install fails with: No module named 'poetry'. class PyIcon4pyTest(unittest.TestCase): From a5b857747f0dabb75fe9d2c7441629ca4513f714 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 12 Mar 2024 08:14:21 +0100 Subject: [PATCH 35/42] add link to latest spack version --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index aeab8042a6..4fe7e4e464 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ Spack is the package manager used by C2SM and MeteoSwiss to install and deploy s * [spack-c2sm v0.18.1.1](https://C2SM.github.io/spack-c2sm/v0.18.1.1) [deprecated] **General infos about spack** + * [Official spack v0.21.1](https://spack.readthedocs.io/en/v0.21.1/) * [Official spack v0.20.1](https://spack.readthedocs.io/en/v0.20.1/) * [Official spack v0.18.1](https://spack.readthedocs.io/en/v0.18.1/) From ec10891236f29e6d02a9e79efe5e516992711a35 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 12 Mar 2024 11:55:38 +0100 Subject: [PATCH 36/42] downgrade icon4py,gt4py mostly to build-tests, add fdb again --- test/integration_test.py | 4 +- test/system_test.py | 80 +++++++++++----------------------------- 2 files changed, 24 insertions(+), 60 deletions(-) diff --git a/test/integration_test.py b/test/integration_test.py index 065b814f1c..a615057e62 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -258,7 +258,6 @@ def test_claw(self): def test_cosmo(self): spack_spec('cosmo') spack_spec('cosmo cosmo_target=gpu ~cppdycore') - #spack_spec('cosmo cosmo_target=gpu +serialize +claw +zlib_ng +oasis') spack_spec('cosmo cosmo_target=gpu +claw +zlib_ng +oasis') def test_cosmo_dycore(self): @@ -283,6 +282,9 @@ def test_eccodes(self): def test_fckit(self): spack_spec('fckit') + + def test_fdb(self): + spack_info('fdb') def test_fdb_fortran(self): spack_spec('fdb-fortran') diff --git a/test/system_test.py b/test/system_test.py index 4a40903677..2cc75855b7 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -231,24 +231,6 @@ def test_install_default_build_only(self): spack_install('claw') -@pytest.mark.no_balfrin # cosmo-dycore does not support the cuda arch of balfrin -@pytest.mark.no_tsa # irrelevant -@pytest.mark.no_daint # irrelevant -class CosmoTest(unittest.TestCase): - - def test_install_c2sm_master_cpu(self): - spack_env_dev_install_and_test( - 'cosmo/ACC/spack/v0.21.1/nvhpc_cpu_double', - 'git@github.com:C2SM-RCM/cosmo.git', '6.1_2024.03', - 'cosmo-c2sm-master') - - def test_install_c2sm_master_gpu(self): - spack_env_dev_install_and_test( - 'cosmo/ACC/spack/v0.21.1/nvhpc_gpu_double', - 'git@github.com:C2SM-RCM/cosmo.git', '6.1_2024.03', - 'cosmo-c2sm-master') - - @pytest.mark.no_balfrin # cuda arch is not supported @pytest.mark.no_tsa # irrelevant class CosmoDycoreTest(unittest.TestCase): @@ -318,6 +300,16 @@ def test_install_version_1_1_3_gcc(self): def test_install_version_1_1_3_nvhpc(self): spack_install_and_test(f'gridtools @1.1.3 %{nvidia_compiler}') +@pytest.mark.no_tsa # FDB tests fail on tsa due to 'ucp_context' +class FdbTest(unittest.TestCase): + + def test_install_5_11_17_gcc(self): + spack_install_and_test('fdb @5.11.17 %gcc') + + def test_install_5_11_17_nvhpc(self): + # tests fail because compiler emitted warnings. + spack_install(f'fdb @5.11.17 %{nvidia_compiler}') + @pytest.mark.no_tsa # Icon does not run on Tsa class IconTest(unittest.TestCase): @@ -372,30 +364,6 @@ def test_install_c2sm_test_gpu(self): 'icon', build_on_login_node=True) - @pytest.mark.no_daint # test is flaky - @pytest.mark.no_balfrin # config file does not exist for this machine - def test_install_nwp_test_cpu_cce(self): - spack_env_dev_install_and_test( - 'config/cscs/spack/v0.18.1.10/daint_cpu_cce', - 'git@github.com:C2SM/icon.git', - 'icon-2.6.6.2', - 'icon', - build_on_login_node=True) - - @pytest.mark.no_daint # problem with gt4py and spack v21.1 - @pytest.mark.no_balfrin # config file does not exist for this machine - def test_install_exclaim_test_gpu_dsl(self): - spack_env_dev_install_and_test( - 'config/cscs/spack/v0.20.1.3/daint_dsl_nvhpc', - 'git@github.com:C2SM/icon-exclaim.git', - 'v0.2.0', - 'icon', - build_on_login_node=True) - - -class IconHamTest(unittest.TestCase): - pass - @pytest.mark.no_tsa # This test is flaky and sometimes fails with: icondelaunay.cpp:29:10: fatal error: version.c: No such file or directory. See issue #781. class IconToolsTest(unittest.TestCase): @@ -600,35 +568,31 @@ def test_install_default(self): @pytest.mark.no_daint # problem with gt4py and spack v21.1 class PyGt4pyTest(unittest.TestCase): + @pytest.mark.no_daint # problem with gt4py and spack v21.1 def test_install_version_1_0_1_1(self): spack_install_and_test('py-gt4py @1.0.1.1') + @pytest.mark.no_daint # problem with gt4py and spack v21.1 def test_install_version_1_0_1_1b(self): spack_install_and_test('py-gt4py @1.0.1.1b') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_1_6(self): - spack_install_and_test('py-gt4py @1.0.1.6') + spack_install('py-gt4py @1.0.1.6') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_1_7(self): - spack_install_and_test('py-gt4py @1.0.1.7') + spack_install('py-gt4py @1.0.1.7') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3(self): - spack_install_and_test('py-gt4py @1.0.3') + spack_install('py-gt4py @1.0.3') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3_1(self): - spack_install_and_test('py-gt4py @1.0.3.1') + spack_install('py-gt4py @1.0.3.1') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3_2(self): - spack_install_and_test('py-gt4py @1.0.3.2') + spack_install('py-gt4py @1.0.3.2') - @pytest.mark.no_balfrin # problem with gt4py and spack v21.1 def test_install_version_1_0_3_3(self): - spack_install_and_test('py-gt4py @1.0.3.3') + spack_install('py-gt4py @1.0.3.3') class PyHatchlingTest(unittest.TestCase): @@ -637,19 +601,17 @@ def test_install_default(self): spack_install_and_test('py-hatchling') -@pytest.mark.no_daint # problem with gt4py and spack v21.1 -@pytest.mark.no_balfrin # problem with gt4py and spack v21.1 @pytest.mark.no_tsa # py-isort install fails with: No module named 'poetry'. class PyIcon4pyTest(unittest.TestCase): def test_install_version_0_0_3_1(self): - spack_install_and_test('py-icon4py @ 0.0.3.1 %gcc ^py-gt4py@1.0.1.1b') + spack_install('py-icon4py @ 0.0.3.1 %gcc ^py-gt4py@1.0.1.1b') def test_install_version_0_0_9(self): - spack_install_and_test('py-icon4py @ 0.0.9 %gcc ^py-gt4py@1.0.1.6') + spack_install('py-icon4py @ 0.0.9 %gcc ^py-gt4py@1.0.1.6') def test_install_version_0_0_10(self): - spack_install_and_test('py-icon4py @ 0.0.10 %gcc ^py-gt4py@1.0.3.3') + spack_install('py-icon4py @ 0.0.10 %gcc ^py-gt4py@1.0.3.3') class PyInflectionTest(unittest.TestCase): From eedf6e33d7d66f41db86a2ee6a87a6e5273b8e3a Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 12 Mar 2024 10:56:03 +0000 Subject: [PATCH 37/42] GitHub Action: Apply Pep8-formatting --- test/integration_test.py | 2 +- test/system_test.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/integration_test.py b/test/integration_test.py index a615057e62..3965ca764a 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -282,7 +282,7 @@ def test_eccodes(self): def test_fckit(self): spack_spec('fckit') - + def test_fdb(self): spack_info('fdb') diff --git a/test/system_test.py b/test/system_test.py index 2cc75855b7..6522fb6017 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -300,6 +300,7 @@ def test_install_version_1_1_3_gcc(self): def test_install_version_1_1_3_nvhpc(self): spack_install_and_test(f'gridtools @1.1.3 %{nvidia_compiler}') + @pytest.mark.no_tsa # FDB tests fail on tsa due to 'ucp_context' class FdbTest(unittest.TestCase): From f487d150925c30e9234ca1d6b6c3cf791c591a58 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 12 Mar 2024 16:11:44 +0100 Subject: [PATCH 38/42] add upstreams for Daint --- upstreams/daint/base/spack.yaml | 16 ++++++++-------- upstreams/daint/icon-dsl/spack.yaml | 4 ++-- upstreams/daint/icon-rttov/spack.yaml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/upstreams/daint/base/spack.yaml b/upstreams/daint/base/spack.yaml index cfc8d5b50c..be2971eb02 100644 --- a/upstreams/daint/base/spack.yaml +++ b/upstreams/daint/base/spack.yaml @@ -3,18 +3,18 @@ spack: # ICON - matrix: - [eccodes@2.19.0, cosmo-eccodes-definitions@2.19.0.7, serialbox@2.6.1+fortran] - - ['%nvhpc@21.3', '%cce@12.0.3', '%gcc@9.3.0'] - - libxml2@2.9.13%gcc - - claw@2.0.3%nvhpc + - ['%nvhpc@21.3', '%gcc@9.3.0','%gcc@11.2.0'] + - libxml2@2.9.13%gcc@11.2.0 + - libxml2@2.9.13%gcc@9.3.0 - boost@1.82.0%gcc@9.3.0 +atomic +chrono +container +contract +coroutine +date_time +exception +fiber +filesystem +graph +graph_parallel +iostreams +json +locale +log +math +mpi +program_options +random +regex +serialization +signals +stacktrace cxxstd=11 + - boost@1.82.0%gcc@11.2.0 +atomic +chrono +container +contract +coroutine +date_time + +exception +fiber +filesystem +graph +graph_parallel +iostreams +json +locale + +log +math +mpi +program_options +random +regex +serialization +signals +stacktrace + cxxstd=11 - # COSMO - - jasper @1.900.1 %nvhpc - - eccodes@2.19.0 %nvhpc +fortran - # boost as needed to compile COSMO-Dycore - boost@1.79.0%gcc@8.3.0~atomic~chrono~clanglibcpp~container~context~contract~coroutine ~date_time~debug~exception~fiber~filesystem~graph~graph_parallel~icu~iostreams~json @@ -27,4 +27,4 @@ spack: view: false config: install_tree: - root: /project/g110/spack/upstream/daint_v0.20.1.0/base + root: /project/g110/spack/upstream/daint_v0.21.1.0/base diff --git a/upstreams/daint/icon-dsl/spack.yaml b/upstreams/daint/icon-dsl/spack.yaml index 28c163e98c..bf1ec2a5e3 100644 --- a/upstreams/daint/icon-dsl/spack.yaml +++ b/upstreams/daint/icon-dsl/spack.yaml @@ -3,7 +3,7 @@ spack: - cmake@3.26.3%gcc@9.3.0 - cmake@3.22.2%gcc@9.3.0 - python@3.10%gcc@9.3.0 - - py-numpy@1.24.3%gcc@9.3.0~blas~lapack + - py-numpy@1.24.3%gcc@9.3.0 - py-black@23.3.0%gcc@9.3.0 - py-ninja@1.10.2%gcc@9.3.0 - py-pytest@7.2.1%gcc@9.3.0 @@ -37,4 +37,4 @@ spack: view: false config: install_tree: - root: /project/g110/spack/upstream/daint_v0.20.1.3/icon-dsl + root: /project/g110/spack/upstream/daint_v0.21.1.0/icon-dsl diff --git a/upstreams/daint/icon-rttov/spack.yaml b/upstreams/daint/icon-rttov/spack.yaml index eff3139837..0f860f1335 100644 --- a/upstreams/daint/icon-rttov/spack.yaml +++ b/upstreams/daint/icon-rttov/spack.yaml @@ -12,4 +12,4 @@ spack: view: false config: install_tree: - root: /project/g110/spack/upstream/daint_v0.20.1.0/icon-rttov + root: /project/g110/spack/upstream/daint_v0.21.1.0/icon-rttov From 0e5c21f5859cf81ae96b6a976cd5658515a9e5b7 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 12 Mar 2024 16:14:15 +0100 Subject: [PATCH 39/42] add upstream to config --- sysconfigs/daint/upstreams.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sysconfigs/daint/upstreams.yaml diff --git a/sysconfigs/daint/upstreams.yaml b/sysconfigs/daint/upstreams.yaml new file mode 100644 index 0000000000..11e4dd1b0f --- /dev/null +++ b/sysconfigs/daint/upstreams.yaml @@ -0,0 +1,7 @@ +upstreams: + base: + install_tree: /project/g110/spack/upstream/daint_v0.21.1.0/base + icon-dsl: + install_tree: /project/g110/spack/upstream/daint_v0.21.1.0/icon-dsl + icon-rttov: + install_tree: /project/g110/spack/upstream/daint_v0.21.1.0/icon-rttov From c1abeb3c38004574600b48b69a557427bf6ae769 Mon Sep 17 00:00:00 2001 From: Jonas Jucker Date: Tue, 12 Mar 2024 16:26:10 +0100 Subject: [PATCH 40/42] adapt unit-test --- test/unit_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit_test.py b/test/unit_test.py index a9e2d11057..9d74d2cfcd 100644 --- a/test/unit_test.py +++ b/test/unit_test.py @@ -145,7 +145,7 @@ def test_upstream_from_config(self): upstream_base = read_upstream_from_spack_yaml( os.path.join(os.path.normpath(spack_c2sm_path), 'upstreams/daint/base')) - self.assertEqual('/project/g110/spack/upstream/daint_v0.20.1.0/base', + self.assertEqual('/project/g110/spack/upstream/daint_v0.21.1.0/base', upstream_base) def test_upstream_from_another_tag(self): From 8bd2ae6516e3f0c9209eb3495345a283225d8e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20J=C3=A4hn?= Date: Thu, 28 Mar 2024 09:30:31 +0100 Subject: [PATCH 41/42] Use single-thread make for flexpart-cosmo --- repos/c2sm/packages/flexpart-cosmo/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repos/c2sm/packages/flexpart-cosmo/package.py b/repos/c2sm/packages/flexpart-cosmo/package.py index 3800a761b1..388bbfe431 100644 --- a/repos/c2sm/packages/flexpart-cosmo/package.py +++ b/repos/c2sm/packages/flexpart-cosmo/package.py @@ -43,6 +43,7 @@ def setup_build_environment(self, env): def build(self, spec, prefix): with working_dir(self.build_directory): + make.jobs = 1 make('-f', self.makefile_file) def install(self, spec, prefix): From cd43f0b4bb3c231a1c48d98e84077d1a15ae7d93 Mon Sep 17 00:00:00 2001 From: juckerj <39263956+jonasjucker@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:47:07 +0200 Subject: [PATCH 42/42] Update system_test.py --- test/system_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/system_test.py b/test/system_test.py index d4ed8ee998..2fb7b15375 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -596,10 +596,10 @@ def test_install_version_1_0_3_3(self): spack_install('py-gt4py @1.0.3.3') def test_install_version_1_0_3_4(self): - spack_install_and_test('py-gt4py @1.0.3.4') + spack_install('py-gt4py @1.0.3.4') def test_install_version_1_0_3_5(self): - spack_install_and_test('py-gt4py @1.0.3.5') + spack_install('py-gt4py @1.0.3.5') class PyHatchlingTest(unittest.TestCase):