From d88bbad580db19f9b5d28f25e8bda4e52ec6d9c2 Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Wed, 9 Dec 2020 11:39:57 -0800
Subject: [PATCH 1/2] FIX Call nvidia-smi before test

---
 ci/test/cudf.sh        | 1 +
 ci/test/cugraph.sh     | 1 +
 ci/test/cuml.sh        | 1 +
 ci/test/cuspatial.sh   | 1 +
 ci/test/daskcuda.sh    | 1 +
 ci/test/integration.sh | 1 +
 ci/test/notebooks.sh   | 3 +++
 ci/test/rmm.sh         | 1 +
 8 files changed, 10 insertions(+)

diff --git a/ci/test/cudf.sh b/ci/test/cudf.sh
index ff3e9dd2..466f98c4 100644
--- a/ci/test/cudf.sh
+++ b/ci/test/cudf.sh
@@ -9,6 +9,7 @@ export PATH="/opt/conda/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local
 # FIXME: "source activate" line should not be needed
 source /opt/conda/bin/activate rapids
 env
+nvidia-smi
 conda list
 
 TESTRESULTS_DIR=${WORKSPACE}/testresults
diff --git a/ci/test/cugraph.sh b/ci/test/cugraph.sh
index b2a3f685..7cfdb888 100644
--- a/ci/test/cugraph.sh
+++ b/ci/test/cugraph.sh
@@ -15,6 +15,7 @@ export RAPIDS_DATASET_ROOT_DIR=/rapids/cugraph/datasets
 
 # Show environment
 env
+nvidia-smi
 conda list
 
 TESTRESULTS_DIR=${WORKSPACE}/testresults
diff --git a/ci/test/cuml.sh b/ci/test/cuml.sh
index 8db5cf52..047dd662 100644
--- a/ci/test/cuml.sh
+++ b/ci/test/cuml.sh
@@ -8,6 +8,7 @@ export PATH="/opt/conda/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local
 # FIXME: "source activate" line should not be needed
 source /opt/conda/bin/activate rapids
 env
+nvidia-smi
 conda list
 
 TESTRESULTS_DIR=${WORKSPACE}/testresults
diff --git a/ci/test/cuspatial.sh b/ci/test/cuspatial.sh
index 4b678a0a..d1f0ed43 100644
--- a/ci/test/cuspatial.sh
+++ b/ci/test/cuspatial.sh
@@ -8,6 +8,7 @@ export PATH="/opt/conda/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local
 # FIXME: "source activate" line should not be needed
 source /opt/conda/bin/activate rapids
 env
+nvidia-smi
 conda list
 
 TESTRESULTS_DIR=${WORKSPACE}/testresults
diff --git a/ci/test/daskcuda.sh b/ci/test/daskcuda.sh
index 29821854..853f3bb3 100644
--- a/ci/test/daskcuda.sh
+++ b/ci/test/daskcuda.sh
@@ -9,6 +9,7 @@ export PATH="/opt/conda/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local
 source /opt/conda/bin/activate rapids
 
 env
+nvidia-smi
 conda list
 
 TESTRESULTS_DIR=${WORKSPACE}/testresults
diff --git a/ci/test/integration.sh b/ci/test/integration.sh
index 7718e77d..f8aa9e52 100644
--- a/ci/test/integration.sh
+++ b/ci/test/integration.sh
@@ -9,6 +9,7 @@ conda activate rapids
 
 gpuci_logger "Show env and current conda list"
 env
+nvidia-smi
 conda list
 
 export TESTRESULTS_DIR=${WORKSPACE}/testresults
diff --git a/ci/test/notebooks.sh b/ci/test/notebooks.sh
index de7b5ce9..ceb987de 100644
--- a/ci/test/notebooks.sh
+++ b/ci/test/notebooks.sh
@@ -21,6 +21,9 @@ esac
 
 
 env
+nvidia-smi
+conda list
+
 /test.sh 2>&1 | tee nbtest.log
 EXITCODE=$?
 python /rapids/utils/nbtestlog2junitxml.py nbtest.log
diff --git a/ci/test/rmm.sh b/ci/test/rmm.sh
index 93c5b76f..865c2470 100644
--- a/ci/test/rmm.sh
+++ b/ci/test/rmm.sh
@@ -6,6 +6,7 @@ export PATH="/opt/conda/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local
 # FIXME: "source activate" line should not be needed
 source /opt/conda/bin/activate rapids
 env
+nvidia-smi
 conda list
 
 TESTRESULTS_DIR=${WORKSPACE}/testresults

From 97c266077b6e12e5ef99c04e5b8a12b64974e306 Mon Sep 17 00:00:00 2001
From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com>
Date: Wed, 9 Dec 2020 17:09:52 -0500
Subject: [PATCH 2/2] FIX Add rapids-pytest-benchmark pkg for cugraph tests

This fixes failing nightly tests for cugraph due to:
```
 + py.test --junitxml=/var/lib/jenkins/workspace/rapidsai/nightly-tests/docker-test-cugraph/CUDA_VER/11.0/DOCKER_REPO/rapidsai/rapidsai-dev-nightly/LINUX_VER/ubuntu16.04/PYTHON_VER/3.7/RAPIDS_VER/0.17/testresults/pytest.xml -v /rapids/cugraph/python
 ERROR: usage: py.test [options] [file_or_dir] [file_or_dir] [...]

 py.test: error: unrecognized arguments: --benchmark-gpu-disable
   inifile: /rapids/cugraph/python/pytest.ini
   rootdir: /rapids/cugraph/python
```
---
 conda/recipes/rapids-build-env/meta.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml
index 95f6e696..4437fc81 100644
--- a/conda/recipes/rapids-build-env/meta.yaml
+++ b/conda/recipes/rapids-build-env/meta.yaml
@@ -120,6 +120,7 @@ requirements:
     - python-confluent-kafka {{ python_confluent_kafka_version }}
     - python-louvain
     - rapidjson {{ rapidjson_version }}
+    - rapids-pytest-benchmark
     - ripgrep
     - s3fs
     - setuptools