Skip to content

BLD Build 3.10 wheel [cd build gh] #21232

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 35 commits into from
Dec 2, 2021
Merged

BLD Build 3.10 wheel [cd build gh] #21232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c066962
BLD Build 3.10 wheel for linux [cd build gh]
thomasjpfan Oct 3, 2021
578d849
BLD Test matrix [cd build gh]
thomasjpfan Oct 3, 2021
f4f1d41
BLD Test matrix fix [cd build gh]
thomasjpfan Oct 3, 2021
a9d3c94
BLD Test matrix fix [cd build gh]
thomasjpfan Oct 3, 2021
0d57609
BLD Only test 310 [cd build gh]
thomasjpfan Oct 3, 2021
1b519e2
BLD Do not use prerelease cython [cd build gh]
thomasjpfan Oct 3, 2021
418fe03
REV smaller diff [cd build gh]
thomasjpfan Oct 3, 2021
0e00fc4
BLD pin cython [cd build gh]
thomasjpfan Oct 3, 2021
5de67ed
BLD Do not use dev version of pandas [cd build gh]
thomasjpfan Oct 4, 2021
6471b97
BLD Test build matrix [cd build gh]
thomasjpfan Oct 4, 2021
ebdf681
BLD Actually build wheels [cd build gh]
thomasjpfan Oct 4, 2021
6e75f76
BLD Slightly better variables [cd build gh]
thomasjpfan Oct 4, 2021
eea348b
BLD Slightly better matrix formulation [cd build gh]
thomasjpfan Oct 4, 2021
6fb72cf
BLD Slightly better matrix formulation [cd build gh]
thomasjpfan Oct 4, 2021
8657237
Merge remote-tracking branch 'upstream/main' into wheel_3_10
thomasjpfan Oct 21, 2021
0c4e817
REV Less diffs
thomasjpfan Oct 21, 2021
4d90ea3
Merge remote-tracking branch 'upstream/main' into wheel_3_10
thomasjpfan Oct 21, 2021
02f1cd8
Merge remote-tracking branch 'upstream/main' into wheel_3_10
thomasjpfan Oct 23, 2021
30f4c9b
BLD [cd build gh]
thomasjpfan Oct 23, 2021
62837b3
ENH Adds wheels for all platforms
thomasjpfan Nov 7, 2021
9fd648d
Merge remote-tracking branch 'upstream/main' into wheel_3_10
thomasjpfan Nov 7, 2021
2e115d4
BLD [cd build gh]
thomasjpfan Nov 7, 2021
74ea2dd
BLD Adds arm64 builds [cd build]
thomasjpfan Nov 7, 2021
37bc144
BLD Adds arm64 builds [cd build]
thomasjpfan Nov 7, 2021
3fa7694
ENH Use python 3.9 as base
thomasjpfan Nov 7, 2021
fc5e4c4
ENH Use python 3.9 as base [cd build]
thomasjpfan Nov 7, 2021
2ea78a8
Merge remote-tracking branch 'upstream/main' into wheel_3_10
thomasjpfan Nov 18, 2021
b691d76
BLD Check build [cd build]
thomasjpfan Nov 18, 2021
15de3b8
CLN Address comments
thomasjpfan Nov 19, 2021
e0eeb55
CLN Increase CPU_COUNT on arm since it vm has more memory [cd build]
thomasjpfan Nov 19, 2021
ca21f91
Merge remote-tracking branch 'upstream/main' into wheel_3_10 [cd build]
thomasjpfan Nov 22, 2021
db9db2b
DOC Update whats new
thomasjpfan Nov 30, 2021
d08cc16
Merge remote-tracking branch 'upstream/main' into wheel_3_10
thomasjpfan Nov 30, 2021
ff868b6
Merge branch 'main' into wheel_3_10
ogrisel Dec 2, 2021
d0b4235
Update check_wheels.py [cd build]
ogrisel Dec 2, 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
15 changes: 15 additions & 0 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ jobs:
python: 39
bitness: 64
platform_id: win_amd64
- os: windows-latest
python: 310
bitness: 64
platform_id: win_amd64

# Window 32 bit
- os: windows-latest
Expand Down Expand Up @@ -109,6 +113,13 @@ jobs:
bitness: 64
platform_id: manylinux_x86_64
manylinux_image: manylinux2010

# NumPy on Python 3.10 only supports 64bit and is only available with manylinux2014
- os: ubuntu-latest
python: 310
bitness: 64
platform_id: manylinux_x86_64
manylinux_image: manylinux2014

# Linux 32 bit manylinux1
- os: ubuntu-latest
Expand Down Expand Up @@ -157,6 +168,10 @@ jobs:
bitness: 64
python: 39
platform_id: macosx_x86_64
- os: macos-latest
bitness: 64
python: 310
platform_id: macosx_x86_64

steps:
- name: Checkout scikit-learn
Expand Down
36 changes: 23 additions & 13 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# new container-based Travis workers
language: python
dist: xenial
# Only used to install cibuildwheel, CIBW_BUILD determines the python version being
# built in the docker image itself. Also: travis does not have 3.10 yet.
python: 3.9

cache:
apt: true
Expand All @@ -22,7 +25,7 @@ env:
# Custom environment variables for the ARM wheel builder
- CIBW_BUILD_VERBOSITY=1
- CIBW_TEST_COMMAND="bash {project}/build_tools/travis/test_wheels.sh"
- CIBW_ENVIRONMENT="CPU_COUNT=2
- CIBW_ENVIRONMENT="CPU_COUNT=4
OMP_NUM_THREADS=2
OPENBLAS_NUM_THREADS=2
SKLEARN_BUILD_PARALLEL=10
Expand All @@ -37,38 +40,45 @@ jobs:
# a scheduled task to build the weekly dev build on the main branch. The
# weekly frequency is meant to avoid depleting the Travis CI credits too
# fast.
- python: 3.7
os: linux
- os: linux
arch: arm64-graviton2
dist: focal
virt: lxd
virt: vm
group: edge
if: type = cron or commit_message =~ /\[cd build\]/
env:
- BUILD_WHEEL=true
- CIBW_BUILD=cp37-manylinux_aarch64
- BUILD_WHEEL=true

- python: 3.8
os: linux
- os: linux
arch: arm64-graviton2
dist: focal
virt: lxd
virt: vm
group: edge
if: type = cron or commit_message =~ /\[cd build\]/
env:
- BUILD_WHEEL=true
- CIBW_BUILD=cp38-manylinux_aarch64
- BUILD_WHEEL=true
Comment on lines 60 to +61
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed the order so that CIBW_BUILD=cp38 appears first in the UI so it is easier to see the Python version.


- python: 3.9
os: linux
- os: linux
arch: arm64-graviton2
dist: focal
virt: lxd
virt: vm
group: edge
if: type = cron or commit_message =~ /\[cd build\]/
env:
- BUILD_WHEEL=true
- CIBW_BUILD=cp39-manylinux_aarch64
- BUILD_WHEEL=true

- os: linux
arch: arm64-graviton2
dist: focal
virt: vm
group: edge
if: type = cron or commit_message =~ /\[cd build\]/
env:
- CIBW_BUILD=cp310-manylinux_aarch64
- BUILD_WHEEL=true

install: source build_tools/travis/install.sh || travis_terminate 1
script: source build_tools/travis/script.sh || travis_terminate 1
Expand Down