From 6dfafc598fdf89978352e26b5ab8f0bc5fd6dabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 13 Feb 2019 06:54:20 +0100 Subject: [PATCH 1/2] Fix OSX conda env for ICD-based Conda CL --- .test-conda-env-py3-macos.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index 7c0601cb..f37f16b3 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -14,7 +14,6 @@ dependencies: - symengine=0.3.0 - python-symengine=0.3.0 - pyfmmlib -- osx-pocl-opencl # for OpenMP support in pyfmmlib - libgfortran>=3.0.1 # things not in here: loopy boxtree pymbolic meshmode sumpy -- GitLab From 4b9854ad9826b80b1c418a74a7302653868bd181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 13 Feb 2019 07:15:29 +0100 Subject: [PATCH 2/2] Unpin pocl version in Conda CIs --- .test-conda-env-py3-macos.yml | 2 +- .test-conda-env-py3.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index f37f16b3..b71555f6 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -7,7 +7,7 @@ dependencies: - conda-forge::numpy - conda-forge::sympy - scipy -- pocl=1.0 +- pocl - islpy - pyopencl - python=3.6 diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 16e05373..a0803d62 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -7,7 +7,7 @@ dependencies: - scipy - conda-forge::numpy - conda-forge::sympy -- pocl=1.0 +- pocl - islpy - pyopencl - python=3.6 -- GitLab