Skip to content

Commit 72f1dd1

Browse files
committed
Merge branch 'drop-py2.7' into 'master'
Drop Py2.7 See merge request inducer/loopy!395
2 parents fd6d410 + 1f6dd5f commit 72f1dd1

File tree

12 files changed

+2
-237
lines changed

12 files changed

+2
-237
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,6 @@ jobs:
4848
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
4949
. ./build-and-test-py-project-within-miniconda.sh
5050
51-
pytest2:
52-
name: Conda Pytest Py2
53-
runs-on: ubuntu-latest
54-
steps:
55-
- uses: actions/checkout@v2
56-
- name: "Main Script"
57-
run: |
58-
sed 's/python=3/python=2.7/' .test-conda-env-py3.yml > .test-conda-env-py2.yml
59-
cat .test-conda-env-py2.yml
60-
CONDA_ENVIRONMENT=.test-conda-env-py2.yml
61-
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
62-
. ./build-and-test-py-project-within-miniconda.sh
63-
6451
pytest_twice:
6552
name: Pytest twice (for cache behavior) on Py${{ matrix.python-version }}
6653
runs-on: ubuntu-latest

.gitlab-ci.yml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
Python 2.7 POCL:
2-
script:
3-
- export PY_EXE=python2.7
4-
- export PYOPENCL_TEST=portable:pthread
5-
- export EXTRA_INSTALL="pybind11 numpy mako"
6-
- export LOOPY_NO_CACHE=1
7-
- export NO_DOCTESTS=1
8-
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
9-
- ". ./build-and-test-py-project.sh"
10-
tags:
11-
- python2.7
12-
- pocl
13-
except:
14-
- tags
15-
artifacts:
16-
reports:
17-
junit: test/pytest.xml
18-
19-
201
Python 3 POCL:
212
script:
223
- export PY_EXE=python3
@@ -114,20 +95,6 @@ Pylint:
11495
except:
11596
- tags
11697

117-
CentOS binary:
118-
script:
119-
- (cd build-helpers; ./make-linux-build-docker.sh --nodate)
120-
- (cd ./build-helpers; ./loopy-centos6 ../examples/fortran/sparse.floopy)
121-
artifacts:
122-
expire_in: 4 weeks
123-
paths:
124-
- build-helpers/loopy-centos6
125-
tags:
126-
- docker
127-
only:
128-
- master
129-
retry: 2
130-
13198
Documentation:
13299
script:
133100
- EXTRA_INSTALL="pybind11 numpy"

build-helpers/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

build-helpers/loopy.spec

Lines changed: 0 additions & 70 deletions
This file was deleted.

build-helpers/make-linux-build-docker-inner-part-2.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

build-helpers/make-linux-build-docker-inner.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

build-helpers/make-linux-build-docker.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

build-helpers/run-pyinstaller.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

build-helpers/upload.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

doc/index.rst

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,6 @@ When you run this script, the following kernel is generated, compiled, and execu
2020

2121
.. _static-binary:
2222

23-
Want to try out loopy?
24-
----------------------
25-
26-
There's no need to go through :ref:`installation` if you'd just like to get a
27-
feel for what loopy is. Instead, you may
28-
`download a self-contained Linux binary <https://gitlab.tiker.net/inducer/loopy/-/jobs/66778/artifacts/browse/build-helpers/>`_.
29-
This is purposefully built on an ancient Linux distribution, so it should work
30-
on most versions of Linux that are currently out there.
31-
32-
Once you have the binary, do the following::
33-
34-
chmod +x ./loopy-centos6
35-
./loopy-centos6 --target=opencl hello-loopy.loopy
36-
./loopy-centos6 --target=cuda hello-loopy.loopy
37-
./loopy-centos6 --target=ispc hello-loopy.loopy
38-
39-
Grab the example here: :download:`examples/python/hello-loopy.loopy <../examples/python/hello-loopy.loopy>`.
40-
41-
You may also donwload the most recent version by going to the `list of builds
42-
<https://gitlab.tiker.net/inducer/loopy/builds>`_, clicking on the newest one
43-
of type "CentOS binary", clicking on "Browse" under "Build Artifacts", then
44-
navigating to "build-helpers", and downloading the binary from there.
45-
4623
Places on the web related to Loopy
4724
----------------------------------
4825

0 commit comments

Comments
 (0)