diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4a2e3e0f6ebd6e937412755b5abb53f17aedf5a..2ea1707ff43eb9e1d17760a4ac86bec1a886ae1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,7 +158,7 @@ Flake8: Benchmarks: stage: test script: - - CONDA_ENVIRONMENT=.test-conda-env.yml + - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - PROJECT=loopy - PYOPENCL_TEST=portable:pthread - export LOOPY_NO_CACHE=1 diff --git a/.test-conda-env.yml b/.test-conda-env.yml deleted file mode 100644 index 6f7a4d2af01153689bc68451349f48e92f2e50a2..0000000000000000000000000000000000000000 --- a/.test-conda-env.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: test-conda-env -channels: -- conda-forge -- nodefaults - -dependencies: -- git -- numpy -- pocl -- pocl-cuda -- islpy -- pyopencl -- python=3 - -- pip -- pip: - - git+https://github.com/inducer/pytools - - git+https://github.com/inducer/pymbolic diff --git a/asv.conf.json b/asv.conf.json index 26ac70b487dfad732f16d42f68a23043e8538df3..99c2ea2b5941721a045d8aa7a0586d7d5f9e1eb6 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -71,8 +71,9 @@ "islpy" : [""], "pocl" : [""], "pip+git+https://github.com/inducer/pymbolic#egg=pymbolic": [""], - "pip+git+https://gitlab.tiker.net/inducer/boxtree#egg=boxtree": [""], + "pip+git+https://github.com/inducer/boxtree#egg=boxtree": [""], "pip+git+https://github.com/inducer/loopy#egg=loopy": [""], + "pip+git+https://github.com/inducer/sumpy#egg=sumpy": [""], }, // Combinations of libraries/python versions can be excluded/included