From b1a0b11717f11ee5929873882cb7edf7b61bb384 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sat, 30 May 2020 14:19:14 -0500
Subject: [PATCH 1/2] Add CI test for pocl-cuda

---
 .gitlab-ci.yml          | 28 +++++++++++++---------------
 .test-conda-env-py3.yml |  1 +
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb7d72b..8cd6a93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,21 +31,19 @@ Python 3 Titan V:
         reports:
             junit: test/pytest.xml
 
-#Python 3 Titan X:
-#    script:
-#    - export PY_EXE=python3
-#    - export PYOPENCL_TEST=nvi:titan
-#    - EXTRA_INSTALL="pybind11 numpy mako"
-#    - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-#    - ". ./build-and-test-py-project.sh"
-#    tags:
-#    - python3
-#    - nvidia-titan-x
-#    except:
-#    - tags
-#    artifacts:
-#        reports:
-#            junit: test/pytest.xml
+Python 3 POCL Titan X:
+    script:
+    - export PYOPENCL_TEST=portable:titan
+    - CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+    - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+    - ". ./build-and-test-py-project-within-miniconda.sh"
+    tags:
+    - nvidia-titan-x
+    except:
+    - tags
+    artifacts:
+        reports:
+            junit: test/pytest.xml
 
 Python 3 K40:
     script:
diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml
index 19c340f..4f85d4e 100644
--- a/.test-conda-env-py3.yml
+++ b/.test-conda-env-py3.yml
@@ -8,6 +8,7 @@ dependencies:
 - git
 - numpy
 - pocl
+- pocl-cuda
 - mako
 - pyopencl
 - islpy
-- 
GitLab


From 07e159bf7470d6446bf4cae16c45a08e0949edc4 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sat, 30 May 2020 20:05:50 -0500
Subject: [PATCH 2/2] Use POCL for all NVIDIA GPU tests

---
 .gitlab-ci.yml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8cd6a93..ccc026f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,17 +14,14 @@ Python 2.7 POCL:
         reports:
             junit: test/pytest.xml
 
-Python 3 Titan V:
+Python 3 POCL Titan V:
     script:
-    - export PY_EXE=python3
-    - export PYOPENCL_TEST=nvi:titan
-    - EXTRA_INSTALL="pybind11 numpy mako matplotlib"
-    - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-    - ". ./build-and-test-py-project.sh"
+    - export PYOPENCL_TEST=portable:titan
+    - CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+    - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+    - ". ./build-and-test-py-project-within-miniconda.sh"
     tags:
-    - python3
     - nvidia-titan-v
-    allow_failure: true
     except:
     - tags
     artifacts:
@@ -45,16 +42,13 @@ Python 3 POCL Titan X:
         reports:
             junit: test/pytest.xml
 
-Python 3 K40:
+Python 3 POCL K40:
     script:
-    - export PY_EXE=python3
-    - export PYOPENCL_TEST=nvi:k40
-    - export EXTRA_INSTALL="pybind11 numpy mako"
-    - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-    - ". ./build-and-test-py-project.sh"
-    allow_failure: true
+    - export PYOPENCL_TEST=portable:k40
+    - CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+    - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+    - ". ./build-and-test-py-project-within-miniconda.sh"
     tags:
-    - python3
     - nvidia-k40
     except:
     - tags
-- 
GitLab