test

.clang-format

@@ -0,0 +1,6 @@
+#Official Tool: clang-format version 8.0.0
+BasedOnStyle: google
+SortIncludes: false
+AlignConsecutiveAssignments: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: true

.clang-format-ignore

@@ -0,0 +1,2 @@
+core/unit_test/config/results/*
+tpls/gtest/gtest/*

.codecov.yml

@@ -0,0 +1,11 @@
+coverage:
+  precision: 1
+  round: down
+  range: "70...100"
+ignore:
+  - tpls/
+  - algorithms/unit_tests
+  - core/perf_test/
+  - core/unit_test/
+  - containers/performance_tests
+  - containers/unit_tests

.jenkins

@@ -1,7 +1,6 @@
 pipeline {
-    agent {
-        label 'docker'
-    }
+    agent none
+
     environment {
         CCACHE_DIR = '/tmp/ccache'
         CCACHE_MAXSIZE = '10G'
@@ -20,21 +19,29 @@ pipeline {
                             args '-v /tmp/ccache.kokkos:/tmp/ccache'
                         }
                     }
-                    environment {
-                        OPTIONS = '--with-options=compiler_warnings --arch=Volta70 --compiler=/usr/local/bin/clang++ --with-cuda --with-cuda-options=enable_lambda'
-                    }
                     steps {
-                        sh 'ln -s /usr/bin/ccache /usr/local/bin/clang++'
                         sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build && cd build && ../generate_makefile.bash $OPTIONS && make test -j8'
+                        sh '''rm -rf build && mkdir -p build && cd build && \
+                              cmake \
+                                -DCMAKE_BUILD_TYPE=Release \
+                                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                -DCMAKE_CXX_COMPILER=clang++ \
+                                -DCMAKE_CXX_FLAGS=-Werror \
+                                -DKokkos_ENABLE_COMPILER_WARNINGS=ON \
+                                -DKokkos_ENABLE_TESTS=ON \
+                                -DKokkos_ENABLE_CUDA=ON \
+                                -DKokkos_ENABLE_CUDA_LAMBDA=ON \
+                                -DKokkos_ARCH_VOLTA70=ON \
+                              .. && \
+                              make -j8 && ctest --output-on-failure'''
                     }
                     post {
                         always {
                             sh 'ccache --show-stats'
                         }
                     }
                 }
-                stage("CUDA-9.2-NVCC") {
+                stage('CUDA-9.2-NVCC') {
                     agent {
                         dockerfile {
                             filename 'Dockerfile.nvcc'
@@ -44,21 +51,29 @@ pipeline {
                             args '-v /tmp/ccache.kokkos:/tmp/ccache'
                         }
                     }
-                    environment {
-                        OPTIONS = '--with-options=compiler_warnings --arch=Volta70 --with-cuda --with-cuda-options=enable_lambda'
-                    }
                     steps {
-                        sh 'ln -s /usr/bin/ccache /usr/local/bin/g++'
                         sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build && cd build && ../generate_makefile.bash $OPTIONS && make test -j8'
+                        sh '''rm -rf build && mkdir -p build && cd build && \
+                              cmake \
+                                -DCMAKE_BUILD_TYPE=Release \
+                                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                -DCMAKE_CXX_COMPILER=$WORKSPACE/bin/nvcc_wrapper \
+                                -DCMAKE_CXX_FLAGS=-Werror \
+                                -DKokkos_ENABLE_COMPILER_WARNINGS=ON \
+                                -DKokkos_ENABLE_TESTS=ON \
+                                -DKokkos_ENABLE_CUDA=ON \
+                                -DKokkos_ENABLE_CUDA_LAMBDA=ON \
+                                -DKokkos_ARCH_VOLTA70=ON \
+                              .. && \
+                              make -j8 && ctest --output-on-failure'''
                     }
                     post {
                         always {
                             sh 'ccache --show-stats'
                         }
                     }
                 }
-                stage("CUDA-10.1-NVCC") {
+                stage('CUDA-10.1-NVCC-RDC') {
                     agent {
                         dockerfile {
                             filename 'Dockerfile.nvcc'
@@ -68,44 +83,105 @@ pipeline {
                             args '-v /tmp/ccache.kokkos:/tmp/ccache'
                         }
                     }
-                    environment {
-                        OPTIONS = '--with-options=compiler_warnings --arch=Volta70 --with-cuda --with-cuda-options=enable_lambda,rdc,force_uvm'
-                    }
                     steps {
-                        sh 'ln -s /usr/bin/ccache /usr/local/bin/g++'
                         sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build && cd build && ../generate_makefile.bash $OPTIONS && make test -j8'
+                        sh '''rm -rf build && mkdir -p build && cd build && \
+                              cmake \
+                                -DCMAKE_BUILD_TYPE=Release \
+                                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                -DCMAKE_CXX_COMPILER=$WORKSPACE/bin/nvcc_wrapper \
+                                -DCMAKE_CXX_FLAGS=-Werror \
+                                -DKokkos_ENABLE_COMPILER_WARNINGS=ON \
+                                -DKokkos_ENABLE_TESTS=ON \
+                                -DKokkos_ENABLE_OPENMP=ON \
+                                -DKokkos_ENABLE_CUDA=ON \
+                                -DKokkos_ENABLE_CUDA_LAMBDA=ON \
+                                -DKokkos_ENABLE_CUDA_UVM=ON \
+                                -DKokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE=ON \
+                                -DKokkos_ARCH_VOLTA70=ON \
+                              .. && \
+                              make -j8 && ctest --output-on-failure'''
                     }
                     post {
                         always {
                             sh 'ccache --show-stats'
                         }
                     }
                 }
-                stage("CUDA-10.1-NVCC-DEBUG") {
+                stage('CUDA-10.1-NVCC-DEBUG') {
                     agent {
                         dockerfile {
                             filename 'Dockerfile.nvcc'
                             dir 'scripts/docker'
-                            additionalBuildArgs '--pull --build-arg BASE=nvidia/cuda:10.1-devel'
+                            additionalBuildArgs '--pull --build-arg BASE=nvidia/cuda:10.1-devel --build-arg CMAKE_VERSION=3.15.5'
                             label 'nvidia-docker && volta'
                             args '-v /tmp/ccache.kokkos:/tmp/ccache'
                         }
                     }
-                    environment {
-                        OPTIONS = '--with-options=compiler_warnings --arch=Volta70--with-cuda --with-cuda-options=enable_lambda --debug'
-                    }
                     steps {
-                        sh 'ln -s /usr/bin/ccache /usr/local/bin/g++'
                         sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build && cd build && ../generate_makefile.bash $OPTIONS && make test -j8'
+                        sh '''rm -rf build && mkdir -p build && cd build && \
+                              cmake \
+                                -DCMAKE_BUILD_TYPE=Debug \
+                                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                -DCMAKE_CXX_COMPILER=$WORKSPACE/bin/nvcc_wrapper \
+                                -DCMAKE_CXX_FLAGS=-Werror \
+                                -DKokkos_ENABLE_COMPILER_WARNINGS=ON \
+                                -DKokkos_ENABLE_DEBUG=ON \
+                                -DKokkos_ENABLE_DEBUG_BOUNDS_CHECK=ON \
+                                -DKokkos_ENABLE_TESTS=ON \
+                                -DKokkos_ENABLE_CUDA=ON \
+                                -DKokkos_ENABLE_CUDA_LAMBDA=ON \
+                                -DKokkos_ARCH_VOLTA70=ON \
+                              .. && \
+                              make -j8 && ctest --output-on-failure'''
                     }
                     post {
                         always {
                             sh 'ccache --show-stats'
                         }
                     }
                 }
+                stage('GCC-4.8.4') {
+                    agent {
+                        dockerfile {
+                            filename 'Dockerfile.gcc'
+                            dir 'scripts/docker'
+                            additionalBuildArgs '--pull'
+                            label 'docker'
+                        }
+                    }
+                    environment {
+                        OMP_NUM_THREADS = 8
+                        OMP_PLACES = 'threads'
+                        OMP_PROC_BIND = 'spread'
+                    }
+                    steps {
+                        sh '''rm -rf build && mkdir -p build && cd build && \
+                              cmake \
+                                -DCMAKE_BUILD_TYPE=Release \
+                                -DCMAKE_CXX_FLAGS=-Werror \
+                                -DKokkos_ENABLE_COMPILER_WARNINGS=ON \
+                                -DKokkos_ENABLE_TESTS=ON \
+                                -DKokkos_ENABLE_OPENMP=ON \
+                              .. && \
+                              make -j8 && ctest --output-on-failure'''
+                    }
+                }
+                stage('Clang-Format') {
+                    agent {
+                        dockerfile {
+                            filename 'Dockerfile.clang'
+                            dir 'scripts/docker'
+                            additionalBuildArgs '--pull'
+                            label 'nvidia-docker || docker'
+                            args '-v /tmp/ccache.kokkos:/tmp/ccache'
+                        }
+                    }
+                    steps {
+                        sh './scripts/docker/check_format_cpp.sh'
+                    }
+                }
             }
         }
     }

.travis.yml

@@ -13,19 +13,52 @@ compiler:
 cache:
   - ccache
 
+stages:
+  - canary
+  - test
+
+jobs:
+    include:
+        - stage: canary
+          env: CMAKE_BUILD_TYPE=Release BACKEND="OPENMP" CXXFLAGS="-Werror"
+          os: linux
+
+branches:
+  only:
+  - master
+  - develop
+  - /^release/
+
 env:
-  - THREADING="serial"
-  - THREADING="openmp"
-  - THREADING="pthread"
+  - 
+  - BACKEND="OPENMP"
+#  - BACKEND="PTHREAD"
+  - CMAKE_BUILD_TYPE=Debug COVERAGE=yes GTEST_FILTER="-*DeathTest*"
+  - CMAKE_BUILD_TYPE=Debug BACKEND="OPENMP" COVERAGE=yes GTEST_FILTER="-*DeathTest*"
+#  - CMAKE_BUILD_TYPE=Debug BACKEND="PTHREAD" COVERAGE=yes
+  - CMAKE_BUILD_TYPE=Release
+  - CMAKE_BUILD_TYPE=Release BACKEND="OPENMP"
+#  - CMAKE_BUILD_TYPE=Release BACKEND="PTHREAD"
 
-# Apple GCC does not support OpenMP.  GCC with OpenMP requires Homebrew.
-# Apple Clang does not support OpenMP.  Clang with OpenMP requires Homebrew.
 matrix:
   exclude:
+# Apple GCC is just an alias to AppleClang
     - os: osx
-      env: THREADING="openmp"
+      compiler: gcc
+# Apple Clang doesn't support OpenMP
     - os: osx
+      compiler: clang
+      env: BACKEND="OPENMP"
+    - os: osx
+      compiler: clang
+      env: CMAKE_BUILD_TYPE=Debug BACKEND="OPENMP" COVERAGE=yes GTEST_FILTER="-*DeathTest*"
+    - os: osx
+      compiler: clang
+      env: CMAKE_BUILD_TYPE=Release BACKEND="OPENMP"
+# We do this as canary
+    - os: linux
       compiler: gcc
+      env: CMAKE_BUILD_TYPE=Release BACKEND="OPENMP"
 
 before_script:
   - if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
@@ -35,24 +68,39 @@ before_script:
       export PATH=/usr/local/opt/ccache/libexec:$PATH;
     fi
   - ccache -z
+  - if [[ ${COVERAGE} ]]; then export CXX="${CXX} --coverage"; fi
+  - if [[ ! ${CMAKE_BUILD_TYPE} ]]; then export CXXFLAGS="${CXXFLAGS} -O2"; fi
 
 script:
   - export OMP_NUM_THREADS=2
   - export OMP_PLACES=threads
   - export OMP_PROC_BIND=spread
-  # LD_LIBRARY_PATH workaround to find clang's libomp: https://github.com/travis-ci/travis-ci/issues/8613 
+  # LD_LIBRARY_PATH workaround to find clang's libomp: https://github.com/travis-ci/travis-ci/issues/8613
   - if [[ ${CC} = clang ]]; then export LD_LIBRARY_PATH=/usr/local/clang/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH; fi
   # enable ccache for clang on linux and add CCACHE_CPP2 to avoid 'Argument unused during compilation -I...' warning
   - if [[ ${TRAVIS_OS_NAME} = linux && ${CC} = clang ]]; then
       ln -s /usr/bin/ccache $HOME/bin/clang++;
       export CCACHE_CPP2=yes;
-      GENERATE_OPTS="--gcc-toolchain=/usr";
     fi
-  - mkdir build
-  - cd build
-  - ../generate_makefile.bash --compiler=$CXX --with-$THREADING --with-options=compiler_warnings --cxxflags="-O3 -Werror" ${GENERATE_OPTS}
-  - make
-  - make test
+  - mkdir build &&
+    pushd build &&
+    cmake ..
+          ${BACKEND:+-DKokkos_ENABLE_${BACKEND}=On}
+          -DKokkos_ENABLE_TESTS=On
+          ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}} &&
+    make VERBOSE=1 -j2 &&
+    travis_wait 60 make test CTEST_OUTPUT_ON_FAILURE=1 &&
+    make install DESTDIR=${PWD}/install && rm -rf ${PWD}/install/usr/local && rmdir ${PWD}/install/usr &&
+    popd
 
 after_success:
   - ccache -s
+  - if [[ ${COVERAGE} ]]; then
+      mkdir -p $HOME/.local/bin && wget -O $HOME/.local/bin/codecov https://codecov.io/bash && chmod +x $HOME/.local/bin/codecov;
+      pushd build &&
+      if [[ ${CC} = clang* ]]; then
+        codecov -x "llvm-cov gcov" -F "${CC}";
+      else
+        codecov -x gcov -F "${CC}";
+      fi;
+    fi