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

cmake: minor updates #13980

Merged
merged 3 commits into from
Jan 5, 2025
Merged

Conversation

JakeOShannessy
Copy link
Contributor

This PR makes a few changes:

  • The upstream hypre patch has been accepted. Now we point to a new revision of hypre that includes the patch to HYPRE_FMANGLE. This also forces the use of HYPRE_FMANGLE on windows.
  • Replace ubuntu-latest with ubuntu-24.04 to pre-empt this future change.
  • Add a CMakePresets.json file which include some example build workflows
    that might be useful.

I haven't added all of the build types in Build/ as most of these can be easily created by setting options (e.g. ENABLE_OPENMP=ON) but they might serve as useful examples. The can be listed in the following way:

cmake --workflow --list-presets

which shows:

Available workflow presets:

  "impi_intel_rel"
  "impi_intel_db"
  "impi_intel_dv"
  "impi_intel_win_rel"
  "impi_intel_win_db"
  "impi_intel_win_dv"
  "ompi_gnu_rel"
  "ompi_gnu_db"
  "ompi_gnu_dv"

and executed using:

cmake --workflow --preset impi_intel_win_db

JakeOShannessy and others added 3 commits January 5, 2025 20:57
Replace ubuntu-latest with ubuntu-24.04 to pre-empt this future change.
Update CMakeLists.txt to point to a new revision of hypre that includes
the patch to HYPRE_FMANGLE. This also forces the use of HYPRE_FMANGLE on
windows.
Add a CMakePresets.json file which include some example build workflows
that might be useful.
@rmcdermo rmcdermo merged commit 60d2149 into firemodels:master Jan 5, 2025
33 checks passed
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