From aa64dac60f481f49d0ea348b844262e5c4e0d74f Mon Sep 17 00:00:00 2001
From: Allison Vacanti <alliepiper16@gmail.com>
Date: Mon, 17 Jan 2022 21:54:07 -0500
Subject: [PATCH] More updates to CI config.

---
 .gitignore           |  1 +
 ci/axis/cpu.yml      | 38 ++++++++++++++++++++++++++++++++++++++
 ci/axis/gpu.yml      | 13 ++-----------
 ci/common/build.bash |  2 +-
 ci/cpu/build.bash    | 14 ++++++++++++++
 ci/gpu/build.bash    |  2 +-
 ci/local/build.bash  |  2 +-
 7 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 ci/axis/cpu.yml
 create mode 100755 ci/cpu/build.bash

diff --git a/.gitignore b/.gitignore
index 96a6b3a..57309ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 build*/
 .idea
 cmake-build-*
+*~
diff --git a/ci/axis/cpu.yml b/ci/axis/cpu.yml
new file mode 100644
index 0000000..7230b66
--- /dev/null
+++ b/ci/axis/cpu.yml
@@ -0,0 +1,38 @@
+# Copyright (c) 2018-2020 NVIDIA Corporation
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+# Released under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+
+SDK_TYPE:
+  - cuda
+
+SDK_VER:
+  - 11.5.1-devel
+
+OS_TYPE:
+  - ubuntu
+
+OS_VER:
+  - 20.04
+
+CXX_TYPE:
+  - clang
+  - gcc
+
+CXX_VER:
+  - 5
+  - 6
+  - 7
+  - 8
+  - 9
+  - 10
+  - 11
+  - 12
+
+exclude:
+  - CXX_TYPE: clang
+    CXX_VER: 5
+  - CXX_TYPE: clang
+    CXX_VER: 6
+  - CXX_TYPE: gcc
+    CXX_VER: 12
diff --git a/ci/axis/gpu.yml b/ci/axis/gpu.yml
index 73f2ceb..1531079 100644
--- a/ci/axis/gpu.yml
+++ b/ci/axis/gpu.yml
@@ -20,20 +20,11 @@ CXX_TYPE:
   - gcc
 
 CXX_VER:
-  - 5
-  - 6
-  - 7
-  - 8
-  - 9
-  - 10
   - 11
   - 12
 
 exclude:
   - CXX_TYPE: clang
-    CXX_VER:
-      - 5
-      - 6
+    CXX_VER: 11
   - CXX_TYPE: gcc
-    CXX_VER:
-      - 12
+    CXX_VER: 12
diff --git a/ci/common/build.bash b/ci/common/build.bash
index f568d49..ab713b3 100755
--- a/ci/common/build.bash
+++ b/ci/common/build.bash
@@ -6,7 +6,7 @@
 # See https://llvm.org/LICENSE.txt for license information.
 
 ################################################################################
-# Thrust and CUB build script for gpuCI
+# NVBench build script for gpuCI
 ################################################################################
 
 set -e
diff --git a/ci/cpu/build.bash b/ci/cpu/build.bash
new file mode 100755
index 0000000..edf1ba3
--- /dev/null
+++ b/ci/cpu/build.bash
@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+# Copyright (c) 2018-2020 NVIDIA Corporation
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+# Released under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+
+################################################################################
+# NVBench build script for gpuCI (CPU-only)
+################################################################################
+
+export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
+
+source ${WORKSPACE}/ci/common/build.bash
diff --git a/ci/gpu/build.bash b/ci/gpu/build.bash
index f6cdf02..9f6fc01 100755
--- a/ci/gpu/build.bash
+++ b/ci/gpu/build.bash
@@ -6,7 +6,7 @@
 # See https://llvm.org/LICENSE.txt for license information.
 
 ################################################################################
-# Thrust and CUB build script for gpuCI (heterogeneous)
+# NVBench build script for gpuCI (heterogeneous)
 ################################################################################
 
 export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
diff --git a/ci/local/build.bash b/ci/local/build.bash
index 83e1a2a..60d22de 100755
--- a/ci/local/build.bash
+++ b/ci/local/build.bash
@@ -6,7 +6,7 @@
 # See https://llvm.org/LICENSE.txt for license information.
 
 ################################################################################
-# Thrust and CUB local containerized build script
+# NVBench local containerized build script
 ################################################################################
 
 function usage {