From 8c9551306e811ba3916a8113c566039a2a3c544d Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 20 Jun 2018 17:49:44 -0500
Subject: [PATCH 1/5] Reenable pypy and binary-build CI

---
 .gitlab-ci.yml | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccb7cec08..cd7ce7756 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,18 +60,18 @@ Python 3.6 POCL Twice With Cache:
   except:
   - tags
 
-# PyPy AMD CPU:
-#   script:
-#   - export PY_EXE=pypy
-#   - export PYOPENCL_TEST="amd:pu"
-#   - export EXTRA_INSTALL="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:
-#   - pypy
-#   - amd-cl-cpu
-#   except:
-#   - tags
+PyPy POCL:
+  script:
+  - export PY_EXE=pypy
+  - export PYOPENCL_TEST=portable
+  - export EXTRA_INSTALL="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:
+  - pypy
+  - pocl
+  except:
+  - tags
 
 Python 3.6 POCL Examples:
   script:
@@ -87,19 +87,19 @@ Python 3.6 POCL Examples:
   except:
   - tags
 
-# CentOS binary:
-#   script:
-#   - (cd build-helpers; ./make-linux-build-docker.sh --nodate)
-#   - (cd ./build-helpers; ./loopy-centos6 ../examples/fortran/sparse.floopy)
-#   artifacts:
-#     expire_in: 4 weeks
-#     paths:
-#     - build-helpers/loopy-centos6
-#   tags:
-#   - docker
-#   only:
-#   - master
-#   retry: 2
+CentOS binary:
+  script:
+  - (cd build-helpers; ./make-linux-build-docker.sh --nodate)
+  - (cd ./build-helpers; ./loopy-centos6 ../examples/fortran/sparse.floopy)
+  artifacts:
+    expire_in: 4 weeks
+    paths:
+    - build-helpers/loopy-centos6
+  tags:
+  - docker
+  only:
+  - master
+  retry: 2
 
 Documentation:
   script:
-- 
GitLab


From abb0c3f59e3e7ca12a311788454adba49e56a003 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 20 Jun 2018 18:01:13 -0500
Subject: [PATCH 2/5] (Temporarily) also do binary builds on branches

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd7ce7756..4d0ed7932 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,8 +97,8 @@ CentOS binary:
     - build-helpers/loopy-centos6
   tags:
   - docker
-  only:
-  - master
+  # only:
+  # - master
   retry: 2
 
 Documentation:
-- 
GitLab


From ceaa740982a905bcbbbc6eb6e303d89ba1344ae2 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 20 Jun 2018 18:01:48 -0500
Subject: [PATCH 3/5] Use pypy-compatible bitness check in CUDA target

---
 loopy/target/cuda.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/loopy/target/cuda.py b/loopy/target/cuda.py
index 027f27838..ae9d42525 100644
--- a/loopy/target/cuda.py
+++ b/loopy/target/cuda.py
@@ -45,7 +45,8 @@ class vec:  # noqa
 def _create_vector_types():
     field_names = ["x", "y", "z", "w"]
 
-    if tuple.__itemsize__ * 8 == 32:
+    import sys
+    if sys.maxsize <= 2**33:
         long_dtype = np.int32
         ulong_dtype = np.uint32
     else:
-- 
GitLab


From 77f85105ddfac4f8578c678028cd79975246c71d Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 20 Jun 2018 18:18:03 -0500
Subject: [PATCH 4/5] Re-disable pypy build

---
 .gitlab-ci.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d0ed7932..8b2829d5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,18 +60,18 @@ Python 3.6 POCL Twice With Cache:
   except:
   - tags
 
-PyPy POCL:
-  script:
-  - export PY_EXE=pypy
-  - export PYOPENCL_TEST=portable
-  - export EXTRA_INSTALL="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:
-  - pypy
-  - pocl
-  except:
-  - tags
+# PyPy POCL:
+#   script:
+#   - export PY_EXE=pypy
+#   - export PYOPENCL_TEST=portable
+#   - export EXTRA_INSTALL="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:
+#   - pypy
+#   - pocl
+#   except:
+#   - tags
 
 Python 3.6 POCL Examples:
   script:
-- 
GitLab


From c211861f7a7384dbf1938b1b0bfeffefbc5af7b7 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 20 Jun 2018 18:18:22 -0500
Subject: [PATCH 5/5] Revert binary build to be master-only

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b2829d5d..870c2a6bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,8 +97,8 @@ CentOS binary:
     - build-helpers/loopy-centos6
   tags:
   - docker
-  # only:
-  # - master
+  only:
+  - master
   retry: 2
 
 Documentation:
-- 
GitLab