-
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
Use different EBO workaround for MSVC (rebased) #3924
Use different EBO workaround for MSVC (rebased) #3924
Conversation
Seems to work on |
Serial xl/16.1.1 build compiled for me without errors. Unrelated to changes in this PR, this warning was output which will error with
|
Can you try adding diff --git a/core/unit_test/CMakeLists.txt b/core/unit_test/CMakeLists.txt
index b16764f97..5e6e56917 100644
--- a/core/unit_test/CMakeLists.txt
+++ b/core/unit_test/CMakeLists.txt
@@ -704,6 +704,7 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate
kokkosprinter-tool SHARED
SOURCES tools/printing-tool.cpp
)
+ TARGET_COMPILE_FEATURES(kokkosprinter-tool PUBLIC cxx_std_14)
KOKKOS_ADD_TEST_EXECUTABLE(
ProfilingAllCalls ? |
@masterleinad your suggested change resolved the warning, thanks. When I added
resolved by moving the diff --git a/core/unit_test/TestComplex.hpp b/core/unit_test/TestComplex.hpp
index 8ec2dc7..1218170 100644
--- a/core/unit_test/TestComplex.hpp
+++ b/core/unit_test/TestComplex.hpp
@@ -414,13 +414,13 @@ TEST(TEST_CATEGORY, complex_special_funtions) {
TEST(TEST_CATEGORY, complex_io) { testComplexIO(); }
TEST(TEST_CATEGORY, complex_trivially_copyable) {
- using RealType = double;
// Kokkos::complex<RealType> is trivially copyable when RealType is
// trivially copyable
// Simply disable the check for IBM's XL compiler since we can't reliably
// check for a version that defines relevant functions.
#if !defined(__ibmxl__)
+ using RealType = double;
// clang claims compatibility with gcc 4.2.1 but all versions tested know
// about std::is_trivially_copyable.
ASSERT_TRUE(std::is_trivially_copyable<Kokkos::complex<RealType>>::value || |
@ndellingwood You should create a pull request since you already have the necessary changes. 🙂 |
Changes made on top of PR kokkos#3924
I put in #3927 with the warning fixes |
Retest this please. |
1 similar comment
Retest this please. |
5fbdb97
to
ea2a5f8
Compare
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. This actually seems to solve #3936 but I need to test on more compilers to be sure before closing that issue. Also the code is much more readable now without having to do the linearize bases workaround.
#3932 rebased on top of #3832.
Fixes #3907.