Skip to content

Update versions in ICON package and cleanup #1060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huppd merged 13 commits into from
Dec 3, 2025
Merged

Update versions in ICON package and cleanup #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
82ed2c2
update version
huppd Nov 6, 2025
aedba8a
update test version
huppd Nov 10, 2025
39b7548
GitHub Action: Apply Pep8-formatting
invalid-email-address Nov 10, 2025
896232e
rm maintainer
huppd Nov 14, 2025
21d12f7
switch to balfrinew
huppd Nov 18, 2025
377b2fd
fix balfrin test
huppd Nov 18, 2025
97a687e
keep old versions
huppd Nov 18, 2025
c86d0e9
revert ew
huppd Nov 20, 2025
309b0cb
fix working version
huppd Nov 25, 2025
c61cf13
rm py-icon4py
huppd Nov 25, 2025
96738b7
reduce number of threads
huppd Nov 27, 2025
c08fcbf
rm gt4py and improve jenkins
huppd Nov 28, 2025
656b755
Merge remote-tracking branch 'origin/main' into update_icon_versions
huppd Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ pipeline {
name 'NODENAME'
values 'balfrin'
}
axis {
name 'NTHREADS'
values '32'
}
}
post {
always {
Expand Down Expand Up @@ -54,7 +58,7 @@ pipeline {
sh """
source ./setup-env.sh ${upstream}
source .venv/bin/activate
pytest -v -n auto test/integration_test.py
pytest -v -n ${NTHREADS} test/integration_test.py
"""
}
}
Expand All @@ -63,7 +67,7 @@ pipeline {
sh """
source ./setup-env.sh ${upstream}
source .venv/bin/activate
pytest -v -n auto test/common_system_test.py test/balfrin_system_test.py
pytest -v -n ${NTHREADS} test/common_system_test.py test/balfrin_system_test.py
"""
}
}
Expand Down
21 changes: 20 additions & 1 deletion repos/c2sm/packages/icon/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,25 @@ def check_variant_extra_config_args(extra_config_arg):
class Icon(SpackIcon):
git = '[email protected]:icon/icon-nwp.git'

maintainers('jonasjucker', 'huppd')
maintainers('huppd')

version('develop', submodules=True)
version("icon-2025.10",
tag="icon-2025.10",
git='[email protected]:icon/icon.git',
submodules=True)
version("icon-2025.04-2",
tag="icon-2025.04-2",
git='[email protected]:icon/icon.git',
submodules=True)
version("icon-2025.04-1",
tag="icon-2025.04-1",
git='[email protected]:icon/icon.git',
submodules=True)
version("icon-2025.04",
tag="icon-2025.04",
git='[email protected]:icon/icon.git',
submodules=True)
version("2024.10",
tag="icon-2024.10",
git='[email protected]:icon/icon.git',
Expand All @@ -43,6 +59,9 @@ class Icon(SpackIcon):
tag="icon-2024.01-1",
git='[email protected]:icon/icon.git',
submodules=True)
version('2024.10-mch-1.0', tag='icon-2024.10-mch-1.0', submodules=True)
version('2024.01-mch-2.1', tag='icon-2024.01-mch-2.1', submodules=True)
version('2024.01-mch-2.0', tag='icon-2024.01-mch-2.0', submodules=True)
version('2.6.6-mch2b', tag='icon-nwp/icon-2.6.6-mch2b', submodules=True)
version('2.6.6-mch2a', tag='icon-nwp/icon-2.6.6-mch2a', submodules=True)
version('nwp-master', submodules=True)
Expand Down
97 changes: 0 additions & 97 deletions repos/c2sm/packages/py-gt4py/package.py
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions repos/c2sm/packages/py-gt4py/patches/functional/rm_cov_config_arg.patch
View file
Open in desktop

This file was deleted.

176 changes: 0 additions & 176 deletions repos/c2sm/packages/py-icon4py/package.py
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions test/balfrin_system_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,10 @@ def test_install_icon_conditional_dependencies():

# WORKAROUND: A build and link dependency should imply that the same compiler is used. ^cray-mpich%nvhpc enforces it.
spack_install(
'icon @2.6.6-mch2b %nvhpc +coupling serialization=create +emvorado +mpi gpu=nvidia-80 ^cray-mpich%nvhpc'
'icon @2024.10-mch-1.0 %nvhpc +coupling serialization=create +emvorado +mpi gpu=nvidia-80 ^cray-mpich%nvhpc'
)


# fails due to sql error
def test_build_only_py_gt4py_for_1_0_3_10():
spack_install('py-gt4py @1.0.3.10', test_root=False)


# fails due to sql error
def test_build_only_py_icon4py_for_0_0_14():
spack_install('py-icon4py@ 0.0.14 ^py-gt4py @1.0.3.10', test_root=False)


def test_install_yaxt():
spack_install('yaxt')

Expand Down
3 changes: 2 additions & 1 deletion test/common_system_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ def test_install_makedepf90():
spack_install('makedepf90', test_root=False)


@pytest.mark.parametrize('version', ['2024.10', '2.6.6-mch2a', '2.6.6-mch2b'])
@pytest.mark.parametrize('version',
['2024.10', '2024.10-mch-1.0', '2.6.6-mch2b'])
def test_install_icon(version):
# WORKAROUND: A build and link dependency should imply that the same compiler is used. ^cray-mpich%nvhpc enforces it.
spack_install(f'icon @{version} %nvhpc ^cray-mpich%nvhpc')
Expand Down
2 changes: 1 addition & 1 deletion test/santis_system_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ def test_install_icon_conditional_dependencies():

# WORKAROUND: A build and link dependency should imply that the same compiler is used. ^cray-mpich%nvhpc enforces it.
spack_install(
'icon @2.6.6-mch2b %nvhpc +coupling +emvorado +mpi gpu=nvidia-90 ^cray-mpich%nvhpc'
'icon @2024.10-mch-1.0 %nvhpc +coupling +emvorado +mpi gpu=nvidia-90 ^cray-mpich%nvhpc'
)
Loading