Merge pull request #6137 from masterleinad/fix_sycl_bit_cast

Fix bit_cast for SYCL again
sandialabs · May 17, 2023 · 8f4fb72 · 8f4fb72
2 parents 3329989 + bf9c242
commit 8f4fb72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.jenkins b/.jenkins
@@ -107,7 +107,7 @@ pipeline {
                                 -DCMAKE_BUILD_TYPE=Release \
                                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                                 -DCMAKE_CXX_COMPILER=/opt/intel/oneapi/compiler/2023.0.0/linux/bin-llvm/clang++ \
-                                -DCMAKE_CXX_FLAGS="-fsycl-device-code-split=per_kernel -Werror -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-cuda-version -Wno-sycl-target" \
+                                -DCMAKE_CXX_FLAGS="-fsycl-device-code-split=per_kernel -Wno-deprecated-declarations -Werror -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-cuda-version -Wno-sycl-target" \
                                 -DKOKKOS_IMPL_SYCL_DEVICE_GLOBAL_SUPPORTED=0 \
                                 -DKokkos_ARCH_NATIVE=ON \
                                 -DKokkos_ARCH_VOLTA70=ON \

diff --git a/core/src/Kokkos_BitManipulation.hpp b/core/src/Kokkos_BitManipulation.hpp
@@ -103,7 +103,7 @@ namespace Kokkos {
 // FIXME_SYCL intel/llvm has unqualified calls to bit_cast which are ambiguous
 // if we declare our own bit_cast function
 #ifdef KOKKOS_ENABLE_SYCL
-using sycl::bit_cast;
+using sycl::detail::bit_cast;
 #else
 template <class To, class From>
 KOKKOS_FUNCTION std::enable_if_t<sizeof(To) == sizeof(From) &&