Skip to content

[MRG] Debug wheels (and remove i686) #543

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 4 commits into from
Oct 27, 2023
Merged

[MRG] Debug wheels (and remove i686) #543

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
f23bad5
build wheels
rflamary Oct 26, 2023
b208560
remove i686 wheels and build wheels
rflamary Oct 26, 2023
b4d0406
update release file
rflamary Oct 27, 2023
d7bfd4b
Merge branch 'master' into debug_wheels
rflamary Oct 27, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/build_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:

- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.14.1
python -m pip install cibuildwheel==2.16.2

- name: Build wheels
env:
CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp36* cp*musl*" # remove pypy on mac and win (wrong version)
CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp36* cp*musl* *i686" # remove pypy on mac and win (wrong version)
run: |
python -m cibuildwheel --output-dir wheelhouse

Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:

- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.14.1
python -m pip install cibuildwheel==2.16.2

- name: Set up QEMU
if: runner.os == 'Linux'
Expand All @@ -75,7 +75,7 @@ jobs:

- name: Build wheels
env:
CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl*" # remove pypy on mac and win (wrong version)
CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl* *i686" # remove pypy on mac and win (wrong version)
CIBW_ARCHS_LINUX: auto aarch64 # force aarch64 with QEMU
CIBW_ARCHS_MACOS: x86_64 universal2 arm64
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_wheels_weekly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.14.1
python -m pip install cibuildwheel==2.16.2

- name: Set up QEMU
if: runner.os == 'Linux'
Expand All @@ -39,7 +39,7 @@ jobs:

- name: Build wheels
env:
CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl* cp36*" # remove pypy on mac and win (wrong version)
CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl* cp36* *i686" # remove pypy on mac and win (wrong version)
CIBW_BEFORE_BUILD: "pip install numpy cython"
CIBW_ARCHS_LINUX: auto aarch64 # force aarch64 with QEMU
CIBW_ARCHS_MACOS: x86_64 universal2 arm64
Expand Down
1 change: 1 addition & 0 deletions RELEASES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
+ The `convolutional_barycenter2d` and `convolutional_barycenter2d_debiased` functions now work with different devices.. (PR #533)
+ New API for Gromov-Wasserstein solvers with `ot.solve_gromov` function (PR #536)
+ New LP solvers from scipy used by default for LP barycenter (PR #537)
+ Update wheels to Python 3.12 and remove old i686 arch that do not have scipy wheels (PR #543)
+ Upgraded unbalanced OT solvers for more flexibility (PR #539)

#### Closed issues
Expand Down