only use fillOneNodeReal in single threaded case.

JuliaMath · Mar 24, 2022 · 0257f23 · 0257f23 · tknopp · Mar 24, 2022
1 parent 66d6335
commit 0257f23
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "NFFT"
 uuid = "efe261a4-0d2b-5849-be55-fc731d526b0d"
 authors = ["Tobias Knopp <[email protected]>"]
-version = "0.12.0"
+version = "0.12.1"
 
 [deps]
 AbstractNFFTs = "7f219486-4aa7-41d6-80a7-e08ef20ceed7"

diff --git a/src/implementation.jl b/src/implementation.jl
@@ -3,7 +3,7 @@
 Base.@kwdef mutable struct NFFTParams{T}
   m::Int = 4
   σ::T = 2.0
-  reltol::T = 1e-9
+  reltol::T = 1e-7
   window::Symbol = :kaiser_bessel
   LUTSize::Int64 = 0
   precompute::PrecomputeFlags = POLYNOMIAL

diff --git a/src/multidimensional.jl b/src/multidimensional.jl
@@ -383,7 +383,8 @@ end
 
 @noinline function fillBlock!(p::NFFTPlan{T,D,1}, fHat, block, nodesInBlock, off, L::Val{Z}, scale, 
                               idxInBlock, winTensor, winPoly) where {T,D,Z}
-  if (D >= 3 && Z >= 10) || (D == 2 && Z >= 16) # magic
+  if (Threads.nthreads() == 1 || !NFFT._use_threads[]) &&
+      (D >= 3 && Z >= 10) || (D == 2 && Z >= 16) # magic 
     for (kLocal,k) in enumerate(nodesInBlock)
       fillOneNodeReal!(p, fHat, block, off, L, scale, k, kLocal, idxInBlock, winTensor, winPoly)
     end