From 91890fbcaa2596382b4f87d6be11316eeb5e359d Mon Sep 17 00:00:00 2001 From: Abishek Gopal Date: Wed, 20 Sep 2023 12:13:00 +0200 Subject: [PATCH 01/31] adding patched v0.0.3.1 --- repos/c2sm/packages/py-icon4py/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index afb73308c8..c9e1606946 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -25,6 +25,8 @@ class PyIcon4py(PythonPackage): version('main', branch='main', git=git) version('0.0.3', tag='v0.0.3', git=git) + version('0.0.3.1', branch='dev_v0.0.3', git=git) #delete later + #version('0.0.3.1', tag='v0.0.3.1', git=git) version('0.0.4', tag='v0.0.4', git=git) version('0.0.5', tag='v0.0.5', git=git) version('0.0.6', tag='v0.0.6', git=git) From 91c2c98c5e0cf80cfb399d1aa9a5e3df5881a018 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Sep 2023 10:13:34 +0000 Subject: [PATCH 02/31] GitHub Action: Apply Pep8-formatting --- repos/c2sm/packages/py-icon4py/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index c9e1606946..320d4d5aa5 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -25,7 +25,7 @@ class PyIcon4py(PythonPackage): version('main', branch='main', git=git) version('0.0.3', tag='v0.0.3', git=git) - version('0.0.3.1', branch='dev_v0.0.3', git=git) #delete later + version('0.0.3.1', branch='dev_v0.0.3', git=git) #delete later #version('0.0.3.1', tag='v0.0.3.1', git=git) version('0.0.4', tag='v0.0.4', git=git) version('0.0.5', tag='v0.0.5', git=git) From 8021a198e759ae249dd501a88cc39b50eac5b92a Mon Sep 17 00:00:00 2001 From: Abishek Gopal Date: Wed, 20 Sep 2023 13:55:21 +0200 Subject: [PATCH 03/31] updating condition --- repos/c2sm/packages/py-icon4py/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index 320d4d5aa5..25d4fc68ee 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -156,7 +156,7 @@ def install(self, pkg, spec, prefix): pip = inspect.getmodule(pkg).pip - if self.spec.version == ver('=0.0.3'): + if self.spec.version == ver('=0.0.3') or self.spec.version == ver('=0.0.3.1'): build_dirs = [ 'common', 'pyutils', 'testutils', 'liskov', 'atm_dyn_iconam' ] From 3e90bcdf26c1159a5297853d61cc069ba0bc2f11 Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Wed, 20 Sep 2023 13:53:38 +0200 Subject: [PATCH 04/31] trying special case for v0.0.3 --- repos/c2sm/packages/icon/package.py | 34 +++++++++++++++++++---------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/repos/c2sm/packages/icon/package.py b/repos/c2sm/packages/icon/package.py index 07d4c897e4..4b98f0d8f6 100755 --- a/repos/c2sm/packages/icon/package.py +++ b/repos/c2sm/packages/icon/package.py @@ -586,18 +586,30 @@ def configure_args(self): config_vars['LOC_GT4PY'].append(self.spec['py-gt4py'].prefix) config_vars['LOC_ICON4PY_BIN'].append( self.spec['py-icon4py'].prefix) - config_vars['LOC_ICON4PY_ATM_DYN_ICONAM'].append( - self.spec['py-icon4py:atm_dyn_iconam'].headers.directories[0]) - config_vars['LOC_ICON4PY_TOOLS'].append( - self.spec['py-icon4py:tools'].headers.directories[0]) - if self.spec['py-icon4py'].version > Version("0.0.7"): - config_vars['LOC_ICON4PY_DIFFUSION'].append( - self.spec['py-icon4py:diffusion'].headers.directories[0]) - config_vars['LOC_ICON4PY_INTERPOLATION'].append( - self.spec['py-icon4py:interpolation'].headers. - directories[0]) + + if self.spec['py-icon4py'].version < Version("0.0.4"): + config_vars['LOC_ICON4PY_ATM_DYN_ICONAM'].append( + os.path.join( + self.spec['py-icon4py'].prefix, + 'lib/python3.10/site-packages/icon4py/atm_dyn_iconam')) config_vars['LOC_ICON4PY_ADVECTION'].append( - self.spec['py-icon4py:advection'].headers.directories[0]) + os.path.join(self.spec['py-icon4py'].prefix, + 'lib/python3.10/site-packages/icon4py/advection')) + config_vars['LOC_ICON4PY_UTILS'].append( + os.path.join(self.spec['py-icon4py'].prefix, + 'lib/python3.10/site-packages/icon4py')) + else: + config_vars['LOC_ICON4PY_ATM_DYN_ICONAM'].append( + self.spec['py-icon4py:atm_dyn_iconam'].headers.directories[0]) + config_vars['LOC_ICON4PY_TOOLS'].append( + self.spec['py-icon4py:tools'].headers.directories[0]) + if self.spec['py-icon4py'].version > Version("0.0.7"): + config_vars['LOC_ICON4PY_DIFFUSION'].append( + self.spec['py-icon4py:diffusion'].headers.directories[0]) + config_vars['LOC_ICON4PY_INTERPOLATION'].append( + self.spec['py-icon4py:interpolation'].headers. + directories[0]) + config_vars['LOC_GRIDTOOLS'].append( self.spec['py-gridtools-cpp:data'].headers.directories[0]) config_vars['GT4PYNVCFLAGS'] = config_vars['NVCFLAGS'] From b5d203f629d35bfbcb001d48a18f45a155396998 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Sep 2023 11:54:05 +0000 Subject: [PATCH 05/31] GitHub Action: Apply Pep8-formatting --- repos/c2sm/packages/icon/package.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/repos/c2sm/packages/icon/package.py b/repos/c2sm/packages/icon/package.py index 4b98f0d8f6..4e779d1295 100755 --- a/repos/c2sm/packages/icon/package.py +++ b/repos/c2sm/packages/icon/package.py @@ -593,23 +593,26 @@ def configure_args(self): self.spec['py-icon4py'].prefix, 'lib/python3.10/site-packages/icon4py/atm_dyn_iconam')) config_vars['LOC_ICON4PY_ADVECTION'].append( - os.path.join(self.spec['py-icon4py'].prefix, - 'lib/python3.10/site-packages/icon4py/advection')) + os.path.join( + self.spec['py-icon4py'].prefix, + 'lib/python3.10/site-packages/icon4py/advection')) config_vars['LOC_ICON4PY_UTILS'].append( os.path.join(self.spec['py-icon4py'].prefix, 'lib/python3.10/site-packages/icon4py')) else: config_vars['LOC_ICON4PY_ATM_DYN_ICONAM'].append( - self.spec['py-icon4py:atm_dyn_iconam'].headers.directories[0]) + self.spec['py-icon4py:atm_dyn_iconam'].headers. + directories[0]) config_vars['LOC_ICON4PY_TOOLS'].append( self.spec['py-icon4py:tools'].headers.directories[0]) if self.spec['py-icon4py'].version > Version("0.0.7"): config_vars['LOC_ICON4PY_DIFFUSION'].append( - self.spec['py-icon4py:diffusion'].headers.directories[0]) + self.spec['py-icon4py:diffusion'].headers. + directories[0]) config_vars['LOC_ICON4PY_INTERPOLATION'].append( self.spec['py-icon4py:interpolation'].headers. directories[0]) - + config_vars['LOC_GRIDTOOLS'].append( self.spec['py-gridtools-cpp:data'].headers.directories[0]) config_vars['GT4PYNVCFLAGS'] = config_vars['NVCFLAGS'] From 21c3b100880ccd9a564e28b5d0e0f97a0ff12c53 Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:06:12 +0200 Subject: [PATCH 06/31] Update package.py --- repos/c2sm/packages/py-icon4py/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index 25d4fc68ee..728af1dfef 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -25,8 +25,7 @@ class PyIcon4py(PythonPackage): version('main', branch='main', git=git) version('0.0.3', tag='v0.0.3', git=git) - version('0.0.3.1', branch='dev_v0.0.3', git=git) #delete later - #version('0.0.3.1', tag='v0.0.3.1', git=git) + version('0.0.3.1', tag='v0.0.3.1', git=git) version('0.0.4', tag='v0.0.4', git=git) version('0.0.5', tag='v0.0.5', git=git) version('0.0.6', tag='v0.0.6', git=git) From eefe13fc03ed1a8b32f6df2992f34affc576eca0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 24 Sep 2023 15:52:49 +0000 Subject: [PATCH 07/31] GitHub Action: Apply Pep8-formatting --- repos/c2sm/packages/py-icon4py/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index 728af1dfef..e6d2983094 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -155,7 +155,8 @@ def install(self, pkg, spec, prefix): pip = inspect.getmodule(pkg).pip - if self.spec.version == ver('=0.0.3') or self.spec.version == ver('=0.0.3.1'): + if self.spec.version == ver('=0.0.3') or self.spec.version == ver( + '=0.0.3.1'): build_dirs = [ 'common', 'pyutils', 'testutils', 'liskov', 'atm_dyn_iconam' ] From c8d29ab13e55c08147b61dde8bb0521cb06a9895 Mon Sep 17 00:00:00 2001 From: Abishek Gopal Date: Thu, 28 Sep 2023 17:55:20 +0200 Subject: [PATCH 08/31] renaming gt4py versions --- repos/c2sm/packages/py-gt4py/package.py | 8 ++++---- test/system_test.py | 26 ++++++++++++++----------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/repos/c2sm/packages/py-gt4py/package.py b/repos/c2sm/packages/py-gt4py/package.py index 5d1bcbb1e1..0daec83ed3 100644 --- a/repos/c2sm/packages/py-gt4py/package.py +++ b/repos/c2sm/packages/py-gt4py/package.py @@ -16,10 +16,10 @@ class PyGt4py(PythonPackage): url = "git@github.com:GridTools/gt4py.git" version('main', branch='main', git=url) - version('1.1.1', tag='icon4py_20230413', git=url) - version('1.1.2', tag='icon4py_20230621', git=url) - version('1.1.3', tag='icon4py_20230817', git=url) - version('1.1.4', tag='icon4py_20230926', git=url) + version('1.0.1.1', tag='icon4py_20230413', git=url) + version('1.0.1.2', tag='icon4py_20230621', git=url) + version('1.0.1.3', tag='icon4py_20230817', git=url) + version('1.0.1.4', tag='icon4py_20230926', git=url) maintainers = ['samkellerhals'] diff --git a/test/system_test.py b/test/system_test.py index dff0e44118..fc4b861a90 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -645,19 +645,19 @@ def test_install_default(self): @pytest.mark.no_tsa # Irrelevant class PyGt4pyTest(unittest.TestCase): - def test_install_version_1_1_1(self): - spack_install_and_test('py-gt4py @1.1.1') + def test_install_version_1_0_1_1(self): + spack_install_and_test('py-gt4py @1.0.1.1') - def test_install_version_1_1_2(self): - spack_install_and_test('py-gt4py @1.1.2') + def test_install_version_1_0_1_2(self): + spack_install_and_test('py-gt4py @1.0.1.2') @pytest.mark.no_daint # fails with ModuleNotFoundError: No module named 'dace' @pytest.mark.no_balfrin # fails with ModuleNotFoundError: No module named 'dace' - def test_install_version_1_1_3(self): - spack_install_and_test('py-gt4py @1.1.3') + def test_install_version_1_0_1_3(self): + spack_install_and_test('py-gt4py @1.0.1.3') - def test_install_version_1_1_4(self): - spack_install_and_test('py-gt4py @1.1.4') + def test_install_version_1_0_1_4(self): + spack_install_and_test('py-gt4py @1.0.1.4') class PyHatchlingTest(unittest.TestCase): @@ -670,14 +670,18 @@ def test_install_default(self): class PyIcon4pyTest(unittest.TestCase): def test_install_version_0_0_5(self): - spack_install_and_test('py-icon4py @ 0.0.5 %gcc ^py-gt4py@1.1.1') + spack_install_and_test('py-icon4py @ 0.0.5 %gcc ^py-gt4py@1.0.1.1') def test_install_version_0_0_6(self): - spack_install_and_test('py-icon4py @ 0.0.6 %gcc ^py-gt4py@1.1.2') + spack_install_and_test('py-icon4py @ 0.0.6 %gcc ^py-gt4py@1.0.1.2') def test_install_version_0_0_7(self): spack_install_and_test( - 'py-icon4py @ 0.0.7 %gcc ^py-gt4py@1.1.3 ^python@3.10.4') + 'py-icon4py @ 0.0.7 %gcc ^py-gt4py@1.0.1.3 ^python@3.10.4') + + def test_install_version_0_0_8(self): + spack_install_and_test( + 'py-icon4py @ 0.0.8 %gcc ^py-gt4py@1.0.1.4 ^python@3.10.4') class PyInflectionTest(unittest.TestCase): From be1d446324813706ca1d40090c32701f58d9bbbb Mon Sep 17 00:00:00 2001 From: Abishek Gopal Date: Thu, 28 Sep 2023 18:03:46 +0200 Subject: [PATCH 09/31] testing new icon4py gt4py tags --- repos/c2sm/packages/py-gt4py/package.py | 1 + repos/c2sm/packages/py-icon4py/package.py | 3 ++- test/system_test.py | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/repos/c2sm/packages/py-gt4py/package.py b/repos/c2sm/packages/py-gt4py/package.py index 0daec83ed3..6252956b39 100644 --- a/repos/c2sm/packages/py-gt4py/package.py +++ b/repos/c2sm/packages/py-gt4py/package.py @@ -17,6 +17,7 @@ class PyGt4py(PythonPackage): version('main', branch='main', git=url) version('1.0.1.1', tag='icon4py_20230413', git=url) + version('1.0.1.1b', tag='icon4py_20230530', git=url) version('1.0.1.2', tag='icon4py_20230621', git=url) version('1.0.1.3', tag='icon4py_20230817', git=url) version('1.0.1.4', tag='icon4py_20230926', git=url) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index e6d2983094..a38ee57a42 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -25,7 +25,8 @@ class PyIcon4py(PythonPackage): version('main', branch='main', git=git) version('0.0.3', tag='v0.0.3', git=git) - version('0.0.3.1', tag='v0.0.3.1', git=git) + #version('0.0.3.1', tag='v0.0.3.1', git=git) + version('0.0.3.1', branch='patch_v0.0.3', git=git) version('0.0.4', tag='v0.0.4', git=git) version('0.0.5', tag='v0.0.5', git=git) version('0.0.6', tag='v0.0.6', git=git) diff --git a/test/system_test.py b/test/system_test.py index fc4b861a90..d491e54e4f 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -669,6 +669,9 @@ def test_install_default(self): @pytest.mark.no_tsa # py-isort install fails with: No module named 'poetry'. class PyIcon4pyTest(unittest.TestCase): + def test_install_version_0_0_3(self): + spack_install_and_test('py-icon4py @ 0.0.3.1 %gcc ^py-gt4py@1.0.1.1b') + def test_install_version_0_0_5(self): spack_install_and_test('py-icon4py @ 0.0.5 %gcc ^py-gt4py@1.0.1.1') From cd14facd06d894dbb093c99c3fdcea85a435abc0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 28 Sep 2023 16:04:09 +0000 Subject: [PATCH 10/31] 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 d491e54e4f..7dd445a401 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -671,7 +671,7 @@ class PyIcon4pyTest(unittest.TestCase): def test_install_version_0_0_3(self): spack_install_and_test('py-icon4py @ 0.0.3.1 %gcc ^py-gt4py@1.0.1.1b') - + def test_install_version_0_0_5(self): spack_install_and_test('py-icon4py @ 0.0.5 %gcc ^py-gt4py@1.0.1.1') From 7df387188ecbd04315ade0cc4d002bfae40ddf57 Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Fri, 29 Sep 2023 09:57:23 +0200 Subject: [PATCH 11/31] Update package.py --- repos/c2sm/packages/icon/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/repos/c2sm/packages/icon/package.py b/repos/c2sm/packages/icon/package.py index 4e779d1295..ed2fa4fd45 100755 --- a/repos/c2sm/packages/icon/package.py +++ b/repos/c2sm/packages/icon/package.py @@ -612,7 +612,9 @@ def configure_args(self): config_vars['LOC_ICON4PY_INTERPOLATION'].append( self.spec['py-icon4py:interpolation'].headers. directories[0]) - + if self.spec['py-icon4py'].version > Version("0.0.8"): + config_vars['LOC_ICON4PY_ADVECTION'].append( + self.spec['py-icon4py:advection'].headers.directories[0]) config_vars['LOC_GRIDTOOLS'].append( self.spec['py-gridtools-cpp:data'].headers.directories[0]) config_vars['GT4PYNVCFLAGS'] = config_vars['NVCFLAGS'] From 6cd635056ef2cf3d83e2d3060882645182f6af53 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 29 Sep 2023 07:57:50 +0000 Subject: [PATCH 12/31] GitHub Action: Apply Pep8-formatting --- repos/c2sm/packages/icon/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repos/c2sm/packages/icon/package.py b/repos/c2sm/packages/icon/package.py index ed2fa4fd45..b22b707dbf 100755 --- a/repos/c2sm/packages/icon/package.py +++ b/repos/c2sm/packages/icon/package.py @@ -614,7 +614,8 @@ def configure_args(self): directories[0]) if self.spec['py-icon4py'].version > Version("0.0.8"): config_vars['LOC_ICON4PY_ADVECTION'].append( - self.spec['py-icon4py:advection'].headers.directories[0]) + self.spec['py-icon4py:advection'].headers. + directories[0]) config_vars['LOC_GRIDTOOLS'].append( self.spec['py-gridtools-cpp:data'].headers.directories[0]) config_vars['GT4PYNVCFLAGS'] = config_vars['NVCFLAGS'] From c75eee06c752d890cec6b0401a76ee375bc2acdf Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Fri, 29 Sep 2023 10:46:22 +0200 Subject: [PATCH 13/31] Update package.py --- repos/c2sm/packages/py-gt4py/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/c2sm/packages/py-gt4py/package.py b/repos/c2sm/packages/py-gt4py/package.py index 6252956b39..afe088366a 100644 --- a/repos/c2sm/packages/py-gt4py/package.py +++ b/repos/c2sm/packages/py-gt4py/package.py @@ -61,7 +61,7 @@ class PyGt4py(PythonPackage): # See: https://github.com/C2SM/spack-c2sm/issues/803 depends_on('py-pybind11@2.5:2.9.2', type=('build', 'run')) - depends_on('py-nanobind@1.4.0:', when="@1.1.3:", type=('build', 'run')) + depends_on('py-nanobind@1.4.0:', when="@1.0.1.3:", type=('build', 'run')) depends_on('py-tabulate@0.8.10:', type=('build', 'run')) depends_on('py-typing-extensions@4.2:4.6', type=('build', 'run')) depends_on('py-toolz@0.12.0:', type=('build', 'run')) From 4b56ed3ee9771977414e2e3299434cce7b40f75b Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Tue, 3 Oct 2023 08:58:02 +0200 Subject: [PATCH 14/31] Update package.py --- repos/c2sm/packages/py-icon4py/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index a38ee57a42..e6d2983094 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -25,8 +25,7 @@ class PyIcon4py(PythonPackage): version('main', branch='main', git=git) version('0.0.3', tag='v0.0.3', git=git) - #version('0.0.3.1', tag='v0.0.3.1', git=git) - version('0.0.3.1', branch='patch_v0.0.3', git=git) + version('0.0.3.1', tag='v0.0.3.1', git=git) version('0.0.4', tag='v0.0.4', git=git) version('0.0.5', tag='v0.0.5', git=git) version('0.0.6', tag='v0.0.6', git=git) From 860e0a8d191b5f13ae20878e647bf6d5ad8fbd0f Mon Sep 17 00:00:00 2001 From: abishekg7 Date: Mon, 16 Oct 2023 09:07:28 +0200 Subject: [PATCH 15/31] adding test for gt4py 1.0.1.1b --- test/system_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/system_test.py b/test/system_test.py index 7dd445a401..a3df25d7dd 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -648,6 +648,9 @@ class PyGt4pyTest(unittest.TestCase): def test_install_version_1_0_1_1(self): spack_install_and_test('py-gt4py @1.0.1.1') + def test_install_version_1_0_1_1b(self): + spack_install_and_test('py-gt4py @1.0.1.1b') + def test_install_version_1_0_1_2(self): spack_install_and_test('py-gt4py @1.0.1.2') From 0baa030d1b4fbee916aee72f0c4f4289a3a99899 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 16 Oct 2023 07:08:05 +0000 Subject: [PATCH 16/31] 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 a3df25d7dd..01725bbb4a 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -650,7 +650,7 @@ 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') - + def test_install_version_1_0_1_2(self): spack_install_and_test('py-gt4py @1.0.1.2') From 4437e0c227aa256c806b72c3c8714953f770dc0e Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Mon, 16 Oct 2023 15:39:13 +0200 Subject: [PATCH 17/31] adding icon4py v0.0.8 --- repos/c2sm/packages/py-icon4py/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index e6d2983094..d2a7f734a3 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -30,6 +30,7 @@ class PyIcon4py(PythonPackage): version('0.0.5', tag='v0.0.5', git=git) version('0.0.6', tag='v0.0.6', git=git) version('0.0.7', tag='v0.0.7', git=git) + version('0.0.8', tag='v0.0.8', git=git) depends_on('py-wheel', type='build') depends_on('py-setuptools', type='build') From f30025ca957406c2db9a08f69228d992dd25453a Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Tue, 17 Oct 2023 08:49:54 +0200 Subject: [PATCH 18/31] Update system_test.py --- test/system_test.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/system_test.py b/test/system_test.py index 01725bbb4a..1842ff9422 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -685,10 +685,6 @@ def test_install_version_0_0_7(self): spack_install_and_test( 'py-icon4py @ 0.0.7 %gcc ^py-gt4py@1.0.1.3 ^python@3.10.4') - def test_install_version_0_0_8(self): - spack_install_and_test( - 'py-icon4py @ 0.0.8 %gcc ^py-gt4py@1.0.1.4 ^python@3.10.4') - class PyInflectionTest(unittest.TestCase): From 64f5ac0a3c0363858955cec2d2a40cc13ba68abd Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Tue, 17 Oct 2023 08:50:30 +0200 Subject: [PATCH 19/31] Update package.py --- repos/c2sm/packages/py-icon4py/package.py | 1 - 1 file changed, 1 deletion(-) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index d2a7f734a3..e6d2983094 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -30,7 +30,6 @@ class PyIcon4py(PythonPackage): version('0.0.5', tag='v0.0.5', git=git) version('0.0.6', tag='v0.0.6', git=git) version('0.0.7', tag='v0.0.7', git=git) - version('0.0.8', tag='v0.0.8', git=git) depends_on('py-wheel', type='build') depends_on('py-setuptools', type='build') From bd19057441ebf2518d625c3afe822a25737a8b11 Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:09:53 +0200 Subject: [PATCH 20/31] folder mapping for lower versions --- repos/c2sm/packages/py-icon4py/package.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index e6d2983094..e84033956f 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -70,6 +70,10 @@ def headers(self): version = self.spec.version folder_mapping = { + ver('=0.0.3:0.0.3.1'): { + 'atm_dyn_iconam': 'atm_dyn_iconam', + 'utils': '' + }, ver('=0.0.4'): { 'atm_dyn_iconam': 'atm_dyn_iconam', 'tools': 'icon4pytools' From 64c658d06d749fe3822ce00e4daf852c377be8a4 Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:10:16 +0200 Subject: [PATCH 21/31] folder mapping --- repos/c2sm/packages/icon/package.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/repos/c2sm/packages/icon/package.py b/repos/c2sm/packages/icon/package.py index b22b707dbf..9d54c3d6b6 100755 --- a/repos/c2sm/packages/icon/package.py +++ b/repos/c2sm/packages/icon/package.py @@ -586,23 +586,15 @@ def configure_args(self): config_vars['LOC_GT4PY'].append(self.spec['py-gt4py'].prefix) config_vars['LOC_ICON4PY_BIN'].append( self.spec['py-icon4py'].prefix) + + config_vars['LOC_ICON4PY_ATM_DYN_ICONAM'].append( + self.spec['py-icon4py:atm_dyn_iconam'].headers. + directories[0]) if self.spec['py-icon4py'].version < Version("0.0.4"): - config_vars['LOC_ICON4PY_ATM_DYN_ICONAM'].append( - os.path.join( - self.spec['py-icon4py'].prefix, - 'lib/python3.10/site-packages/icon4py/atm_dyn_iconam')) - config_vars['LOC_ICON4PY_ADVECTION'].append( - os.path.join( - self.spec['py-icon4py'].prefix, - 'lib/python3.10/site-packages/icon4py/advection')) config_vars['LOC_ICON4PY_UTILS'].append( - os.path.join(self.spec['py-icon4py'].prefix, - 'lib/python3.10/site-packages/icon4py')) + self.spec['py-icon4py:utils'].headers.directories[0]) else: - config_vars['LOC_ICON4PY_ATM_DYN_ICONAM'].append( - self.spec['py-icon4py:atm_dyn_iconam'].headers. - directories[0]) config_vars['LOC_ICON4PY_TOOLS'].append( self.spec['py-icon4py:tools'].headers.directories[0]) if self.spec['py-icon4py'].version > Version("0.0.7"): From 76c318d487f83a237cadbe53ebfbed7ece5d7d23 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 17 Oct 2023 07:10:44 +0000 Subject: [PATCH 22/31] GitHub Action: Apply Pep8-formatting --- repos/c2sm/packages/icon/package.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/repos/c2sm/packages/icon/package.py b/repos/c2sm/packages/icon/package.py index 9d54c3d6b6..15fab94f01 100755 --- a/repos/c2sm/packages/icon/package.py +++ b/repos/c2sm/packages/icon/package.py @@ -586,10 +586,9 @@ def configure_args(self): config_vars['LOC_GT4PY'].append(self.spec['py-gt4py'].prefix) config_vars['LOC_ICON4PY_BIN'].append( self.spec['py-icon4py'].prefix) - + config_vars['LOC_ICON4PY_ATM_DYN_ICONAM'].append( - self.spec['py-icon4py:atm_dyn_iconam'].headers. - directories[0]) + self.spec['py-icon4py:atm_dyn_iconam'].headers.directories[0]) if self.spec['py-icon4py'].version < Version("0.0.4"): config_vars['LOC_ICON4PY_UTILS'].append( From 5f543badcdcc951e5ea4377a886f5b5dc4381201 Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:04:05 +0200 Subject: [PATCH 23/31] temp test for dsl --- 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 1842ff9422..9209caf451 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -429,8 +429,8 @@ def test_install_nwp_test_cpu_cce(self): def test_install_exclaim_test_gpu_dsl(self): spack_env_dev_install_and_test( 'config/cscs/spack/v0.18.1.7/daint_dsl_nvhpc', - 'git@github.com:C2SM/icon.git', - 'ci_dsl', + 'git@github.com:abishekg7/icon.git', + 'patch-1', 'icon', build_on_login_node=True) From edaa2dce1d7fc616d4993bd9475ad0eaf74d28b6 Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:15:41 +0200 Subject: [PATCH 24/31] 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 9209caf451..90d8ac80c7 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -429,8 +429,8 @@ def test_install_nwp_test_cpu_cce(self): def test_install_exclaim_test_gpu_dsl(self): spack_env_dev_install_and_test( 'config/cscs/spack/v0.18.1.7/daint_dsl_nvhpc', - 'git@github.com:abishekg7/icon.git', - 'patch-1', + 'git@github.com:C2SM/icon-exclaim.git', + 'abishekg7-patch-2', 'icon', build_on_login_node=True) From bbd2d0664a226a7e7ba91de183a63ac43538308e Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:05:47 +0200 Subject: [PATCH 25/31] Update package.py --- repos/c2sm/packages/py-icon4py/package.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index e84033956f..1d1c3dc800 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -70,7 +70,7 @@ def headers(self): version = self.spec.version folder_mapping = { - ver('=0.0.3:0.0.3.1'): { + ver('0.0.3:0.0.3.1'): { 'atm_dyn_iconam': 'atm_dyn_iconam', 'utils': '' }, @@ -108,10 +108,6 @@ def headers(self): if len(query_parameters) > 1: raise ValueError('Only one query parameter allowed') - if version == ver('=0.0.3') and len(query_parameters) == 1: - msg = 'Not implemented for version {0}'.format(version) - raise spack.error.NoHeadersError(msg) - folder_name = folder_mapping.get(version, {}) if not folder_name: From 69079d6f1ec9629e52447a2828ba29102002033b Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:42:18 +0200 Subject: [PATCH 26/31] Pick parent dir for ver < 0.0.4 --- repos/c2sm/packages/icon/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/c2sm/packages/icon/package.py b/repos/c2sm/packages/icon/package.py index 15fab94f01..aa6c28362e 100755 --- a/repos/c2sm/packages/icon/package.py +++ b/repos/c2sm/packages/icon/package.py @@ -592,7 +592,7 @@ def configure_args(self): if self.spec['py-icon4py'].version < Version("0.0.4"): config_vars['LOC_ICON4PY_UTILS'].append( - self.spec['py-icon4py:utils'].headers.directories[0]) + os.path.dirname(self.spec['py-icon4py:utils'].headers.directories[0])) else: config_vars['LOC_ICON4PY_TOOLS'].append( self.spec['py-icon4py:tools'].headers.directories[0]) From 79676aa7d3d0e15e08255c4da2994f0ea41dd81d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 18 Oct 2023 16:42:44 +0000 Subject: [PATCH 27/31] GitHub Action: Apply Pep8-formatting --- repos/c2sm/packages/icon/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repos/c2sm/packages/icon/package.py b/repos/c2sm/packages/icon/package.py index aa6c28362e..2ebb8633e3 100755 --- a/repos/c2sm/packages/icon/package.py +++ b/repos/c2sm/packages/icon/package.py @@ -592,7 +592,8 @@ def configure_args(self): if self.spec['py-icon4py'].version < Version("0.0.4"): config_vars['LOC_ICON4PY_UTILS'].append( - os.path.dirname(self.spec['py-icon4py:utils'].headers.directories[0])) + os.path.dirname( + self.spec['py-icon4py:utils'].headers.directories[0])) else: config_vars['LOC_ICON4PY_TOOLS'].append( self.spec['py-icon4py:tools'].headers.directories[0]) From c29491d10b159ad791e2a357b0f071b872db219b Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:44:02 +0200 Subject: [PATCH 28/31] Update package.py --- repos/c2sm/packages/py-icon4py/package.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index 1d1c3dc800..727d05e134 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -70,9 +70,13 @@ def headers(self): version = self.spec.version folder_mapping = { - ver('0.0.3:0.0.3.1'): { + ver('=0.0.3'): { 'atm_dyn_iconam': 'atm_dyn_iconam', - 'utils': '' + 'utils': 'liskov' #utils will eventually map to parent directory of liskov + }, + ver('=0.0.3.1'): { + 'atm_dyn_iconam': 'atm_dyn_iconam', + 'utils': 'liskov' #utils will eventually map to parent directory of liskov }, ver('=0.0.4'): { 'atm_dyn_iconam': 'atm_dyn_iconam', From d9f1e4e41854e845d4acf1c4b1e7f3519f548bb7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 18 Oct 2023 16:44:26 +0000 Subject: [PATCH 29/31] GitHub Action: Apply Pep8-formatting --- repos/c2sm/packages/py-icon4py/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/repos/c2sm/packages/py-icon4py/package.py b/repos/c2sm/packages/py-icon4py/package.py index 727d05e134..4560138ed2 100644 --- a/repos/c2sm/packages/py-icon4py/package.py +++ b/repos/c2sm/packages/py-icon4py/package.py @@ -72,11 +72,13 @@ def headers(self): folder_mapping = { ver('=0.0.3'): { 'atm_dyn_iconam': 'atm_dyn_iconam', - 'utils': 'liskov' #utils will eventually map to parent directory of liskov + 'utils': + 'liskov' #utils will eventually map to parent directory of liskov }, ver('=0.0.3.1'): { 'atm_dyn_iconam': 'atm_dyn_iconam', - 'utils': 'liskov' #utils will eventually map to parent directory of liskov + 'utils': + 'liskov' #utils will eventually map to parent directory of liskov }, ver('=0.0.4'): { 'atm_dyn_iconam': 'atm_dyn_iconam', From 225844fd3a670173496db8a641dec450f994165b Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:44:34 +0200 Subject: [PATCH 30/31] 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 90d8ac80c7..762e622a06 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -429,8 +429,8 @@ def test_install_nwp_test_cpu_cce(self): def test_install_exclaim_test_gpu_dsl(self): spack_env_dev_install_and_test( 'config/cscs/spack/v0.18.1.7/daint_dsl_nvhpc', - 'git@github.com:C2SM/icon-exclaim.git', - 'abishekg7-patch-2', + 'git@github.com:abishekg7/icon.git', + 'patch1', 'icon', build_on_login_node=True) From 44c2d8674c353801445d22906d9ca72974982ae1 Mon Sep 17 00:00:00 2001 From: abishekg7 <56273301+abishekg7@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:05:04 +0200 Subject: [PATCH 31/31] Reverting repo/branch --- 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 762e622a06..1842ff9422 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -429,8 +429,8 @@ def test_install_nwp_test_cpu_cce(self): def test_install_exclaim_test_gpu_dsl(self): spack_env_dev_install_and_test( 'config/cscs/spack/v0.18.1.7/daint_dsl_nvhpc', - 'git@github.com:abishekg7/icon.git', - 'patch1', + 'git@github.com:C2SM/icon.git', + 'ci_dsl', 'icon', build_on_login_node=True)