From 6ef0926addea61eb99ce465e61cdb831132450b5 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 11 Jul 2018 18:04:59 -0500 Subject: [PATCH 1/3] Work around removal of CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED_EXT --- src/c_wrapper/wrap_constants.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/c_wrapper/wrap_constants.cpp b/src/c_wrapper/wrap_constants.cpp index 16b1d1f4..08ed2ede 100644 --- a/src/c_wrapper/wrap_constants.cpp +++ b/src/c_wrapper/wrap_constants.cpp @@ -775,10 +775,15 @@ void populate_constants(void(*add)(const char*, const char*, int64_t value)) // mem_migration_flags_ext #ifdef cl_ext_migrate_memobject ADD_ATTR("mem_migration_flags_ext", MIGRATE_MEM_OBJECT_, HOST, _EXT); + + // As of 2018-07-11, the official headers seem to have dropped this: +#ifdef CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED_EXT ADD_ATTR("mem_migration_flags_ext", MIGRATE_MEM_OBJECT_, CONTENT_UNDEFINED, _EXT); #endif +#endif + // device_partition_property #if PYOPENCL_CL_VERSION >= 0x1020 -- GitLab From 3afcf511b2fbed3457027017c8c6fbc080ea732c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 11 Jul 2018 19:30:54 -0400 Subject: [PATCH 2/3] Allow Intel CI failure, shuffle CI Python versions --- .gitlab-ci.yml | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6673894..d946ecac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,43 +14,30 @@ except: - tags -Python 3.5 Intel CPU: +Python 3.6 Intel CPU: script: - - export PY_EXE=python3.5 + - export PY_EXE=python3.6 - export PYOPENCL_TEST="intel(r):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: - - python3.5 - - intel-cl-cpu - except: - - tags - -Python 3.5 AMD CPU: - script: - - export PY_EXE=python3.5 - - 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" allow_failure: true tags: - - python3.5 - - amd-cl-cpu + - python3.6 + - intel-cl-cpu except: - tags -Python 2.6 AMD CPU: +Python 3.6 AMD CPU: script: - - export PY_EXE=python2.6 + - export PY_EXE=python3.6 - 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" allow_failure: true tags: - - python2.6 + - python3.6 - amd-cl-cpu except: - tags @@ -95,15 +82,28 @@ Python 3.5 AMD GPU: except: - tags -Python 3.6 POCL: +Python 2.6 POCL CPU: script: - - export PY_EXE=python3.6 + - export PY_EXE=python2.6 - 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: - - python3.6 + - python2.6 + - amd-cl-cpu + except: + - tags + +Python 2.7 POCL: + script: + - export PY_EXE=python2.7 + - 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: + - python2.7 - pocl except: - tags @@ -122,15 +122,15 @@ Python 3.5 POCL CL 1.1: except: - tags -Python 2.7 POCL: +Python 3.6 POCL: script: - - export PY_EXE=python2.7 + - export PY_EXE=python3.6 - 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: - - python2.7 + - python3.6 - pocl except: - tags -- GitLab From 97cbf2f7a32f312279e8e4872ccd8cbabe784dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 11 Jul 2018 19:57:44 -0400 Subject: [PATCH 3/3] Don't run doctests on Py2.6 --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d9dd37b..e37c40b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,6 +87,7 @@ Python 2.6 POCL CPU: - export PY_EXE=python2.6 - export PYOPENCL_TEST=portable - export EXTRA_INSTALL="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 - ". ./build-and-test-py-project.sh" tags: -- GitLab