-
Notifications
You must be signed in to change notification settings - Fork 383
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 Albany/Trilinos and fix preinstalled kokkos logic #6514
Update Albany/Trilinos and fix preinstalled kokkos logic #6514
Conversation
If Trilinos is being used, we should use the kokkos that comes with it. This removes the need to explicitly set Kokkos_ROOT in config_machines.xml to the Trilinos one.
…t yet If it contained a line like find_dependency(Trilinos REQUIRED) then things would work correctly. Until then, find Trilinos first.
- also update trilinos/albany installs on pmcpu/chrysalis
chrysalis gcc installs are currently using gcc 9.2. Should I update those to gcc/11.2.0? also, baselines might change with this PR since it's a new install. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @jewatkins !
@jonbob anything we need to do to get this pushed? Steve tested the SMS BG case on pmcpu and it worked. |
I'll test it as I merge -- but I'll make it a priority for today |
Update Albany/Trilinos and fix preinstalled kokkos logic This updates preinstalled Albany/Trilinos on pmcpu/chrysalis to versions that are compatible with e3sm/kokkos. e3sm/kokkos is first preinstalled and is then used as a tpl to build trilinos. This also fixes preinstalled kokkos logic so that the preinstalled e3sm/kokkos is only used when USE_ALBANY or USE_TRILINOS is enabled (I think this only happens when MALI is built). [non-BFB] only for tests with active MALI
Successfully ran all tests in e3sm_landice_developer using no compiler on chrysalis, including:
which previously had been failing. The tests did show expected DIFFs, but only with active MALI Also passed as a test of not impacting other E3SM cases: merged to next |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jewatkins are those installations of trilinos/albany serial? Or do they enable openmp and serial? There is a possible issue down the road, related to whether compile_threaded
is ON or OFF and whether EAM uses Kokkos. But we can cross that bridge when we get there.
they are serial-only. we'll have to do some additional work on the albany side to support |
I think this is something for the devops team. Namely, we need to decide whether |
merged to master and expected DIFFs blessed |
This is a big milestone for MALI in E3SM we have been after for a couple of years. |
This updates preinstalled Albany/Trilinos on pmcpu/chrysalis to versions that are compatible with e3sm/kokkos (https://github.com/E3SM-Project/kokkos/tree/e3sm-kokkos-4.2.00). e3sm/kokkos is first preinstalled and is then used as a tpl to build trilinos.
This also fixes preinstalled kokkos logic so that the preinstalled e3sm/kokkos is only used when
USE_ALBANY
orUSE_TRILINOS
is enabled (I think this only happens when MALI is built). This is based on #6473 and https://github.com/E3SM-Project/E3SM/tree/bartgol/find-kokkos-after-albany so we can close those once this is pushed.SMS.ne30pg2_r05_IcoswISC30E3r5_gis20.BGWCYCL1850.chrysalis_gnu.allactive-gis20km
works with this PR.[non-BFB] only for tests with active MALI