Skip to content

[Backport 12.9.x] Fix pathfinder imports and handle access #816

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
merged 1 commit into from
Aug 7, 2025
Merged

[Backport 12.9.x] Fix pathfinder imports and handle access #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import win32api
cimport cuda.bindings._lib.dlfcn as dlfcn
from libc.stdint cimport uintptr_t
{{endif}}
from cuda.bindings import path_finder
from cuda.pathfinder import load_nvidia_dynamic_lib
from libc.stdint cimport intptr_t

cdef bint __cuPythonInit = False
Expand Down Expand Up @@ -49,10 +49,10 @@ cdef int cuPythonInit() except -1 nogil:
# Load library
{{if 'Windows' == platform.system()}}
with gil:
handle = path_finder._load_nvidia_dynamic_library("nvrtc").handle
handle = load_nvidia_dynamic_lib("nvrtc")._handle_uint
{{else}}
with gil:
handle = <void*><uintptr_t>path_finder._load_nvidia_dynamic_library("nvrtc").handle
handle = <void*><uintptr_t>load_nvidia_dynamic_lib("nvrtc")._handle_uint
{{endif}}


Expand Down
4 changes: 2 additions & 2 deletions cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ from libc.stdint cimport intptr_t, uintptr_t

from .utils import FunctionNotFoundError, NotSupportedError

from cuda.bindings import path_finder
from cuda.pathfinder import load_nvidia_dynamic_lib

import cython

Expand Down Expand Up @@ -71,7 +71,7 @@ cdef void* __cuFileSetParameterString = NULL


cdef void* load_library(const int driver_ver) except* with gil:
cdef uintptr_t handle = path_finder._load_nvidia_dynamic_library("cufile").handle
cdef uintptr_t handle = load_nvidia_dynamic_lib("cufile")._handle_uint
return <void*>handle


Expand Down
4 changes: 2 additions & 2 deletions cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ from libc.stdint cimport intptr_t, uintptr_t

from .utils import FunctionNotFoundError, NotSupportedError

from cuda.bindings import path_finder
from cuda.pathfinder import load_nvidia_dynamic_lib

###############################################################################
# Extern
Expand Down Expand Up @@ -53,7 +53,7 @@ cdef void* __nvJitLinkVersion = NULL


cdef void* load_library(int driver_ver) except* with gil:
cdef uintptr_t handle = path_finder._load_nvidia_dynamic_library("nvJitLink").handle
cdef uintptr_t handle = load_nvidia_dynamic_lib("nvJitLink")._handle_uint
return <void*>handle


Expand Down
4 changes: 2 additions & 2 deletions cuda_bindings/cuda/bindings/_internal/nvjitlink_windows.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ from libc.stdint cimport intptr_t

from .utils import FunctionNotFoundError, NotSupportedError

from cuda.bindings import path_finder
from cuda.pathfinder import load_nvidia_dynamic_lib

import win32api

Expand Down Expand Up @@ -61,7 +61,7 @@ cdef int _check_or_init_nvjitlink() except -1 nogil:
raise RuntimeError('something went wrong')

# Load library
handle = path_finder._load_nvidia_dynamic_library("nvJitLink").handle
handle = load_nvidia_dynamic_lib("nvJitLink")._handle_uint

# Load function
global __nvJitLinkCreate
Expand Down
4 changes: 2 additions & 2 deletions cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ from libc.stdint cimport intptr_t, uintptr_t

from .utils import FunctionNotFoundError, NotSupportedError

from cuda.bindings import path_finder
from cuda.pathfinder import load_nvidia_dynamic_lib

###############################################################################
# Extern
Expand Down Expand Up @@ -52,7 +52,7 @@ cdef void* __nvvmGetProgramLog = NULL


cdef void* load_library(const int driver_ver) except* with gil:
cdef uintptr_t handle = path_finder._load_nvidia_dynamic_library("nvvm").handle
cdef uintptr_t handle = load_nvidia_dynamic_lib("nvvm")._handle_uint
return <void*>handle


Expand Down
4 changes: 2 additions & 2 deletions cuda_bindings/cuda/bindings/_internal/nvvm_windows.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ from libc.stdint cimport intptr_t

from .utils import FunctionNotFoundError, NotSupportedError

from cuda.bindings import path_finder
from cuda.pathfinder import load_nvidia_dynamic_lib

import win32api

Expand Down Expand Up @@ -60,7 +60,7 @@ cdef int _check_or_init_nvvm() except -1 nogil:
raise RuntimeError('something went wrong')

# Load library
handle = path_finder._load_nvidia_dynamic_library("nvvm").handle
handle = load_nvidia_dynamic_lib("nvvm")._handle_uint

# Load function
global __nvvmGetErrorString
Expand Down
3 changes: 0 additions & 3 deletions cuda_bindings/cuda/bindings/_path_finder/README.md
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions cuda_bindings/cuda/bindings/_path_finder/temporary_backward_compatibility.py
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions cuda_bindings/cuda/bindings/path_finder.py
View file
Open in desktop

This file was deleted.

Loading