From e828199fc2e5adb46073ceb56d6e5109d355083e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 25 Jul 2019 20:15:27 +0200 Subject: [PATCH 1/3] TSQBX Conda builds: Relax Python version requirement --- .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 6a41e88b..db0e584c 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -10,7 +10,7 @@ dependencies: - pocl - islpy - pyopencl -- python=3.6 +- python>=3.6 - symengine=0.3.0 - python-symengine=0.3.0 - pyfmmlib diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 2ac85675..8023391b 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -10,7 +10,7 @@ dependencies: - pocl - islpy - pyopencl -- python=3.6 +- python>=3.6 - symengine=0.3.0 - python-symengine=0.3.0 - pyfmmlib -- GitLab From 50e3a7b428f89d34f26038ecaabbe15aa7322380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 25 Jul 2019 21:03:31 +0200 Subject: [PATCH 2/3] Muck around with OSX conda env --- .gitlab-ci.yml | 2 +- .test-conda-env-py3-macos.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc22ac51..f39642c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ Python 3 Conda Apple: - export CONDA_ENVIRONMENT=.test-conda-env-py3-macos.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - export REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - - export CC=gcc + - export CC=clang - set -o xtrace - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh - ". ./build-and-test-py-project-within-miniconda.sh" diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index db0e584c..14e7ed8f 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -16,6 +16,5 @@ dependencies: - pyfmmlib # for OpenMP support in pyfmmlib - libgfortran>=3.0.1 -- gcc - cython # things not in here: loopy boxtree pymbolic meshmode sumpy -- GitLab From 9a5189a9f507f35148febf04f248f214f4c44366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 25 Jul 2019 21:12:34 +0200 Subject: [PATCH 3/3] Try pulling in Clang's OMP support --- .test-conda-env-py3-macos.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index 14e7ed8f..eea9ddd7 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -16,5 +16,7 @@ dependencies: - pyfmmlib # for OpenMP support in pyfmmlib - libgfortran>=3.0.1 +- clangdev +- openmp - cython # things not in here: loopy boxtree pymbolic meshmode sumpy -- GitLab