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

MAINT: builds broken against NumPy main #20107

Closed
tylerjereddy opened this issue Feb 18, 2024 · 1 comment · Fixed by #20108
Closed

MAINT: builds broken against NumPy main #20107

tylerjereddy opened this issue Feb 18, 2024 · 1 comment · Fixed by #20108
Labels
maintenance Items related to regular maintenance tasks scipy.signal
Milestone
1.13.0

Comments

@tylerjereddy
Copy link
Contributor

On x86_64 Linux against latest NumPy main (see below the fold). I'm fixing it now.

[1028/1499] Compiling C object scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__correlate_nd.c.o
FAILED: scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__correlate_nd.c.o 
cc -Iscipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p -Iscipy/signal -I../scipy/signal -I../../../python_venvs/py_311_scipy_dev/lib/python3.11/site-packages/numpy/_core/include -I/home/treddy/github_projects/spack/opt/spack/linux-ubuntu22.04-skylake/gcc-11.3.0/python-3.11.2-4qncg2nqev5evxfmamde3e6rnb34b4ls/include/python3.11 -fvisibility=hidden -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c99 -O2 -g -Wno-unused-but-set-variable -Wno-unused-function -Wno-conversion -Wno-misleading-indentation -fPIC -DNPY_NO_DEPRECATED_API=NPY_1_9_API_VERSION -MD -MQ scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__correlate_nd.c.o -MF scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__correlate_nd.c.o.d -o scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__correlate_nd.c.o -c scipy/signal/_correlate_nd.c
scipy/signal/_correlate_nd.c: In function ‘_imp_correlate_nd_object’:
scipy/signal/_correlate_nd.c:555:61: error: ‘PyArray_Descr’ {aka ‘struct _PyArray_Descr’} has no member named ‘f’
  555 |     PyArray_CopySwapFunc *copyswap = PyArray_DESCR(curx->ao)->f->copyswap;
      |                                                             ^~
[1029/1499] Compiling C object scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__lfilter.c.o
FAILED: scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__lfilter.c.o 
cc -Iscipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p -Iscipy/signal -I../scipy/signal -I../../../python_venvs/py_311_scipy_dev/lib/python3.11/site-packages/numpy/_core/include -I/home/treddy/github_projects/spack/opt/spack/linux-ubuntu22.04-skylake/gcc-11.3.0/python-3.11.2-4qncg2nqev5evxfmamde3e6rnb34b4ls/include/python3.11 -fvisibility=hidden -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c99 -O2 -g -Wno-unused-but-set-variable -Wno-unused-function -Wno-conversion -Wno-misleading-indentation -fPIC -DNPY_NO_DEPRECATED_API=NPY_1_9_API_VERSION -MD -MQ scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__lfilter.c.o -MF scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__lfilter.c.o.d -o scipy/signal/_sigtools.cpython-311-x86_64-linux-gnu.so.p/meson-generated_..__lfilter.c.o -c scipy/signal/_lfilter.c
scipy/signal/_lfilter.c: In function ‘zfill’:
scipy/signal/_lfilter.c:344:71: error: ‘PyArray_Descr’ {aka ‘struct _PyArray_Descr’} has no member named ‘f’
  344 |     PyArray_CopySwapFunc *copyswap = PyArray_DESCR((PyArrayObject *)x)->f->copyswap;
      |                                                                       ^~
scipy/signal/_lfilter.c: In function ‘RawFilter’:
scipy/signal/_lfilter.c:388:71: error: ‘PyArray_Descr’ {aka ‘struct _PyArray_Descr’} has no member named ‘f’
  388 |     PyArray_CopySwapFunc *copyswap = PyArray_DESCR((PyArrayObject *)x)->f->copyswap;
      |                                                                       ^~
[1051/1499] Compiling C object scipy/special/cython_special.cpython-311-x86_64-linux-gnu.so.p/meson-generated_cython_special.c.o
ninja: build stopped: subcommand failed.
Build failed!
@tylerjereddy tylerjereddy added scipy.signal maintenance Items related to regular maintenance tasks labels Feb 18, 2024
@tylerjereddy tylerjereddy added this to the 1.13.0 milestone Feb 18, 2024
tylerjereddy added a commit to tylerjereddy/scipy that referenced this issue Feb 18, 2024
@tylerjereddy
WIP, MAINT: shim for descr->f access
14a8384 
* Fixes scipygh-20107

* WIP for now because I don't like that I had to manually
adjust the NumPy compat shim header...

* I confirmed that this branch restored full build/test suite
passing on x86_64 Linux with NumPy in the following scenarios:
build with NumPy `main`, test with NumPy `main`; build with
NumPy `main`, test with NumPy `1.26.4` (and 1.x only of course)

* although I did apply the suggestions at or linked from:
numpy/numpy#25812
I'm not happy about the fact that I have to modify
`npy_2_compat.h` manually (this seems very much not ideal,
perhaps I'll open an upstream issue)

[skip cirrus] [skip circle]
This was referenced Feb 18, 2024
Merged
Merged
@tylerjereddy
Copy link
Contributor Author

They reverted upstream

tylerjereddy added a commit to tylerjereddy/scipy that referenced this issue Feb 27, 2024
@tylerjereddy
WIP, MAINT: shim for descr->f access
c23d4af 
* Fixes scipygh-20107

* WIP for now because I don't like that I had to manually
adjust the NumPy compat shim header...

* I confirmed that this branch restored full build/test suite
passing on x86_64 Linux with NumPy in the following scenarios:
build with NumPy `main`, test with NumPy `main`; build with
NumPy `main`, test with NumPy `1.26.4` (and 1.x only of course)

* although I did apply the suggestions at or linked from:
numpy/numpy#25812
I'm not happy about the fact that I have to modify
`npy_2_compat.h` manually (this seems very much not ideal,
perhaps I'll open an upstream issue)

[skip cirrus] [skip circle]
rgommers pushed a commit to tylerjereddy/scipy that referenced this issue Mar 4, 2024
@tylerjereddy @rgommers
WIP, MAINT: shim for descr->f access
087a8cf 
* Fixes scipygh-20107

* WIP for now because I don't like that I had to manually
adjust the NumPy compat shim header...

* I confirmed that this branch restored full build/test suite
passing on x86_64 Linux with NumPy in the following scenarios:
build with NumPy `main`, test with NumPy `main`; build with
NumPy `main`, test with NumPy `1.26.4` (and 1.x only of course)

* although I did apply the suggestions at or linked from:
numpy/numpy#25812
I'm not happy about the fact that I have to modify
`npy_2_compat.h` manually (this seems very much not ideal,
perhaps I'll open an upstream issue)

[skip cirrus] [skip circle]
rgommers pushed a commit that referenced this issue Mar 4, 2024
@tylerjereddy
MAINT: shim for descr->f access (#20108)
63b139c 
Fixes gh-20107

Vendor in the latest version of the compat header from:
numpy/numpy#25897

The following scenarios all have full test suite passing:

- build + test against his feature branch with new header vendored into my branch
- (with new header vendored in) build against his branch, test against 1.26.4
- (with new header vendored in) build + test against 1.26.4

[skip cirrus] [skip circle]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
maintenance Items related to regular maintenance tasks scipy.signal
Projects
None yet
Milestone
1.13.0
Development

Successfully merging a pull request may close this issue.

MAINT: shim for descr->f access tylerjereddy/scipy
1 participant
@tylerjereddy