Sacado: Band-aid fix for LayoutContiguous #13392
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
masterleinad
force-pushed
the
fix_sacado_layout_contiguous
branch
from
41c7de0
to
db5b706
Compare
etphipp
previously approved these changes
Aug 26, 2024
ndellingwood
added
the
AT: PRE-TEST INSPECTED
|
@masterleinad I'm going to repoint your PR against develop |
ndellingwood
approved these changes
Aug 26, 2024
Ah, I got used to |
trilinos-autotester
removed
the
AT: PRE-TEST INSPECTED
|
Status Flag 'Pre-Test Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED by label AT: PRE-TEST INSPECTED! Autotester is Removing Label; this inspection will remain valid until a new commit to source branch is performed. |
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: PR_gcc-openmpi-openmp
Jenkins Parameters
Build InformationTest Name: PR_gcc
Jenkins Parameters
Build InformationTest Name: PR_gcc-openmpi_debug
Jenkins Parameters
Build InformationTest Name: PR_clang
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_python3
Jenkins Parameters
Build InformationTest Name: PR_cuda
Jenkins Parameters
Build InformationTest Name: PR_intel
Jenkins Parameters
Build InformationTest Name: PR_cuda-uvm
Jenkins Parameters
Using Repos:
Pull Request Author: masterleinad |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: PR_gcc-openmpi-openmp
Jenkins Parameters
Build InformationTest Name: PR_gcc
Jenkins Parameters
Build InformationTest Name: PR_gcc-openmpi_debug
Jenkins Parameters
Build InformationTest Name: PR_clang
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_python3
Jenkins Parameters
Build InformationTest Name: PR_cuda
Jenkins Parameters
Build InformationTest Name: PR_intel
Jenkins Parameters
Build InformationTest Name: PR_cuda-uvm
Jenkins Parameters
|
|
Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ ndellingwood ]! |
|
Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR... |
ndellingwood
added a commit
to ndellingwood/Trilinos
that referenced
this pull request
Aug 29, 2024
For intel icpc compilers use inline constexpr rather than static constexpr for is_same_v specialization introduced in trilinos#13392 This is to workaround intel ICE issues that should not be related to the change but occur when building Trilinos with or without Kokkos' develop branch Error output sample: ``` /home/ndellin/trilinos/Trilinos/packages/sacado/test/UnitTests/ConditionalReturnTypeTest.cpp(48): internal error: assertion failed at: "il.c", line 10434 in trans_unit_for_source_corresp ```
ndellingwood
added a commit
that referenced
this pull request
Aug 29, 2024
For intel icpc compilers use inline constexpr rather than static constexpr for is_same_v specialization introduced in #13392 This is to workaround intel ICE issues that should not be related to the change but occur when building Trilinos with or without Kokkos' develop branch Error output sample: ``` /home/ndellin/trilinos/Trilinos/packages/sacado/test/UnitTests/ConditionalReturnTypeTest.cpp(48): internal error: assertion failed at: "il.c", line 10434 in trans_unit_for_source_corresp ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@trilinos/sacado
Fixes kokkos/kokkos#7258.
SacadodefinesContiguousLayoutin theKokkosnamespace, seetrilinos/Trilinos@2ad2602/packages/sacado/src/Kokkos_LayoutContiguous.hpp#L30-L74
and specializes
std::is_samefor this class, see trilinos/Trilinos@2ad2602/packages/sacado/src/Kokkos_LayoutContiguous.hpp#L76-L87.Both of these aren't legal usage of
Kokkosor thestdnamespace.Thus, changing all
std::is_same<>::valuetostd::is_same_vled to a bunch of problems sinceContigousLayout<Layout>currently behaves as-if it it identicalLayoutin certain cases. It seems that this was done to be able to use some functionalities inKokkos(likeKokkos::resize) that are restricted toKokkospolicies (Kokkos::LayoutLeft/Kokkos::LayoutRight). Simply relaxing the respectiveSFINAEchecks doesn't work since underlying classes are specialized onKokkos::LayoutLeft/Kokkos::LayoutRight.This pull request adds a band-aid fit that continues to use this evil workaround but suggests to find a proper solution urgently.