Skip to content

Commit 41c623b

Browse files
committed
Revert upstream dll fix
The fix in IntelPython/mkl-service#79 only works when all libraries are installed in default paths while our own patch dynamically detects the library path and hence works much more generally.
1 parent 8ec9ce9 commit 41c623b

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

patches/mkl-service/dll_directory.patch

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
diff --git a/mkl/__init__.py b/mkl/__init__.py
2-
index 4a86a64..1ebe93a 100644
2+
index 635b707..1ebe93a 100644
33
--- a/mkl/__init__.py
44
+++ b/mkl/__init__.py
5-
@@ -23,7 +23,10 @@
5+
@@ -23,9 +23,10 @@
66
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
77
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
88

99
+import contextlib
1010
+import os
1111
import sys
12+
-
13+
-from . import _init_helper
1214
+from importlib.metadata import PackageNotFoundError, files
1315

1416

1517
class RTLD_for_MKL:
16-
@@ -41,6 +44,21 @@ class RTLD_for_MKL:
18+
@@ -43,6 +44,21 @@ class RTLD_for_MKL:
1719
sys.setdlopenflags(self.saved_rtld | ctypes.RTLD_GLOBAL)
1820
except AttributeError:
1921
pass
@@ -35,3 +37,9 @@ index 4a86a64..1ebe93a 100644
3537
del ctypes
3638

3739
def __exit__(self, *args):
40+
@@ -59,5 +75,3 @@ del sys
41+
42+
from ._py_mkl_service import *
43+
from ._version import __version__
44+
-
45+
-del _init_helper

0 commit comments

Comments
 (0)