Skip to content

Commit 49a1f56

Browse files
author
Vahid Tavanashad
committed
Merge branch 'master' into update-readme
2 parents b02eb89 + 5ff88df commit 49a1f56

6 files changed

Lines changed: 51 additions & 4 deletions

File tree

.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
persist-credentials: false
4040

4141
- name: "Run analysis"
42-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
42+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
4343
with:
4444
results_file: results.sarif
4545
results_format: sarif

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [dev] (MM/DD/YYYY)
7+
## [2.5.0] (05/DD/2025)
88

99
### Added
1010
* Added support for python 3.13 [gh-72](github.com/IntelPython/mkl-service/pull/72)
11+
* Added support in virtual environment out of the box [gh-79](github.com/IntelPython/mkl-service/pull/79)
1112

1213
### Changed
1314
* Migrated from `setup.py` to `pyproject.toml` [gh-66](github.com/IntelPython/mkl-service/pull/66)

conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "2.4.2" %}
1+
{% set version = "2.5.0" %}
22
{% set buildnumber = 0 %}
33

44
package:

mkl/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
import sys
2727

28+
from . import _init_helper
29+
2830

2931
class RTLD_for_MKL:
3032
def __init__(self):
@@ -57,3 +59,5 @@ def __exit__(self, *args):
5759

5860
from ._py_mkl_service import *
5961
from ._version import __version__
62+
63+
del _init_helper

mkl/_init_helper.py

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Copyright (c) 2025, Intel Corporation
2+
#
3+
# Redistribution and use in source and binary forms, with or without
4+
# modification, are permitted provided that the following conditions are met:
5+
#
6+
# * Redistributions of source code must retain the above copyright notice,
7+
# this list of conditions and the following disclaimer.
8+
# * Redistributions in binary form must reproduce the above copyright
9+
# notice, this list of conditions and the following disclaimer in the
10+
# documentation and/or other materials provided with the distribution.
11+
# * Neither the name of Intel Corporation nor the names of its contributors
12+
# may be used to endorse or promote products derived from this software
13+
# without specific prior written permission.
14+
#
15+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
16+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18+
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
19+
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20+
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
21+
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
22+
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
23+
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24+
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25+
26+
import os
27+
import os.path
28+
import sys
29+
30+
is_venv_win32 = (
31+
sys.platform == "win32"
32+
and sys.base_exec_prefix != sys.exec_prefix
33+
and os.path.isfile(os.path.join(sys.exec_prefix, "pyvenv.cfg"))
34+
)
35+
36+
if is_venv_win32:
37+
# In Windows venv: add Library/bin to PATH for proper DLL loading
38+
dll_dir = os.path.join(sys.exec_prefix, "Library", "bin")
39+
if os.path.isdir(dll_dir):
40+
os.add_dll_directory(dll_dir)
41+
42+
del is_venv_win32

mkl/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2.4.2"
1+
__version__ = "2.5.0"

0 commit comments

Comments
 (0)