From 0e1406ba248ae8d93e25c1bac38c1c1bab853307 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 18 Jan 2018 14:49:25 -0600 Subject: [PATCH 1/3] Ensure nodes are C-contig in merge_disjoint_meshes even with numpy 1.14 --- meshmode/mesh/processing.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meshmode/mesh/processing.py b/meshmode/mesh/processing.py index 1c961e4b..d420c08d 100644 --- a/meshmode/mesh/processing.py +++ b/meshmode/mesh/processing.py @@ -409,6 +409,10 @@ def merge_disjoint_meshes(meshes, skip_tests=False, single_group=False): for mesh in meshes for group in mesh.groups]) + if not nodes.flags.c_contiguous: + # hstack stopped producing C-contiguous arrays in numpy 1.14 + nodes = nodes.copy(order="C") + new_groups = [ grp_cls(order, vertex_indices, nodes, unit_nodes=unit_nodes)] -- GitLab From 0137d7bd4117c6cb8b11e61020a60e19846e1268 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 18 Jan 2018 15:00:35 -0600 Subject: [PATCH 2/3] Switch to the Intel CL impl for secondary CPU test --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4668a2b0..e5d81bcb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,13 @@ -Python 2.7 AMD CPU: +Python 2.7 Intel CPU: script: - export PY_EXE=python2.7 - - export PYOPENCL_TEST=amd:pu + - export PYOPENCL_TEST=intel - 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 - - amd-cl-cpu + - intel-cl-cpu except: - tags -- GitLab From b90716b8f2c92b5ff4cd5f7fa3d3357c439053a8 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 18 Jan 2018 15:35:50 -0600 Subject: [PATCH 3/3] Switch from Intel CPU to Nvidia K40 --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5d81bcb..d658c057 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,13 @@ -Python 2.7 Intel CPU: +Python 2.7 Nvidia K40: script: - export PY_EXE=python2.7 - - export PYOPENCL_TEST=intel + - export PYOPENCL_TEST=nvi:k40 - 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 - - intel-cl-cpu + - nvidia-k40 except: - tags -- GitLab