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

ESMX/CMake top level to set the compilers as per esmf.mk #163

Merged
merged 5 commits into from
Jul 13, 2023

Conversation

theurich
Copy link
Member

@theurich theurich commented Jul 13, 2023

This addresses the issue observed e.g. under https://github.com/esmf-org/esmf-test-artifacts/blob/d4c27618861e8f7e8041036e6bda5361772b7151/release_8.5.0/intel/18.0.5/O/intelmpi/2018.4.274/out/nuopc.log where the ESMX Proto cases do not build correctly.

To address this issue, correctly set CMAKE_*_COMPILER variables on the top level ESMX/CMakeLists.txt file.

Also update minimum ESMF version required to 8.5.0 to be consistent with the latest ESMX version.

Finally also set ESMX version to 1.0.0 in the project() command.

esmf.mk. Also set required ESMF version to 8.5.0.
@theurich theurich requested a review from danrosen25 July 13, 2023 20:11
@theurich theurich self-assigned this Jul 13, 2023
@danrosen25
Copy link
Member

This looks good. Note that if the developer is integrating the ESMX Driver into their component they'll skip over the application layer and they will be responsible to set CMAKE_Fortran_COMPILER to match their ESMF build. I think this is acceptable. I'm not going to test these changes because I don't have a reproducer but they look good.

Copy link
Member

@danrosen25 danrosen25 left a comment

Choose a reason for hiding this comment

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

Update all cmake_minimum_required in ESMX to require version 3.22 in all CMakeLists.txt files. And update the README file to say that 3.22 is required.

src/addon/ESMX/Comps/ESMX_Data/CMakeLists.txt Outdated Show resolved Hide resolved
@theurich
Copy link
Member Author

Yes, correct, for user level project integration, the user CMakeLists.txt file is responsible. I made that change in the ESMX_ExternalDriverAPIProto and tested locally and on Hera. I will update the protos at the same time when this PR comes in.

I am working on updating the section in the ESMX/README.md right now that talks about project integration. Will push to the same branch in just a second.

@theurich theurich requested a review from danrosen25 July 13, 2023 20:33
@theurich
Copy link
Member Author

@danrosen25 - all my follow-on changes are in. Please take another a look.

@theurich
Copy link
Member Author

@danrosen25 - I just noticed a typo in the README.md change... typing too fast. Small thing so I won't have you review again. Moving forward with the merge. Thanks!

@theurich theurich merged commit 32cb3fe into release/8.5.0 Jul 13, 2023
1 of 2 checks passed
@theurich theurich deleted the fix/esmx-compilers branch July 13, 2023 20:43
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