🌐 AI搜索 & 代理 主页
Skip to content

BUG: Fix pocketfft umath strides for powerpc compatibility #29768

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
seberg merged 3 commits into from
Sep 22, 2025
Merged

BUG: Fix pocketfft umath strides for powerpc compatibility #29768

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a4c161
_pocketfft_umath.cpp: fix types
barracuda156 Sep 19, 2025
b624e05
_pocketfft_umath.cpp: fix unused variable warning
barracuda156 Sep 19, 2025
89d50f8
Move npts_in calculation into #ifndef
seberg Sep 22, 2025
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: 7 additions & 8 deletions numpy/fft/_pocketfft_umath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
template<PyUFuncGenericFunction cpp_ufunc>
static void
wrap_legacy_cpp_ufunc(char **args, npy_intp const *dimensions,
ptrdiff_t const *steps, void *func)
npy_intp const *steps, void *func)
{
NPY_ALLOW_C_API_DEF
try {
Expand Down Expand Up @@ -86,14 +86,14 @@ copy_output(T buff[], char *out, npy_intp step_out, size_t n)
*/
template <typename T>
static void
fft_loop(char **args, npy_intp const *dimensions, ptrdiff_t const *steps,
fft_loop(char **args, npy_intp const *dimensions, npy_intp const *steps,
void *func)
{
char *ip = args[0], *fp = args[1], *op = args[2];
size_t n_outer = (size_t)dimensions[0];
ptrdiff_t si = steps[0], sf = steps[1], so = steps[2];
npy_intp si = steps[0], sf = steps[1], so = steps[2];
size_t nin = (size_t)dimensions[1], nout = (size_t)dimensions[2];
ptrdiff_t step_in = steps[3], step_out = steps[4];
npy_intp step_in = steps[3], step_out = steps[4];
bool direction = *((bool *)func); /* pocketfft::FORWARD or BACKWARD */

assert (nout > 0);
Expand Down Expand Up @@ -144,9 +144,9 @@ rfft_impl(char **args, npy_intp const *dimensions, npy_intp const *steps,
{
char *ip = args[0], *fp = args[1], *op = args[2];
size_t n_outer = (size_t)dimensions[0];
ptrdiff_t si = steps[0], sf = steps[1], so = steps[2];
npy_intp si = steps[0], sf = steps[1], so = steps[2];
size_t nin = (size_t)dimensions[1], nout = (size_t)dimensions[2];
ptrdiff_t step_in = steps[3], step_out = steps[4];
npy_intp step_in = steps[3], step_out = steps[4];

assert (nout > 0 && nout == npts / 2 + 1);

Expand Down Expand Up @@ -233,14 +233,13 @@ irfft_loop(char **args, npy_intp const *dimensions, npy_intp const *steps, void
size_t nin = (size_t)dimensions[1], nout = (size_t)dimensions[2];
ptrdiff_t step_in = steps[3], step_out = steps[4];

size_t npts_in = nout / 2 + 1;

assert(nout > 0);

#ifndef POCKETFFT_NO_VECTORS
/*
* Call pocketfft directly if vectorization is possible.
*/
size_t npts_in = nout / 2 + 1;
constexpr auto vlen = pocketfft::detail::VLEN<T>::val;
if (vlen > 1 && n_outer >= vlen && nin >= npts_in && sf == 0) {
std::vector<size_t> axes = { 1 };
Expand Down
Loading