8000 Fix the stalled linux/arm64 [cd build] jobs on travis by ogrisel · Pull Request #20958 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

Fix the stalled linux/arm64 [cd build] jobs on travis #20958

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

Merged
merged 17 commits into from
Sep 7, 2021
Merged

Fix the stalled linux/arm64 [cd build] jobs on travis #20958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b0aa4e4
Move pip install command into test command [cd build]
ogrisel Sep 6, 2021
d55bbd6
Try to parallelism in tests
ogrisel Sep 6, 2021
c8b05eb
forgot to [cd build], again...
ogrisel Sep 6, 2021
5713f9a
Try not to use set -e when building / testing wheels on travis
ogrisel Sep 7, 2021
42cf411
[cd build]
ogrisel Sep 7, 2021
1067a4d
DEBUG: remove other CIs to speed-up debug iterations
ogrisel Sep 7, 2021
248f65f
restrict tests to sklearn.cluster [cd build]
ogrisel Sep 7, 2021
c80a7a1
Try to disable python output buffering
ogrisel Sep 7, 2021
5882bda
Only use 2 cores in inner pytest command (instead o 80)
ogrisel Sep 7, 2021
12eb65d
[cd build]
ogrisel Sep 7, 2021
872ba66
Try to slowly increase build and test parallelism in CIBW env [cd build]
ogrisel Sep 7, 2021
a9d40e9
Run full sklearn test suite [cd build]
ogrisel Sep 7, 2021
1743193
Increase parallelism to 10 cores [cd build]
ogrisel Sep 7, 2021
6576a75
Reduce pytest parallelism down to 6 to reduce likelihood of worker cr…
ogrisel Sep 7, 2021
15c7ce6
Revert "DEBUG: remove other CIs to speed-up debug iterations"
8000 ogrisel Sep 7, 2021
e6a1d24
Merge remote-tracking branch 'origin/main' into travis-wheel-debug
ogrisel Sep 7, 2021
e2492da
[cd build] new run to assess stability
ogrisel Sep 7, 2021
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
9 changes: 5 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ env:
- OPENBLAS_NUM_THREADS=2
- SKLEARN_BUILD_PARALLEL=3
- SKLEARN_SKIP_NETWORK_TESTS=1
- PYTHONUNBUFFERED=1
# Custom environment variables for the ARM wheel builder
- CIBW_BUILD_VERBOSITY=1
- CIBW_TEST_REQUIRES="pytest pytest-xdist threadpoolctl"
- CIBW_TEST_COMMAND="bash {project}/build_tools/travis/test_wheels.sh"
- CIBW_ENVIRONMENT="CPU_COUNT=2
- CIBW_ENVIRONMENT="CPU_COUNT=6
OMP_NUM_THREADS=2
OPENBLAS_NUM_THREADS=2
SKLEARN_BUILD_PARALLEL=3
SKLEARN_SKIP_NETWORK_TESTS=1"
SKLEARN_BUILD_PARALLEL=10
SKLEARN_SKIP_NETWORK_TESTS=1
PYTHONUNBUFFERED=1"

jobs:
include:
Expand Down
6 changes: 2 additions & 4 deletions build_tools/travis/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
# defined in the ".travis.yml" file. In particular, it is
# important that we call to the right installation script.

set -e

if [[ $BUILD_WHEEL == true ]]; then
source build_tools/travis/install_wheels.sh
source build_tools/travis/install_wheels.sh || travis_terminate 1
else
source build_tools/travis/install_main.sh
source build_tools/travis/install_main.sh || travis_terminate 1
fi
6 changes: 2 additions & 4 deletions build_tools/travis/install_wheels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/bin/bash

set -e

python -m pip install cibuildwheel
python -m cibuildwheel --output-dir wheelhouse
python -m pip install cibuildwheel || travis_terminate $?
python -m cibuildwheel --output-dir wheelhouse || travis_terminate $?
2 changes: 0 additions & 2 deletions build_tools/travis/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
# continuous deployment jobs, we have to execute the scripts for
# testing the continuous integration jobs.

set -e

if [[ $BUILD_WHEEL != true ]]; then
# This trick will make Travis terminate the continuation of the pipeline
bash build_tools/travis/test_script.sh || travis_terminate 1
Expand Down
8 changes: 4 additions & 4 deletions build_tools/travis/test_wheels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash

set -e
pip install --upgrade pip || travis_terminate $?
pip install pytest pytest-xdist || travis_terminate $?

# Faster run of the source code tests
pytest -n $CPU_COUNT --pyargs sklearn
python -m pytest -n $CPU_COUNT --pyargs sklearn || travis_terminate $?

# Test that there are no links to system libraries
python -m threadpoolctl -i sklearn
python -m threadpoolctl -i sklearn || travis_terminate $?
0