From 9260772a5eb7e4bf15273dbecae69821705bf4e1 Mon Sep 17 00:00:00 2001 From: Dominic Hofer <6570912+dominichofer@users.noreply.github.com> Date: Fri, 9 Aug 2024 17:06:38 +0200 Subject: [PATCH] Refine gt4py and icon4py --- repo/packages/py-gt4py/package.py | 8 +++--- repo/packages/py-icon4py/package.py | 11 +++----- test/system_test.py | 41 +++++++++-------------------- 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/repo/packages/py-gt4py/package.py b/repo/packages/py-gt4py/package.py index a3489702ea..0708f34bf7 100644 --- a/repo/packages/py-gt4py/package.py +++ b/repo/packages/py-gt4py/package.py @@ -12,13 +12,13 @@ class PyGt4py(PythonPackage): domain-specific language (DSL). """ homepage = "https://gridtools.github.io/gt4py/latest/index.html" - + git = "git@github.com:GridTools/gt4py.git" url = "git@github.com:GridTools/gt4py.git" version('main', branch='main', git=url) - version('1.0.3.3', tag='icon4py_20240229', git=url) - version('1.0.3.7', tag='icon4py_20240521', git=url) - version('1.0.3.8', tag='icon4py_20240711', git=url) + version('1.0.3.8', tag='icon4py_20240711') + version('1.0.3.5', tag='icon4py_20240322') + version('1.0.3.3', tag='icon4py_20240229') maintainers = ['samkellerhals'] diff --git a/repo/packages/py-icon4py/package.py b/repo/packages/py-icon4py/package.py index 7f752b97aa..22181a5bd4 100644 --- a/repo/packages/py-icon4py/package.py +++ b/repo/packages/py-icon4py/package.py @@ -16,17 +16,14 @@ class PyIcon4py(PythonPackage): """ICON4Py contains Python (GT4Py) implementations of ICON (inspired) components for weather and climate models.""" - url = "git@github.com:C2SM/icon4py.git" git = 'git@github.com:C2SM/icon4py.git' - homepage = "https://github.com/C2SM/icon4py" - maintainers = ['agopal', 'samkellerhals'] - version('main', branch='main', git=git) - version('0.0.10', tag='v0.0.10', git=git) - version('0.0.11', tag='v0.0.11', git=git) - version('0.0.12', tag='v0.0.12', git=git) + version('main', branch='main') + version('0.0.12', tag='v0.0.12') + version('0.0.11', tag='v0.0.11') + version('0.0.10', tag='v0.0.10') depends_on('py-wheel', type='build') depends_on('py-setuptools', type='build') diff --git a/test/system_test.py b/test/system_test.py index a2ff1f2a84..6ec62b7781 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -16,7 +16,7 @@ def test_install_cosmo_eccodes_definitions_version(version): def test_install_cosmo_6_0(): - spack_install('cosmo@6.0%nvhpc', test_root=False) + spack_install('cosmo @6.0 %nvhpc', test_root=False) def test_install_eccodes_2_19_0(): @@ -73,15 +73,8 @@ def test_install_icontools(): @pytest.mark.int2lm -def test_install_int2ml_version_3_00_gcc(): - spack_install('int2lm @int2lm-3.00 %gcc', test_root=False) - - -@pytest.mark.int2lm -def test_install_int2lm_version_3_00_nvhpc_fixed_definitions(): - spack_install( - 'int2lm @int2lm-3.00 %nvhpc ^cosmo-eccodes-definitions@2.19.0.7%nvhpc', - test_root=False) +def test_install_int2lm_3_00_nvhpc(): + spack_install('int2lm @int2lm-3.00 %nvhpc', test_root=False) def test_install_libcdi_pio_default(): @@ -89,7 +82,7 @@ def test_install_libcdi_pio_default(): def test_install_libgrib1_22_01_2020_nvhpc(): - spack_install('libgrib1 @22-01-2020%nvhpc') + spack_install('libgrib1 @22-01-2020 %nvhpc') def test_install_makedepf90(): @@ -111,42 +104,34 @@ def test_install_pytorch_fortran_proxy_version_0_4(): test_root=False) -def test_py_cytoolz_install_default(): +def test_install_py_cytoolz_install_default(): spack_install('py-cytoolz') -def test_py_devtools_install_default(): +def test_install_py_devtools_install_default(): spack_install('py-devtools') -def test_py_factory_boy_install_default(): +def test_install_py_factory_boy_install_default(): spack_install('py-factory-boy') -def test_py_frozendict_install_default(): +def test_install_py_frozendict_install_default(): spack_install('py-frozendict') -def test_py_gridtools_cpp_install_default(): +def test_install_py_gridtools_cpp_install_default(): spack_install('py-gridtools-cpp') -@pytest.mark.parametrize("version", ['1.0.3.3', '1.0.3.7', '1.0.3.8']) +@pytest.mark.parametrize("version", ['1.0.3.3', '1.0.3.5', '1.0.3.8']) def test_install_py_gt4py_for_version(version, ): spack_install(f'py-gt4py @{version}') -@pytest.mark.py_icon4py -def test_install_py_icon4py_version_0_0_10(): - spack_install('py-icon4py @ 0.0.10 %gcc ^py-gt4py@1.0.3.3') - - -def test_install_py_icon4py_version_0_0_11(): - spack_install('py-icon4py @ 0.0.11 %gcc ^py-gt4py@1.0.3.7') - - -def test_install_py_icon4py_version_0_0_12(): - spack_install('py-icon4py @ 0.0.12 %gcc ^py-gt4py@1.0.3.8') +@pytest.mark.parametrize("version", ['0.0.10', '0.0.11', '0.0.12']) +def test_install_py_icon4py_version_0_0_10(version, ): + spack_install(f'py-icon4py @{version}') def test_install_py_hatchling_default():