From 334abcd2205839eb7babb262471abe3f59d16334 Mon Sep 17 00:00:00 2001 From: "Komarova, Evseniia" Date: Tue, 27 May 2025 16:04:07 +0200 Subject: [PATCH 1/2] Support mkl-service in virtual environment out of the box --- mkl/__init__.py | 3 +++ mkl/_init_helper.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 mkl/_init_helper.py diff --git a/mkl/__init__.py b/mkl/__init__.py index 4a86a64..a5ba4ef 100644 --- a/mkl/__init__.py +++ b/mkl/__init__.py @@ -24,6 +24,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import sys +from . import _init_helper class RTLD_for_MKL: @@ -57,3 +58,5 @@ def __exit__(self, *args): from ._py_mkl_service import * from ._version import __version__ + +del _init_helper diff --git a/mkl/_init_helper.py b/mkl/_init_helper.py new file mode 100644 index 0000000..3a4c1dd --- /dev/null +++ b/mkl/_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 From f0fa8326ace9e2d92485aa5e2af3366c305c6a11 Mon Sep 17 00:00:00 2001 From: "Komarova, Evseniia" Date: Wed, 28 May 2025 17:09:06 +0200 Subject: [PATCH 2/2] Update license and fix pre-commit failure --- mkl/__init__.py | 1 + mkl/_init_helper.py | 31 +++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/mkl/__init__.py b/mkl/__init__.py index a5ba4ef..635b707 100644 --- a/mkl/__init__.py +++ b/mkl/__init__.py @@ -24,6 +24,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import sys + from . import _init_helper diff --git a/mkl/_init_helper.py b/mkl/_init_helper.py index 3a4c1dd..b5f21b8 100644 --- a/mkl/_init_helper.py +++ b/mkl/_init_helper.py @@ -1,16 +1,27 @@ -# Copyright 2025 Intel Corporation +# Copyright (c) 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 +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: # -# http://www.apache.org/licenses/LICENSE-2.0 +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of Intel Corporation nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. # -# 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. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# 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. import os import os.path