Merge topic 'backport-missed-mrs-v1.6.0' into release

50a755b09 Merge topic 'add-cdash-release-track' into backport-missed-mrs-v1.6.0
af9e546fa Merge topic 'fix-599-ci-add-benchmark-job' into backport-missed-mrs-v1.6.0
7aa0a5402 CI: Add release track in cdash
f4386cfb8 CI: adds ubuntu1804 build with benchmarks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2500

.gitlab-ci.yml

@@ -131,6 +131,7 @@ stages:
     - export PATH=$PWD/.gitlab:$PATH
     - SCCACHE_IDLE_TIMEOUT=0 sccache --start-server
     - sccache --show-stats
+    - .gitlab/ci/config/google_benchmarks.sh
     - "cmake --version"
     - "cmake -V -P .gitlab/ci/config/fetch_vtkm_tags.cmake"
     - "cmake -V -P .gitlab/ci/config/gitlab_ci_setup.cmake"

.gitlab/ci/config/gitlab_ci_setup.cmake

@@ -52,10 +52,16 @@ if (NOT CTEST_CMAKE_GENERATOR)
 endif ()
 
 # Determine the track to submit to.
-set(CTEST_TRACK "Experimental")
-if ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "master")
+set(CTEST_TRACK "merge-requests")
+if("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "master")
+  set(CTEST_TRACK "master")
+elseif("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "release")
+  set(CTEST_TRACK "release")
+endif()
+
+if("$ENV{VTKM_CI_NIGHTLY}" STREQUAL "TRUE")
   set(CTEST_TRACK "Nightly")
-endif ()
+endif()
 
 if (CTEST_CMAKE_GENERATOR STREQUAL "Unix Makefiles")
   include(ProcessorCount)

.gitlab/ci/config/google_benchmarks.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -xe
+
+readonly version="v1.5.2"
+readonly tarball="$version.tar.gz"
+readonly url="https://github.com/google/benchmark/archive/$tarball"
+readonly sha256sum="dccbdab796baa1043f04982147e67bb6e118fe610da2c65f88912d73987e700c"
+readonly install_dir="$HOME/gbench"
+
+if ! [[ "$VTKM_SETTINGS" =~ "benchmarks" ]]; then
+  exit 0
+fi
+
+cd "$HOME"
+
+echo "$sha256sum  $tarball" > gbenchs.sha256sum
+curl --insecure -OL "$url"
+sha256sum --check gbenchs.sha256sum
+tar xf "$tarball"
+
+mkdir build
+mkdir "$install_dir"
+
+cmake -GNinja -S benchmark* -B build -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON
+cmake --build build
+cmake --install build --prefix "$install_dir"

.gitlab/ci/config/initial_config.cmake

@@ -64,6 +64,7 @@ foreach(option IN LISTS options)
 
   elseif(benchmarks STREQUAL option)
     set(VTKm_ENABLE_BENCHMARKS "ON" CACHE STRING "")
+    set(ENV{CMAKE_PREFIX_PATH} "$ENV{HOME}/gbench")
 
   elseif(mpi STREQUAL option)
     set(VTKm_ENABLE_MPI "ON" CACHE STRING "")

.gitlab/ci/ubuntu1804.yml

@@ -16,7 +16,7 @@ build:ubuntu1804_gcc9:
     CC: "gcc-9"
     CXX: "g++-9"
     CMAKE_BUILD_TYPE: Debug
-    VTKM_SETTINGS: "tbb+openmp+mpi+shared+hdf5"
+    VTKM_SETTINGS: "benchmarks+tbb+openmp+mpi+shared+hdf5"
 
 test:ubuntu1804_gcc9:
   tags:
@@ -56,7 +56,7 @@ build:ubuntu1804_gcc7:
     CC: "gcc-7"
     CXX: "g++-7"
     CUDAHOSTCXX: "g++-7"
-    VTKM_SETTINGS: "cuda+turing+mpi+64bit_floats+no_virtual"
+    VTKM_SETTINGS: "benchmarks+cuda+turing+mpi+64bit_floats+no_virtual"
 
 test:ubuntu1804_gcc7:
   tags:
@@ -202,7 +202,7 @@ build:ubuntu1804_kokkos:
   variables:
     CMAKE_GENERATOR: "Ninja"
     CMAKE_BUILD_TYPE: Release
-    VTKM_SETTINGS: "kokkos+turing+static+64bit_floats"
+    VTKM_SETTINGS: "benchmarks+kokkos+turing+static+64bit_floats"
 
 test:ubuntu1804_kokkos:
   tags: