From a11a3c4e97bd227149ffd8a2649b573cfdfde4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Mon, 13 Jul 2020 23:52:08 -0500 Subject: [PATCH 01/18] Add #egg= annotations to requirements.txt --- requirements.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 09d1ec0d..b3a861ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ numpy -git+git://github.com/inducer/pytools -git+git://github.com/inducer/pymbolic +git+git://github.com/inducer/pytools#egg=pytools +git+git://github.com/inducer/pymbolic#egg=pymbolic sympy==1.1.1 -git+https://github.com/inducer/modepy -git+https://github.com/inducer/pyopencl -git+https://github.com/inducer/islpy -git+https://github.com/inducer/loopy -git+https://github.com/inducer/boxtree -git+https://github.com/inducer/meshmode -git+https://github.com/inducer/sumpy -git+https://github.com/inducer/pyfmmlib +git+https://github.com/inducer/modepy#egg=modepy +git+https://github.com/inducer/pyopencl#egg=pyopencl +git+https://github.com/inducer/islpy#egg=islpy +git+https://github.com/inducer/loopy#egg=loo.py +git+https://github.com/inducer/boxtree#egg=boxtree +git+https://github.com/inducer/meshmode#egg=meshmode +git+https://github.com/inducer/sumpy#egg=sumpy +git+https://github.com/inducer/pyfmmlib#egg=pyfmmlib -- GitLab From 064511ebe6f0520df787f8b68b3d23e2011e7253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Tue, 14 Jul 2020 16:47:37 -0500 Subject: [PATCH 02/18] Turn off parallel CI on Linux --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8284242..4d84713c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,7 @@ jobs: run: | grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml + export CISUPPORT_PARALLEL_PYTEST=no 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 @@ -83,6 +84,7 @@ jobs: run: | set -e CONDA_ENVIRONMENT=.test-conda-env-py3.yml + export CISUPPORT_PARALLEL_PYTEST=no 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 -- GitLab From 4a058c471ce13159f652723fa3e745d53db20224 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 16:58:34 -0500 Subject: [PATCH 03/18] Revert "Turn off parallel CI on Linux" This reverts commit 064511ebe6f0520df787f8b68b3d23e2011e7253. --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d84713c..a8284242 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,6 @@ jobs: run: | grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml - export CISUPPORT_PARALLEL_PYTEST=no 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 @@ -84,7 +83,6 @@ jobs: run: | set -e CONDA_ENVIRONMENT=.test-conda-env-py3.yml - export CISUPPORT_PARALLEL_PYTEST=no 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 -- GitLab From 47f07baba8318360054660b86995243383bf4be4 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 19:29:05 -0500 Subject: [PATCH 04/18] Delete pip modules from conda env file --- .test-conda-env-py3.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index cb1f9027..6c840cd8 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -15,12 +15,3 @@ dependencies: - pyfmmlib - cython - gmsh - -- pip -- pip: - - git+https://github.com/inducer/pytools - - git+https://gitlab.tiker.net/inducer/boxtree - - git+https://github.com/inducer/pymbolic - - git+https://github.com/inducer/loopy - - git+https://github.com/inducer/sumpy - - git+https://github.com/inducer/meshmode -- GitLab From 3f3d15ce1e996fda3cea3483203ec1a18d7df0ae Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 19:41:01 -0500 Subject: [PATCH 05/18] Try installing conda forge compilers package for https://gitlab.tiker.net/inducer/pytential/-/issues/146 --- .test-conda-env-py3.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 6c840cd8..70ae710e 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -15,3 +15,6 @@ dependencies: - pyfmmlib - cython - gmsh + +# https://gitlab.tiker.net/inducer/pytential/-/issues/146 +- compilers -- GitLab From 6e8852d7a692ff9d65b07de120c548c2aeefe4cf Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 14 Jul 2020 22:22:27 -0500 Subject: [PATCH 06/18] Try pocl with clang static --- .test-conda-env-py3.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 70ae710e..94727655 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -1,5 +1,6 @@ name: test-conda-env-py3 channels: +- isuruf/label/pocl - conda-forge - nodefaults dependencies: -- GitLab From 2f5ac87a99ea567061d653e32ef68ba1214b506d Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 23:23:48 -0500 Subject: [PATCH 07/18] Revert "Try installing conda forge compilers package for https://gitlab.tiker.net/inducer/pytential/-/issues/146" This reverts commit 3f3d15ce1e996fda3cea3483203ec1a18d7df0ae. --- .test-conda-env-py3.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 70ae710e..6c840cd8 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -15,6 +15,3 @@ dependencies: - pyfmmlib - cython - gmsh - -# https://gitlab.tiker.net/inducer/pytential/-/issues/146 -- compilers -- GitLab From 395d3737f38019fcaa07476b2e4f91c2cd30240a Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 23:24:52 -0500 Subject: [PATCH 08/18] Do not use --doctest-modules with pytest on conda --- .github/workflows/ci.yml | 8 ++++++++ .gitlab-ci.yml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8284242..559c510d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,10 @@ jobs: run: | grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml + + # https://gitlab.tiker.net/inducer/pytential/-/issues/146 + CISUPPORT_PYTEST_NO_DOCTEST_MODULES=1 + 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 @@ -83,6 +87,10 @@ jobs: run: | set -e CONDA_ENVIRONMENT=.test-conda-env-py3.yml + + # https://gitlab.tiker.net/inducer/pytential/-/issues/146 + CISUPPORT_PYTEST_NO_DOCTEST_MODULES=1 + 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/.gitlab-ci.yml b/.gitlab-ci.yml index dae0a27c..a00738eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,8 @@ Python 3 Conda: - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - export CONDA_ENVIRONMENT=.test-conda-env-py3.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} + # https://gitlab.tiker.net/inducer/pytential/-/issues/146 + - export CISUPPORT_PYTEST_NO_DOCTEST_MODULES=1 - 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" tags: -- GitLab From f0031975afe27f52c8af343b9b27e8917b4d715d Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 23:27:02 -0500 Subject: [PATCH 09/18] Revert "Try pocl with clang static" This reverts commit 6e8852d7a692ff9d65b07de120c548c2aeefe4cf. --- .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 08539894..6c840cd8 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -1,6 +1,5 @@ name: test-conda-env-py3 channels: -- isuruf/label/pocl - conda-forge - nodefaults dependencies: -- GitLab From d023d333c73ef372f124305713c82989a0eede57 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 15 Jul 2020 01:01:31 -0500 Subject: [PATCH 10/18] Use GNU's openmp instead of LLVM's --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 559c510d..06b9b372 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,7 @@ jobs: run: | grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml + echo "- _openmp_mutex=*=*gnu*" >> .test-conda-env.yml # https://gitlab.tiker.net/inducer/pytential/-/issues/146 CISUPPORT_PYTEST_NO_DOCTEST_MODULES=1 -- GitLab From 442a0ccec24f03808bb04a3233fca82ac5f37222 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Jul 2020 11:31:50 -0500 Subject: [PATCH 11/18] Also add conda mutex to Github symengine CI --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06b9b372..7d4f9f92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,6 +89,8 @@ jobs: set -e CONDA_ENVIRONMENT=.test-conda-env-py3.yml + echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT + # https://gitlab.tiker.net/inducer/pytential/-/issues/146 CISUPPORT_PYTEST_NO_DOCTEST_MODULES=1 -- GitLab From d771cfc8d4ed6ac797993444e7224b3ad75e98a1 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Jul 2020 11:32:46 -0500 Subject: [PATCH 12/18] Add issue link to Github CI conda OpenMP mutex setting --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d4f9f92..99eefe31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,8 @@ jobs: run: | grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml + + # https://gitlab.tiker.net/inducer/pytential/-/issues/146 echo "- _openmp_mutex=*=*gnu*" >> .test-conda-env.yml # https://gitlab.tiker.net/inducer/pytential/-/issues/146 @@ -89,6 +91,7 @@ jobs: set -e CONDA_ENVIRONMENT=.test-conda-env-py3.yml + # https://gitlab.tiker.net/inducer/pytential/-/issues/146 echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT # https://gitlab.tiker.net/inducer/pytential/-/issues/146 -- GitLab From e6e5db74b5022ae6c8c2e58c5e3b005a1142602b Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Jul 2020 11:33:18 -0500 Subject: [PATCH 13/18] Remove extraneous 'set -e' from Github symengine CI --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99eefe31..28462948 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,7 +88,6 @@ jobs: - uses: actions/checkout@v2 - name: "Main Script" run: | - set -e CONDA_ENVIRONMENT=.test-conda-env-py3.yml # https://gitlab.tiker.net/inducer/pytential/-/issues/146 -- GitLab From 3dfd2ba6dfd7ca0aeee31b6a2462c8381377d9d5 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Jul 2020 11:35:14 -0500 Subject: [PATCH 14/18] Revert "Do not use --doctest-modules with pytest on conda" This reverts commit 395d3737f38019fcaa07476b2e4f91c2cd30240a. --- .github/workflows/ci.yml | 8 +------- .gitlab-ci.yml | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28462948..cee29175 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,10 +55,7 @@ jobs: CONDA_ENVIRONMENT=.test-conda-env.yml # https://gitlab.tiker.net/inducer/pytential/-/issues/146 - echo "- _openmp_mutex=*=*gnu*" >> .test-conda-env.yml - - # https://gitlab.tiker.net/inducer/pytential/-/issues/146 - CISUPPORT_PYTEST_NO_DOCTEST_MODULES=1 + echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT 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 @@ -93,9 +90,6 @@ jobs: # https://gitlab.tiker.net/inducer/pytential/-/issues/146 echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT - # https://gitlab.tiker.net/inducer/pytential/-/issues/146 - CISUPPORT_PYTEST_NO_DOCTEST_MODULES=1 - 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/.gitlab-ci.yml b/.gitlab-ci.yml index a00738eb..dae0a27c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,8 +61,6 @@ Python 3 Conda: - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - export CONDA_ENVIRONMENT=.test-conda-env-py3.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - # https://gitlab.tiker.net/inducer/pytential/-/issues/146 - - export CISUPPORT_PYTEST_NO_DOCTEST_MODULES=1 - 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" tags: -- GitLab From 7fd6f9b426a5d78deb28cca9c61ecb3222a10e9e Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Jul 2020 11:37:19 -0500 Subject: [PATCH 15/18] Add Conda OpenMP mutex setting to Gitlab CI, too --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dae0a27c..cf9a7713 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,10 @@ Python 3 Conda: - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - export CONDA_ENVIRONMENT=.test-conda-env-py3.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} + + # https://gitlab.tiker.net/inducer/pytential/-/issues/146 + - echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT + - 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" tags: -- GitLab From 8538e741bc85f94054b167d6317e5b0f587c91dc Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Jul 2020 13:21:20 -0500 Subject: [PATCH 16/18] Only use two parallel runners on Github CI Linux --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cee29175..994c8dc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,6 +57,8 @@ jobs: # https://gitlab.tiker.net/inducer/pytential/-/issues/146 echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT + CISUPPORT_PYTEST_NRUNNERS=2 + 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 @@ -90,6 +92,8 @@ jobs: # https://gitlab.tiker.net/inducer/pytential/-/issues/146 echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT + CISUPPORT_PYTEST_NRUNNERS=2 + 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 -- GitLab From ebd6350a646aba7060804f1985b198c321426ce2 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Jul 2020 13:21:38 -0500 Subject: [PATCH 17/18] Drop tracing flag on Github Mac CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 994c8dc2..34c8eca3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: echo "- llvm-openmp" >> .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - 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 -- GitLab From 8b273a33aa4db11a1fe9f6229e451c5a8d8f5bdb Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 15 Jul 2020 15:37:54 -0500 Subject: [PATCH 18/18] Don't run pytest parallel on Github Linux CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34c8eca3..82b4c637 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: # https://gitlab.tiker.net/inducer/pytential/-/issues/146 echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT - CISUPPORT_PYTEST_NRUNNERS=2 + CISUPPORT_PARALLEL_PYTEST=no 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 @@ -92,7 +92,7 @@ jobs: # https://gitlab.tiker.net/inducer/pytential/-/issues/146 echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT - CISUPPORT_PYTEST_NRUNNERS=2 + CISUPPORT_PARALLEL_PYTEST=no 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 -- GitLab