Skip to content
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.

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

Edits to support icon-dsl on Daint #693

Merged
merged 5 commits into from
Mar 27, 2023
Merged

Conversation

abishekg7
Copy link
Contributor

No description provided.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 17, 2023

PR Preview Action v1.3.0
Preview removed because the pull request was closed.
2023-03-27 08:26 UTC

@@ -131,7 +135,7 @@ class Icon(AutotoolsPackage):
description=
'Enable extension of eccodes with center specific definition files')

depends_on('py-icon4py@0.0.1%gcc')
depends_on('py-icon4py@main%gcc')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better remove the @version completely and set it explicitely in an spack.yaml. This recipe needs to be as general as possible. Otherwise we can only build one specific version of icon-dsl

'-ccbin {0}'.format(cuda_host_compiler), '-g', '-O3',
'-arch=sm_{0}'.format(gpu)
])
config_vars['NVCFLAGS'].extend(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks the variant +cuda-gcc since it relies on cuda_host_compiler.
Please find a way to not break it.

@@ -55,7 +55,9 @@ def install(self, spec, prefix):
args.append('.')

pip = inspect.getmodule(self).pip
build_dirs = ['common', 'pyutils', 'testutils', 'atm_dyn_iconam']
build_dirs = [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here again you break the recipe for older version of icon4py.
I see two solutions:
Either we make each folder a variant, i.e. +liskov +common, ... or you restrict liskov to a newer version of icon4py.

Copy link
Contributor

@jonasjucker jonasjucker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some suggestions.
The most important thing, making the dsl build optional trough a variant +dsl is missing.
This PR only merges into another feature-branch, so you don't have to adress my suggestions now. But eventually the need to be solved before merging into main.

@abishekg7
Copy link
Contributor Author

thanks! I'll merge now and then properly address your comments in a later PR

@abishekg7 abishekg7 merged commit 24a7e67 into icon-gt4py-balfrin Mar 27, 2023
@abishekg7 abishekg7 deleted the icon-gt4py-daint branch March 27, 2023 08:25
abishekg7 added a commit that referenced this pull request Apr 13, 2023
* add versions for icon4py and gt4py

* GitHub Action: Apply Pep8-formatting

* add fix for py-poetry-core

* GitHub Action: Apply Pep8-formatting

* updates to get icon4py building after the major gt4py overhaul

* Update system_test.py

* GitHub Action: Apply Pep8-formatting

* add missing test deps, only test next and eve

* remove obsolete patch

* addressing some review comments

* Add Boost to CMake Include Path

* Change icon, gridtools and balfrin site packages for successful build

* GitHub Action: Apply Pep8-formatting

* set boost-path for unittests of icon4py, make tests on Balfrin work

* lock python and gt4py versions

* GitHub Action: Apply Pep8-formatting

* fix typo

* GitHub Action: Apply Pep8-formatting

* Edits to support icon-dsl on Daint (#693)

* working on daint

* GitHub Action: Apply Pep8-formatting

* tested for icon4py v0.0.2

* GitHub Action: Apply Pep8-formatting

* cleanup

---------

Co-authored-by: github-actions <[email protected]>

* Reverting to clean versions of icon, nvidia blas and lapack

* pulling changes from icon-gt4py-daint2 to support latest gt4py

* addressing review comments

* GitHub Action: Apply Pep8-formatting

* bumpin icon4py to 0.0.3, gt4py tag uknown yet. Gt4py requirements now match the correct min requirements

* updating tag to temporary tag

---------

Co-authored-by: Jonas Jucker <[email protected]>
Co-authored-by: github-actions <[email protected]>
Co-authored-by: juckerj <[email protected]>
Co-authored-by: Samuel Kellerhals <[email protected]>
Co-authored-by: Christoph Müller <[email protected]>
abishekg7 added a commit that referenced this pull request Apr 26, 2023
* add versions for icon4py and gt4py

* GitHub Action: Apply Pep8-formatting

* add fix for py-poetry-core

* GitHub Action: Apply Pep8-formatting

* updates to get icon4py building after the major gt4py overhaul

* Update system_test.py

* GitHub Action: Apply Pep8-formatting

* add missing test deps, only test next and eve

* remove obsolete patch

* addressing some review comments

* Add Boost to CMake Include Path

* Change icon, gridtools and balfrin site packages for successful build

* GitHub Action: Apply Pep8-formatting

* set boost-path for unittests of icon4py, make tests on Balfrin work

* lock python and gt4py versions

* GitHub Action: Apply Pep8-formatting

* fix typo

* GitHub Action: Apply Pep8-formatting

* Edits to support icon-dsl on Daint (#693)

* working on daint

* GitHub Action: Apply Pep8-formatting

* tested for icon4py v0.0.2

* GitHub Action: Apply Pep8-formatting

* cleanup

---------

Co-authored-by: github-actions <[email protected]>

* Reverting to clean versions of icon, nvidia blas and lapack

* pulling changes from icon-gt4py-daint2 to support latest gt4py

* addressing review comments

* GitHub Action: Apply Pep8-formatting

* icon with dsl variants

* GitHub Action: Apply Pep8-formatting

* bumpin icon4py to 0.0.3, gt4py tag uknown yet. Gt4py requirements now match the correct min requirements

* numpy seems to depend on blas/lapack without this

* remove artefact

* addressing some review comments

* GitHub Action: Apply Pep8-formatting

* Update exclaim branch

* trying new paths for icon4py

* switching all gridtools references to py-gridtools-cpp and bumping to v2.3.0

* GitHub Action: Apply Pep8-formatting

* Changing to min requirements for py-gridtools-cpp

* fix for cases when dsl=none

* GitHub Action: Apply Pep8-formatting

* Update repos/c2sm/packages/icon/package.py

Co-authored-by: juckerj <[email protected]>

---------

Co-authored-by: Jonas Jucker <[email protected]>
Co-authored-by: github-actions <[email protected]>
Co-authored-by: juckerj <[email protected]>
Co-authored-by: Samuel Kellerhals <[email protected]>
Co-authored-by: Christoph Müller <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants