Merge branch 'develop' into issue848

kokkos · Jun 1, 2021 · e45f0e4 · e45f0e4
2 parents d821949 + ccfbe63
commit e45f0e4
Show file tree

Hide file tree

Showing 11 changed files with 1,009 additions and 533 deletions.
diff --git a/.jenkins/nightly.groovy b/.jenkins/nightly.groovy
@@ -2,12 +2,12 @@ pipeline {
     agent none
 
     stages {
-        stage('HIP-ROCm-3.10-C++14') {
+        stage('HIP-ROCm-4.2-C++14') {
             agent {
                 dockerfile {
                     filename 'Dockerfile.hip'
                     dir 'scripts/docker'
-                    additionalBuildArgs '--build-arg BASE=rocm/dev-ubuntu-20.04:3.10'
+                    additionalBuildArgs '--build-arg BASE=rocm/dev-ubuntu-20.04:4.2'
                     label 'rocm-docker && vega'
                     args '-v /tmp/ccache.kokkos:/tmp/ccache --device=/dev/kfd --device=/dev/dri --security-opt seccomp=unconfined --group-add video --env HIP_VISIBLE_DEVICES=$HIP_VISIBLE_DEVICES'
                 }
@@ -20,7 +20,6 @@ pipeline {
                         -DCMAKE_CXX_COMPILER=hipcc \
                         -DCMAKE_CXX_EXTENSIONS=OFF \
                         -DKokkos_ENABLE_HIP=ON \
-                        -DKokkos_ARCH_VEGA906=ON \
                         .. && \
                        make -j8 && make install && \
                        cd ../.. && rm -rf kokkos'''
@@ -31,7 +30,6 @@ pipeline {
                         -DCMAKE_CXX_EXTENSIONS=OFF \
                         -DKokkosKernels_ENABLE_TESTS=ON \
                         -DKokkosKernels_ENABLE_EXAMPLES=ON \
-                        -DKokkos_ENABLE_HIP=ON \
                         -DKokkosKernels_INST_DOUBLE=ON \
                         -DKokkosKernels_INST_ORDINAL_INT=ON \
                         -DKokkosKernels_INST_OFFSET_INT=ON \

diff --git a/perf_test/sparse/CMakeLists.txt b/perf_test/sparse/CMakeLists.txt
@@ -78,6 +78,7 @@ KOKKOSKERNELS_ADD_EXECUTABLE(
 KOKKOSKERNELS_ADD_EXECUTABLE(
   sparse_gs
   SOURCES KokkosSparse_gs.cpp
+  TESTONLYLIBS kokkoskernelsperf_gtest
   )
 
 KOKKOSKERNELS_ADD_EXECUTABLE(