From 4821720f61eeb8cd9ef6aaf4554561a10f697428 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Tue, 23 Jul 2019 15:51:33 -0500 Subject: [PATCH 1/3] Another attempt at fixing TSQBX build on macOS --- .gitlab-ci.yml | 3 ++- .test-conda-env-py3-macos.yml | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc22ac51..e8a48e00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,8 @@ 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 + - which -s gcc-8 || (echo "gcc from Homebrew not installed"; exit 1) + - export CC=gcc-8 - 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 6a41e88b..bae8f026 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -10,12 +10,11 @@ dependencies: - pocl - islpy - pyopencl -- python=3.6 +- python - symengine=0.3.0 - python-symengine=0.3.0 - pyfmmlib # for OpenMP support in pyfmmlib - libgfortran>=3.0.1 -- gcc - cython -# things not in here: loopy boxtree pymbolic meshmode sumpy +# things not in here: loopy boxtree pymbolic meshmode sumpy gcc-8 -- GitLab From 19b2d117ef7aafbb05082dce660ef020b882de39 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Tue, 23 Jul 2019 21:37:52 -0500 Subject: [PATCH 2/3] Revert "Another attempt at fixing TSQBX build on macOS" This reverts commit 4821720f61eeb8cd9ef6aaf4554561a10f697428. --- .gitlab-ci.yml | 3 +-- .test-conda-env-py3-macos.yml | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8a48e00..dc22ac51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,8 +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 - - which -s gcc-8 || (echo "gcc from Homebrew not installed"; exit 1) - - export CC=gcc-8 + - export CC=gcc - 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 bae8f026..6a41e88b 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -10,11 +10,12 @@ dependencies: - pocl - islpy - pyopencl -- python +- python=3.6 - symengine=0.3.0 - python-symengine=0.3.0 - pyfmmlib # for OpenMP support in pyfmmlib - libgfortran>=3.0.1 +- gcc - cython -# things not in here: loopy boxtree pymbolic meshmode sumpy gcc-8 +# things not in here: loopy boxtree pymbolic meshmode sumpy -- GitLab From 2f79b28ed29c42ba5ecc1866b7e0a23ed737b884 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Tue, 23 Jul 2019 21:52:50 -0500 Subject: [PATCH 3/3] Use a known-good environment --- .test-conda-env-py3-macos.yml | 96 +++++++++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 16 deletions(-) diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index 6a41e88b..e389effd 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -1,21 +1,85 @@ -name: test-conda-env-py3-macos +name: testing channels: - conda-forge - defaults dependencies: -- git -- conda-forge::numpy -- conda-forge::sympy -- scipy -- pocl -- islpy -- pyopencl -- python=3.6 -- symengine=0.3.0 -- python-symengine=0.3.0 -- pyfmmlib -# for OpenMP support in pyfmmlib -- libgfortran>=3.0.1 -- gcc -- cython +- appdirs=1.4.3=py_1 +- atomicwrites=1.3.0=py_0 +- attrs=19.1.0=py_0 +- bzip2=1.0.8=h01d97ff_0 +- ca-certificates=2019.6.16=hecc5488_0 +- certifi=2019.6.16=py37_1 +- cffi=1.12.3=py37hccf1714_0 +- clangdev=8.0.0=h770b8ee_2 +- curl=7.65.3=h22ea746_0 +- cython=0.29.12=py37h6de7cb9_0 +- decorator=4.4.0=py_0 +- expat=2.2.5=h6de7cb9_1003 +- fastcache=1.1.0=py37h01d97ff_0 +- gcc=4.8.5=8 +- gettext=0.19.8.1=h46ab8bc_1002 +- git=2.22.0=pl526hbdf3604_0 +- gmp=6.1.2=h0a44026_1000 +- gmpy2=2.1.0b1=py37h1744cca_0 +- icu=64.2=h6de7cb9_0 +- importlib_metadata=0.18=py37_0 +- isl=0.12.2=1 +- islpy=2018.2=py37h111a6b9_1000 +- khronos-opencl-icd-loader=2019.02.20=h01d97ff_1 +- krb5=1.16.3=hcfa6398_1001 +- libcurl=7.65.3=h16faf7d_0 +- libcxx=8.0.0=4 +- libcxxabi=8.0.0=4 +- libedit=3.1.20170329=hcfe32e1_1001 +- libffi=3.2.1=h6de7cb9_1006 +- libgfortran=3.0.1=0 +- libhwloc=2.0.3=hd545b52_1 +- libiconv=1.15=h01d97ff_1005 +- libssh2=1.8.2=hcdc9a53_2 +- libtool=2.4.6=h1de35cc_1002 +- libxml2=2.9.9=h12c6b28_2 +- mako=1.0.10=py_0 +- markupsafe=1.1.1=py37h1de35cc_0 +- mkl_fft=1.0.13=py37h01d97ff_1 +- mkl_random=1.0.4=py37h051e8ed_0 +- more-itertools=7.1.0=py_0 +- mpc=1.1.0=h3aece09_1006 +- mpfr=4.0.2=h0a95893_0 +- mpmath=1.1.0=py_0 +- ncurses=6.1=h0a44026_1002 +- ocl_icd_wrapper_apple=1.0.0=h1de35cc_0 +- openblas=0.3.3=hdc02c5d_1001 +- openssl=1.1.1c=h01d97ff_0 +- packaging=19.0=py_0 +- perl=5.26.2=haec8ef5_1006 +- pip=19.2.1=py37_0 +- pluggy=0.12.0=py_0 +- pocl=1.3=h770b8ee_1 +- py=1.8.0=py_0 +- pycparser=2.19=py37_1 +- pyfmmlib=2019.1.4=py37h2cdb68b_0 +- pyopencl=2019.1=py37haf112f3_0 +- pyparsing=2.4.1=py_0 +- pytest=5.0.1=py37_1 +- python=3.7.3=h93065d6_1 +- python-symengine=0.3.0=py37h64611b5_1002 +- pytools=2019.1.1=py_0 +- readline=8.0=hcfe32e1_0 +- setuptools=41.0.1=py37_0 +- six=1.12.0=py37_1000 +- sqlite=3.29.0=hb7d70f7_0 +- symengine=0.3.0=h64611b5_1003 +- sympy=1.4=py37_0 +- tk=8.6.9=h2573ce8_1002 +- wcwidth=0.1.7=py_1 +- wheel=0.33.4=py37_0 +- xz=5.2.4=h1de35cc_1001 +- zipp=0.5.1=py_0 +- zlib=1.2.11=h01d97ff_1005 +- blas=1.0=mkl +- cloog=0.18.0=0 +- intel-openmp=2019.4=233 +- mkl=2019.4=233 +- numpy=1.16.4=py37hacdab7b_0 +- numpy-base=1.16.4=py37h6575580_0 # things not in here: loopy boxtree pymbolic meshmode sumpy -- GitLab