Skip to content

Use docker image for nogil CI #23312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Use docker image for nogil CI #23312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
214ae01
[nogil] Use docker image for nogil CI
lesteve May 9, 2022
4901e4b
[nogil] install ccache
lesteve May 9, 2022
37fb867
[nogil] fix
lesteve May 9, 2022
f18057c
[nogil] trigger CI
lesteve May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
# Here we make sure, that they are still run on a regular basis.
SKLEARN_SKIP_NETWORK_TESTS: '0'

- template: build_tools/azure/posix.yml
- template: build_tools/azure/posix-docker.yml
# Experimental CPython branch without the Global Interpreter Lock:
# https://github.com/colesbury/nogil/
#
Expand Down Expand Up @@ -103,6 +103,7 @@ jobs:
matrix:
pylatest_pip_nogil:
DISTRIB: 'pip-nogil'
DOCKER_CONTAINER: 'nogil/python'
COVERAGE: 'false'

# Check compilation with intel C++ compiler (ICC)
Expand Down
17 changes: 2 additions & 15 deletions build_tools/azure/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,8 @@ pre_python_environment_install() {
apt-get -yq install build-essential

elif [[ "$DISTRIB" == "pip-nogil" ]]; then
echo "deb-src http://archive.ubuntu.com/ubuntu/ focal main" | sudo tee -a /etc/apt/sources.list
sudo apt-get -yq update
sudo apt-get install -yq ccache
sudo apt-get build-dep -yq python3 python3-dev
apt-get -yq update
apt-get install -yq ccache

elif [[ "$BUILD_WITH_ICC" == "true" ]]; then
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
Expand Down Expand Up @@ -139,17 +137,6 @@ python_environment_install() {
pip install https://github.com/python-pillow/Pillow/archive/main.zip

elif [[ "$DISTRIB" == "pip-nogil" ]]; then
setup_ccache # speed-up the build of CPython it-self
ORIGINAL_FOLDER=`pwd`
cd ..
git clone --depth 1 https://github.com/colesbury/nogil
cd nogil
./configure && make -j 2
./python -m venv $ORIGINAL_FOLDER/$VIRTUALENV
cd $ORIGINAL_FOLDER
source $VIRTUALENV/bin/activate

python -m pip install -U pip
# The pip version that comes with the nogil branch of CPython
# automatically uses the custom nogil index as its highest priority
# index to fetch patched versions of libraries with native code that
Expand Down
2 changes: 1 addition & 1 deletion build_tools/azure/posix-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
PYAMG_VERSION: 'latest'
PILLOW_VERSION: 'latest'
MATPLOTLIB_VERSION: 'latest'
PYTEST_VERSION: 'latest'
PYTEST_VERSION: '6.2.5'
PYTEST_XDIST_VERSION: 'latest'
THREADPOOLCTL_VERSION: 'latest'
COVERAGE: 'false'
Expand Down