Workaround CUDA-Clang initialization issue

masterleinad · Apr 9, 2024 · f9a2b9f · f9a2b9f
1 parent e78b15d
commit f9a2b9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/.jenkins/continuous.groovy b/.jenkins/continuous.groovy
@@ -431,12 +431,8 @@ pipeline {
                                     -D ARBORX_ENABLE_ONEDPL=ON \
                                 ..
                             '''
-                            sh '''
-                                make -j8 VERBOSE=1
-                            '''
-                            sh '''
-                                ctest $CTEST_OPTIONS
-                            '''
+                            sh 'make -j8 VERBOSE=1'
+                            sh 'ctest $CTEST_OPTIONS'
                         }
                     }
                     post {
@@ -458,12 +454,8 @@ pipeline {
                                         -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
                                     examples \
                                 '''
-                                sh '''
-                                    make VERBOSE=1
-                                '''
-                                sh '''
-                                    make test
-                                '''
+                                sh 'make VERBOSE=1'
+                                sh 'make test'
                             }
                         }
                     }

diff --git a/docker/Dockerfile.sycl b/docker/Dockerfile.sycl
@@ -120,7 +120,7 @@ RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
 
 # Install Kokkos
 ARG KOKKOS_VERSION=4.3.00
-ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SYCL=ON -DCMAKE_CXX_FLAGS=-Wno-unknown-cuda-version -DKokkos_ENABLE_UNSUPPORTED_ARCHS=ON -DKokkos_ENABLE_DEPRECATED_CODE_3=OFF -DKokkos_ARCH_VOLTA70=ON -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_FLAGS=-w"
+ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SYCL=ON -DCMAKE_CXX_FLAGS=-Wno-unknown-cuda-version -DKokkos_ENABLE_UNSUPPORTED_ARCHS=ON -DKokkos_ENABLE_DEPRECATED_CODE_3=OFF -DKokkos_ARCH_VOLTA70=ON -DKOKKOS_IMPL_SYCL_DEVICE_GLOBAL_SUPPORTED=0 -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_FLAGS=-w"
 ENV KOKKOS_DIR=/opt/kokkos
 RUN . /opt/intel/oneapi/setvars.sh --include-intel-llvm && \
     KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \