From 5050a51db49ed4135170fd2b351db61040f7dcfb Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 22 Dec 2017 00:19:45 -0600 Subject: [PATCH 1/3] Upgrade conda test and install instructions to pocl 1.0 --- .test-conda-env-py3.yml | 2 +- doc/misc.rst | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index b4f204c7..37c60864 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -6,7 +6,7 @@ dependencies: - git - conda-forge::numpy - conda-forge::sympy -- pocl=0.13 +- pocl=1.0 - islpy - pyopencl - python=3.5 diff --git a/doc/misc.rst b/doc/misc.rst index 14f3f764..874935f8 100644 --- a/doc/misc.rst +++ b/doc/misc.rst @@ -30,7 +30,7 @@ MacOS support is in the works. #. ``conda config --add channels conda-forge`` -#. ``conda install git pip pocl=0.13 islpy pyopencl sympy pyfmmlib pytest`` +#. ``conda install git pip pocl islpy pyopencl sympy pyfmmlib pytest`` #. Type the following command:: @@ -45,14 +45,6 @@ You may also like to add this to a startup file (like :file:`$HOME/.bashrc`) or After this, you should be able to run the `tests `_ or `examples `_. -.. note:: - - You may have noticed that we prescribed pocl version 0.13 above. That's - because newer versions have a `bug - `_ that we haven't - tracked down just yet. Until this bug is found, we discourage the use of - pocl 0.14 as results may be silently inaccurate. - Troubleshooting the Installation ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -- GitLab From 2ae9ae25fa1e7b9dff4477663ee87bd9fac8deec Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 22 Dec 2017 19:12:16 -0500 Subject: [PATCH 2/3] Use separate disk cache directory for conda bulid --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 334a41d0..b19f42b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,10 @@ Python 3.6 POCL: Python 3.5 Conda: script: - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine + + - export XDG_CACHE_HOME=$HOME/.cache-conda + - mkdir -p $XDG_CACHE_HOME + - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh -- GitLab From 7e885e41f5458e33c72c72d440fd414639e6af91 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sat, 23 Dec 2017 11:05:05 -0500 Subject: [PATCH 3/3] Revert "Use separate disk cache directory for conda bulid" This reverts commit 2ae9ae25fa1e7b9dff4477663ee87bd9fac8deec. --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b19f42b7..334a41d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,10 +29,6 @@ Python 3.6 POCL: Python 3.5 Conda: script: - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - - - export XDG_CACHE_HOME=$HOME/.cache-conda - - mkdir -p $XDG_CACHE_HOME - - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh -- GitLab