From 9f5ce8177ac97b095383e15ada5a8508819ad0ff Mon Sep 17 00:00:00 2001
From: "Komarova, Evseniia" <evseniia.komarova@intel.com>
Date: Mon, 24 Mar 2025 16:23:23 +0100
Subject: [PATCH 1/2] Support mkl_fft in vritual environment out of the box

---
 mkl_fft/__init__.py     |  1 +
 mkl_fft/_init_helper.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 mkl_fft/_init_helper.py

diff --git a/mkl_fft/__init__.py b/mkl_fft/__init__.py
index 2649444a..dc1c2889 100644
--- a/mkl_fft/__init__.py
+++ b/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)
 
diff --git a/mkl_fft/_init_helper.py b/mkl_fft/_init_helper.py
new file mode 100644
index 00000000..7d56cbe6
--- /dev/null
+++ b/mkl_fft/_init_helper.py
@@ -0,0 +1,30 @@
+# Copyright 2020-2024 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:
+    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

From 52d81f4ad43871d93cbd65816b8b6efef59493d1 Mon Sep 17 00:00:00 2001
From: "Komarova, Evseniia" <evseniia.komarova@intel.com>
Date: Mon, 24 Mar 2025 17:47:26 +0100
Subject: [PATCH 2/2] Fix copyright and add comment

---
 mkl_fft/__init__.py     | 2 ++
 mkl_fft/_init_helper.py | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mkl_fft/__init__.py b/mkl_fft/__init__.py
index dc1c2889..a836abc7 100644
--- a/mkl_fft/__init__.py
+++ b/mkl_fft/__init__.py
@@ -33,3 +33,5 @@
 
 __all__ = ['fft', 'ifft', 'fft2', 'ifft2', 'fftn', 'ifftn', 'rfftpack', 'irfftpack'
            'rfft', 'irfft', 'rfft2', 'irfft2', 'rfftn', 'irfftn','interfaces']
+
+del _init_helper
diff --git a/mkl_fft/_init_helper.py b/mkl_fft/_init_helper.py
index 7d56cbe6..3a4c1ddc 100644
--- a/mkl_fft/_init_helper.py
+++ b/mkl_fft/_init_helper.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Intel Corporation
+# 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.
@@ -23,6 +23,7 @@
 )
 
 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)