From ff67a7f1e8b96aa179e0796318034fa3bbf14cbe Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 12 Feb 2019 20:40:26 -0600 Subject: [PATCH 1/2] Fix conda env --- .test-conda-env-py3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index b7824b0b..1221abe2 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -7,6 +7,6 @@ dependencies: - git - conda-forge::numpy - pocl -- osx-pocl-opencl +- khronos-opencl-icd-loader - mako - pybind11 -- GitLab From 9e2bb61d2e7b24a0e350c890bdd7f7b576bd2e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 13 Feb 2019 06:32:22 +0100 Subject: [PATCH 2/2] [Conda Apple CI] Remove Khronos ICD loader, since pocl should bring that in by dep --- .test-conda-env-py3.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 1221abe2..806454fa 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -7,6 +7,5 @@ dependencies: - git - conda-forge::numpy - pocl -- khronos-opencl-icd-loader - mako - pybind11 -- GitLab