-
Notifications
You must be signed in to change notification settings - Fork 407
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
Enable optional external desul build #5021
Conversation
Relies on this in order for external build to work: desul/desul#63 |
If you are already moving the bundled |
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.
I agree with @masterleinad in that we should treat it as a TPL if it can be external. Minor question: would it make sense to include it as a subproject (i.e. add_subdirectory'd)?
@nmm0 @masterleinad does this look better? |
Yes, but CI is still missing. 🙂 |
I am not introducing CI here yet for external desul. We first need to guarantee that we have a stable branch to test against on the desul side, which means we need to introduce CI on the desul side, for which we need the ability to build Kokkos against an external desul ... |
KOKKOS_INCLUDE_DIRECTORIES( | ||
${CMAKE_CURRENT_BINARY_DIR} | ||
${CMAKE_CURRENT_SOURCE_DIR} | ||
${KOKKOS_TOP_BUILD_DIR} | ||
) | ||
IF (KOKKOS_ENABLE_IMPL_DESUL_ATOMICS AND NOT desul_atomics_FOUND) | ||
KOKKOS_INCLUDE_DIRECTORIES( | ||
${CMAKE_CURRENT_SOURCE_DIR}/../../tpls/desul/include |
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.
We both use relative path from CMAKE_CURRENT_SOURCE_DIR
and absolute from CMAKE_SOURCE_DIR
below. Is there a reason you can't use CMAKE_SOURCE_DIR
here?
Also did you check whether CMAKE_SOURCE_DIR
works with Trilinos?
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.
CMAKE_SOURCE_DIR didn't even work for in-tree builds, one of the reasons CI was failing.
core/src/CMakeLists.txt
Outdated
) | ||
MESSAGE(STATUS "Using internal DESUL atomics copy") | ||
ELSE() | ||
MESSAGE(STATUS "Using external DESUL atomics copy") |
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.
Print the path to the package that was found.
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.
how?
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.
I suspect you can use desul_atomics_DIR
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.
Looks good to me
No description provided.