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

Update to CMake build #278

Merged
merged 1 commit into from
Apr 5, 2024
Merged

Update to CMake build #278

merged 1 commit into from
Apr 5, 2024

Conversation

SeanBryan51
Copy link
Collaborator

@SeanBryan51 SeanBryan51 commented Apr 4, 2024

The CABLE build system was transitioned from Makefile to CMake: see CABLE-LSM/CABLE#216, CABLE-LSM/CABLE#200. This change adds support for building CABLE via CMake in benchcab so that CABLE versions which branch from the HEAD of main can be tested.

Closes #258

@SeanBryan51 SeanBryan51 linked an issue Apr 4, 2024 that may be closed by this pull request
@ccarouge ccarouge added the priority:high High priority issues that should be included in the next release. label Apr 4, 2024
Copy link

codecov bot commented Apr 4, 2024

Codecov Report

Attention: Patch coverage is 38.88889% with 11 lines in your changes are missing coverage. Please review.

Project coverage is 71.22%. Comparing base (59910ed) to head (8d41929).
Report is 1 commits behind head on main.

Files Patch % Lines
src/benchcab/model.py 25.00% 9 Missing ⚠️
src/benchcab/benchcab.py 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #278      +/-   ##
==========================================
- Coverage   72.81%   71.22%   -1.59%     
==========================================
  Files          18       18              
  Lines         982      966      -16     
==========================================
- Hits          715      688      -27     
- Misses        267      278      +11     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SeanBryan51
Copy link
Collaborator Author

I've decided not to add unit tests for Model.build() as the functionality is environment dependent and would involve a lot of unpleasant mocking. The integration test shows that the model builds successfully.

@SeanBryan51 SeanBryan51 force-pushed the 258-update-to-CMake-build branch from aba377e to e77f59f Compare April 4, 2024 04:37
@SeanBryan51 SeanBryan51 marked this pull request as ready for review April 4, 2024 04:38
@SeanBryan51 SeanBryan51 requested review from a team and Whyborn and removed request for a team April 4, 2024 04:40
@ccarouge
Copy link
Member

ccarouge commented Apr 4, 2024

Should we remove support for the old build systems at the same time? It isn't strictly necessary for this PR but wouldn't it make things nicer for us? Bringing the old build systems to CMake might not take that much time now that we have a working example to use in main.

@SeanBryan51
Copy link
Collaborator Author

@ccarouge if you are referring to the custom build via the build_script key, I think I'd prefer to leave that as is for now as I would like to push a release which includes the changes in this PR. Deprecating that functionality would be major change and should require bumping the major version - we can probably save this for when spack comes around?

Copy link

@Whyborn Whyborn left a comment

Choose a reason for hiding this comment

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

Looks fine to me, although I really don't know enough about the benchcab inner workings to give a detailed review.

@SeanBryan51 SeanBryan51 force-pushed the 258-update-to-CMake-build branch from b731a72 to f698427 Compare April 4, 2024 23:49
Copy link
Member

@ccarouge ccarouge left a comment

Choose a reason for hiding this comment

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

I'm wondering if we are breaking the custom build script support but I'm not sure.

@SeanBryan51 SeanBryan51 requested a review from ccarouge April 5, 2024 01:31
Copy link
Member

@ccarouge ccarouge left a comment

Choose a reason for hiding this comment

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

LGTM

The CABLE build system was transitioned from Makefile to CMake: see
CABLE-LSM/CABLE#216,
CABLE-LSM/CABLE#200.

This change adds support for building CABLE via CMake in benchcab so
that CABLE versions which branch from the HEAD of main can be tested.

Closes #258
@SeanBryan51 SeanBryan51 force-pushed the 258-update-to-CMake-build branch from dd04dd4 to 8d41929 Compare April 5, 2024 03:21
@SeanBryan51 SeanBryan51 merged commit 8ca400f into main Apr 5, 2024
2 of 4 checks passed
@SeanBryan51 SeanBryan51 deleted the 258-update-to-CMake-build branch April 5, 2024 04:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority:high High priority issues that should be included in the next release.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update build in benchcab once the updated CABLE build is released
3 participants