Skip to content
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

Jump to bottom

BLD: Build wheels with cibuildwheel 2.12.0 #22921

Merged
merged 7 commits into from
Jan 17, 2023
Merged

BLD: Build wheels with cibuildwheel 2.12.0 #22921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
72f9e15
BLD: Try building wheels with cibuildwheel 2.11.4
charris Jan 3, 2023
2f578ee
BLD: Try 2.11.3 to narrow things down.
charris Jan 4, 2023
c2ab45c
MAINT: Create lib path if missing.
charris Jan 6, 2023
8d5d442
BLD, SIMD: Pad asm to avoid C99 complains on CLANG
seiko2plus Jan 9, 2023
77e8011
BLD: Try disables mingw32
seiko2plus Jan 9, 2023
aa67d2e
BLD: Try cibuildwheel 2.11.4
charris Jan 9, 2023
57c6154
BLD: Try cibuildwheel v2.12.0
charris Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,12 @@ jobs:
- name: setup rtools for 32-bit
run: |
echo "PLAT=i686" >> $env:GITHUB_ENV
echo "MSYSTEM=MINGW32" >> $env:GITHUB_ENV
echo "PATH=$env:RTOOLS40_HOME\mingw32\bin;$env:PATH" >> $env:GITHUB_ENV
gfortran --version
if: ${{ matrix.buildplat[1] == 'win32' }}

- name: Build wheels
uses: pypa/cibuildwheel@v2.11.2
uses: pypa/cibuildwheel@v2.12.0
env:
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

Expand Down
6 changes: 3 additions & 3 deletions numpy/core/src/common/simd/neon/operators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ NPY_FINLINE npyv_b32 npyv_notnan_f32(npyv_f32 a)
*/
npyv_b32 ret;
#if NPY_SIMD_F64
asm ("fcmeq %0.4s, %1.4s, %1.4s" : "=w" (ret) : "w" (a));
__asm("fcmeq %0.4s, %1.4s, %1.4s" : "=w" (ret) : "w" (a));
#else
asm ("vceq.f32 %q0, %q1, %q1" : "=w" (ret) : "w" (a));
__asm("vceq.f32 %q0, %q1, %q1" : "=w" (ret) : "w" (a));
#endif
return ret;
#else
Expand All @@ -263,7 +263,7 @@ NPY_FINLINE npyv_b32 npyv_notnan_f32(npyv_f32 a)
{
#if defined(__clang__)
npyv_b64 ret;
asm ("fcmeq %0.2d, %1.2d, %1.2d" : "=w" (ret) : "w" (a));
__asm("fcmeq %0.2d, %1.2d, %1.2d" : "=w" (ret) : "w" (a));
return ret;
#else
return vceqq_f64(a, a);
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/cirrus_general.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build_and_store_wheels: &BUILD_AND_STORE_WHEELS
install_cibuildwheel_script:
- python -m pip install cibuildwheel==2.11.2
- python -m pip install cibuildwheel==2.12.0
cibuildwheel_script:
- cibuildwheel
wheels_artifacts:
Expand Down