Skip to content

Backport gh-1922 #1924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleksandr-pavlyk merged 5 commits into from
Dec 7, 2024
Merged

Backport gh-1922 #1924

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
220bfcf
Support dpctl in vritual environment out of the box
oleksandr-pavlyk Dec 4, 2024
9df5b28
Update dpctl/_init_helper.py
oleksandr-pavlyk Dec 5, 2024
231c9c6
More robust check that VIRUAL_ENV is valid
oleksandr-pavlyk Dec 6, 2024
1d1b5da
Avoid reliance of VIRTUAL_ENV environment variable
oleksandr-pavlyk Dec 6, 2024
2b08941
Add entry for 0.18.3 and item for gh-1924
oleksandr-pavlyk Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More robust check that VIRUAL_ENV is valid
  • Loading branch information
@oleksandr-pavlyk
oleksandr-pavlyk committed Dec 7, 2024
commit 231c9c64224a588260873b885223cd3c0a926439
8 changes: 5 additions & 3 deletions dpctl/_init_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
# with DPC++ libraries to the DLL search path gh-1745
if "VIRTUAL_ENV" in os.environ:
venv_dir = os.environ["VIRTUAL_ENV"]
expected_dir = os.path.join(venv_dir, "Library", "bin")
if os.path.exists(expected_dir):
os.add_dll_directory(expected_dir)
# Expect to find file per PEP-0405
expected_file = os.path.join(venv_dir, "pyvenv.cfg")
dll_dir = os.path.join(venv_dir, "Library", "bin")
if os.path.isdir(dll_dir) and os.path.isfile(expected_file):
os.add_dll_directory(dll_dir)