fix kerevalmeth=0; temp fix python ci(retiring soon)

flatironinstitute · Jul 3, 2024 · 89a0797 · 89a0797
1 parent 4f6db34
commit 89a0797
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/python_build_win.ps1 b/.github/workflows/python_build_win.ps1
@@ -15,7 +15,7 @@ Add-Content -Path make.inc -Value "CXXFLAGS+= -march=x86-64"
 Set-Variable libvcruntime140_a -Value ([IO.Path]::Combine((Split-Path -Path $PYTHON), "libs", 'libvcruntime140.a'))
 Copy-Item -Path .\.github\workflows\libvcruntime140.a -Destination $libvcruntime140_a
 
-python -m pip install --upgrade setuptools wheel numpy pip
+python -m pip install --upgrade setuptools==70.1.1 wheel numpy pip
 if (-not $?) {throw "Failed pip install"}
 
 # mingw gcc compiler pacth to work with python

diff --git a/src/spreadinterp.cpp b/src/spreadinterp.cpp
@@ -739,6 +739,12 @@ void evaluate_kernel_vector(FLT *ker, FLT *args, const finufft_spread_opts &opts
     if (!(opts.flags & TF_OMIT_EVALUATE_EXPONENTIAL))
       for (int i = 0; i < Npad; i++) // Loop 2: Compute exponentials
         ker[i] = exp(ker[i]);
+    if (opts.kerpad) {
+      // padded part should be zero, in spread_subproblem_nd_kernels, there are
+      // out of bound writes to trg arrays
+      for (int i = N; i < Npad; ++i)
+        ker[i] = 0.0;
+    }
   } else {
     for (int i = 0; i < N; i++) // dummy for timing only
       ker[i] = 1.0;

diff --git a/tools/finufft/build-wheels-linux.sh b/tools/finufft/build-wheels-linux.sh
@@ -25,7 +25,6 @@ versions=("cp36-cp36m"
           "cp310-cp310"
           "cp311-cp311"
           "cp312-cp312"
-          "pp38-pypy38_pp73"
           "pp39-pypy39_pp73")
 
 pys=()