From f0942e57deb3531a60aaeca081fbd6fba14b7a92 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Feb 2017 17:06:58 -0600 Subject: [PATCH 1/2] Enable pypy testing --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ea075d19..2ea56e364 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,18 +85,18 @@ Python 3.6 POCL: 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 + - amd-cl-cpu + except: + - tags CentOS binary: script: -- GitLab From cce91444750abff184dc6911b1019595acff07f8 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Feb 2017 17:33:29 -0600 Subject: [PATCH 2/2] Use sys.maxsize (not tuple.__itemsize__) to determine machine bitness --- 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 2bdffb5aa..38abc9729 100644 --- a/loopy/target/cuda.py +++ b/loopy/target/cuda.py @@ -24,6 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ +import sys import numpy as np from pytools import memoize_method @@ -45,7 +46,7 @@ class vec: # noqa def _create_vector_types(): field_names = ["x", "y", "z", "w"] - if tuple.__itemsize__ * 8 == 32: + if sys.maxsize == 2**32-1: long_dtype = np.int32 ulong_dtype = np.uint32 else: -- GitLab