Merge branch 'master' into raise-warning

Author: Vahid Tavanashad

conda-recipe-cf/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "1.3.11" %}
+{% set version = "1.3.13" %}
 {% set buildnumber = 0 %}
 
 package:

conda-recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "1.3.11" %}
+{% set version = "1.3.13" %}
 {% set buildnumber = 0 %}
 
 package:

mkl_fft/__init__.py

@@ -24,6 +24,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from . import _init_helper
 from ._pydfti import (fft, ifft, fft2, ifft2, fftn, ifftn, rfftpack, irfftpack,
                       rfft, irfft, rfft2, irfft2, rfftn, irfftn)
 
@@ -32,3 +33,5 @@
 
 __all__ = ['fft', 'ifft', 'fft2', 'ifft2', 'fftn', 'ifftn', 'rfftpack', 'irfftpack'
            'rfft', 'irfft', 'rfft2', 'irfft2', 'rfftn', 'irfftn','interfaces']
+
+del _init_helper

mkl_fft/_init_helper.py

@@ -0,0 +1,31 @@
+# Copyright 2025 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import os.path
+import sys
+
+is_venv_win32 = (
+    sys.platform == "win32"
+    and sys.base_exec_prefix != sys.exec_prefix
+    and os.path.isfile(os.path.join(sys.exec_prefix, "pyvenv.cfg"))
+)
+
+if is_venv_win32:
+    # In Windows venv: add Library/bin to PATH for proper DLL loading
+    dll_dir = os.path.join(sys.exec_prefix, "Library", "bin")
+    if os.path.isdir(dll_dir):
+        os.add_dll_directory(dll_dir)
+
+del is_venv_win32

mkl_fft/_numpy_fft.py

@@ -72,16 +72,13 @@ def _check_norm(norm):
 
 
 def frwd_sc_1d(n, s):
-    nn = n if n else s
+    nn = n if n is not None else s
     return 1/nn if nn != 0 else 1
 
 
-def frwd_sc_nd(s, axes, x_shape):
+def frwd_sc_nd(s, x_shape):
     ss = s if s is not None else x_shape
-    if axes is not None:
-        nn = prod([ss[ai] for ai in axes])
-    else:
-        nn = prod(ss)
+    nn = prod(ss)
     return 1/nn if nn != 0 else 1
 
 
@@ -837,14 +834,14 @@ def fftn(a, s=None, axes=None, norm=None):
     if norm in (None, "backward"):
         fsc = 1.0
     elif norm == "forward":
-        fsc = frwd_sc_nd(s, axes, x.shape)
+        fsc = frwd_sc_nd(s, x.shape)
     else:
-        fsc = sqrt(frwd_sc_nd(s, axes, x.shape))
+        fsc = sqrt(frwd_sc_nd(s, x.shape))
 
     return trycall(
         mkl_fft.fftn,
         (x,),
-        {'shape': s, 'axes': axes,
+        {'s': s, 'axes': axes,
          'fwd_scale': fsc})
 
 
@@ -954,14 +951,14 @@ def ifftn(a, s=None, axes=None, norm=None):
     if norm in (None, "backward"):
         fsc = 1.0
     elif norm == "forward":
-        fsc = frwd_sc_nd(s, axes, x.shape)
+        fsc = frwd_sc_nd(s, x.shape)
     else:
-        fsc = sqrt(frwd_sc_nd(s, axes, x.shape))
+        fsc = sqrt(frwd_sc_nd(s, x.shape))
 
     return trycall(
         mkl_fft.ifftn,
         (x,),
-        {'shape': s, 'axes': axes,
+        {'s': s, 'axes': axes,
          'fwd_scale': fsc})
 
 
@@ -1253,10 +1250,10 @@ def rfftn(a, s=None, axes=None, norm=None):
         fsc = 1.0
     elif norm == "forward":
         x = asanyarray(x)
-        fsc = frwd_sc_nd(s, axes, x.shape)
+        fsc = frwd_sc_nd(s, x.shape)
     else:
         x = asanyarray(x)
-        fsc = sqrt(frwd_sc_nd(s, axes, x.shape))
+        fsc = sqrt(frwd_sc_nd(s, x.shape))
 
     return trycall(
         mkl_fft.rfftn,
@@ -1408,10 +1405,10 @@ def irfftn(a, s=None, axes=None, norm=None):
         fsc = 1.0
     elif norm == "forward":
         x = asanyarray(x)
-        fsc = frwd_sc_nd(s, axes, x.shape)
+        fsc = frwd_sc_nd(s, x.shape)
     else:
         x = asanyarray(x)
-        fsc = sqrt(frwd_sc_nd(s, axes, x.shape))
+        fsc = sqrt(frwd_sc_nd(s, x.shape))
 
     return trycall(
         mkl_fft.irfftn,