From f37da6c660a1a3131a27bb73e9921eb14d3ce046 Mon Sep 17 00:00:00 2001
From: "[6~" <inform@tiker.net>
Date: Wed, 11 Mar 2020 16:48:46 -0500
Subject: [PATCH 1/5] Remove docs for enqueue_task

---
 doc/runtime_program.rst | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/runtime_program.rst b/doc/runtime_program.rst
index 71ee84b4..174b25d1 100644
--- a/doc/runtime_program.rst
+++ b/doc/runtime_program.rst
@@ -286,8 +286,3 @@ Kernel
 
     .. versionchanged:: 2011.1
         Added the *g_times_l* keyword arg.
-
-
-.. function:: enqueue_task(queue, kernel, wait_for=None)
-
-    |std-enqueue-blurb|
-- 
GitLab


From 969a115e178d5932fe233e1b4fbdd3b88ceec8ad Mon Sep 17 00:00:00 2001
From: "[6~" <inform@tiker.net>
Date: Thu, 12 Mar 2020 00:14:30 -0500
Subject: [PATCH 2/5] Remove separate Pypy import_array code path

---
 src/wrap_cl.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/wrap_cl.cpp b/src/wrap_cl.cpp
index b9393ed0..50a48201 100644
--- a/src/wrap_cl.cpp
+++ b/src/wrap_cl.cpp
@@ -43,11 +43,7 @@ extern void pyopencl_expose_mempool(py::module &m);
 
 static bool import_numpy_helper()
 {
-#ifdef PYPY_VERSION
-      import_array();
-#else
-      import_array1(false);
-#endif
+  import_array1(false);
   return true;
 }
 
-- 
GitLab


From 072fbc138b9e277512393659f7cd53574511b49b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= <inform@tiker.net>
Date: Sun, 29 Mar 2020 20:31:10 +0200
Subject: [PATCH 3/5] Pypy CI: Remove reference to specific pybind11 branch
 that's not being used anyway

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0550a676..19bd10fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -219,9 +219,7 @@ PyPy POCL:
   script:
   - export PY_EXE=pypy
   - export PYOPENCL_TEST=portable
-
-  # https://github.com/pybind/pybind11/pull/1494
-  - export EXTRA_INSTALL="git+https://github.com/inducer/pybind11 numpy mako"
+  - export EXTRA_INSTALL="pybind11 numpy mako"
 
   - export NO_DOCTESTS=1
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-- 
GitLab


From 668fa956e2d383e46dc3061fca2da18bbe159e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= <inform@tiker.net>
Date: Sun, 29 Mar 2020 21:57:34 +0200
Subject: [PATCH 4/5] Remove AMD CPU CI

---
 .gitlab-ci.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2222e3a8..0bf6af0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,3 @@
-"Python 2.7 AMD CPU":
-  script:
-  - export PY_EXE=python2.7
-  - export PYOPENCL_TEST=amd:pu
-  - 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
-  tags:
-  - python2.7
-  - amd-cl-cpu
-  - opengl
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3 Intel CPU:
   script:
   - export PY_EXE=python3
-- 
GitLab


From 79c7fd60b7c27cc8f44cde25b0bb3e6aa4cdec50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= <inform@tiker.net>
Date: Sun, 29 Mar 2020 21:58:05 +0200
Subject: [PATCH 5/5] Allow failure of Gitlab AMD GPU CI job

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bf6af0e..3c64ff24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,6 +64,7 @@ Python 3 K40:
       junit: test/pytest.xml
 
 Python 3 AMD GPU:
+  allow_failure: true
   script:
   - export PY_EXE=python3
   - export PYOPENCL_TEST=amd:gfx803
-- 
GitLab