8000 Fix the stalled linux/arm64 [cd build] jobs on travis (#20958) · scikit-learn/scikit-learn@89d66b3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 89d66b3

Browse files
ogriselogrisel
authored
Fix the stalled linux/arm64 [cd build] jobs on travis (#20958)
1 parent 8bf3aa5 commit 89d66b3

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

‎.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@ env:
1818
- OPENBLAS_NUM_THREADS=2
1919
- SKLEARN_BUILD_PARALLEL=3
2020
- SKLEARN_SKIP_NETWORK_TESTS=1
21+
- PYTHONUNBUFFERED=1
2122
# Custom environment variables for the ARM wheel builder
2223
- CIBW_BUILD_VERBOSITY=1
23-
- CIBW_TEST_REQUIRES="pytest pytest-xdist threadpoolctl"
2424
- CIBW_TEST_COMMAND="bash {project}/build_tools/travis/test_wheels.sh"
25-
- CIBW_ENVIRONMENT="CPU_COUNT=2
25+
- CIBW_ENVIRONMENT="CPU_COUNT=6
2626
OMP_NUM_THREADS=2
2727
OPENBLAS_NUM_THREADS=2
28-
SKLEARN_BUILD_PARALLEL=3
29-
SKLEARN_SKIP_NETWORK_TESTS=1"
28+
SKLEARN_BUILD_PARALLEL=10
29+
SKLEARN_SKIP_NETWORK_TESTS=1
30+
PYTHONUNBUFFERED=1"
3031

3132
jobs:
3233
include:

‎build_tools/travis/install.sh

Lines changed: 2 additions & 4 deletions
10000
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
# defined in the ".travis.yml" file. In particular, it is
55
# important that we call to the right installation script.
66

7-
set -e
8-
97
if [[ $BUILD_WHEEL == true ]]; then
10-
source build_tools/travis/install_wheels.sh
8+
source build_tools/travis/install_wheels.sh || travis_terminate 1
119
else
12-
source build_tools/travis/install_main.sh
10+
source build_tools/travis/install_main.sh || travis_terminate 1
1311
fi

‎build_tools/travis/install_wheels.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#!/bin/bash
22

3-
set -e
4-
5-
python -m pip install cibuildwheel
6-
python -m cibuildwheel --output-dir wheelhouse
3+
python -m pip install cibuildwheel || travis_terminate $?
4+
python -m cibuildwheel --output-dir wheelhouse || travis_terminate $?

‎build_tools/travis/script.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
# continuous deployment jobs, we have to execute the scripts for
66
# testing the continuous integration jobs.
77

8-
set -e
9-
108
if [[ $BUILD_WHEEL != true ]]; then
119
# This trick will make Travis terminate the continuation of the pipeline
1210
bash build_tools/travis/test_script.sh || travis_terminate 1

‎build_tools/travis/test_wheels.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

3-
set -e
3+
pip install --upgrade pip || travis_terminate $?
4+
pip install pytest pytest-xdist || travis_terminate $?
45

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

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

0 commit comments

Comments
 (0)
0