Skip to content
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

Jump to bottom

Fix nvcc compilation #316

Merged
merged 3 commits into from
Oct 28, 2024
Merged

Fix nvcc compilation #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be69877
Fix nvcc compilation
sjperkins Oct 28, 2024
40b15e2
Fix setuptools impotrs
sjperkins Oct 28, 2024
ececa7d
[skip ci] Update HISTORY.rst
sjperkins Oct 28, 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
1 change: 1 addition & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ History

X.Y.Z (YYYY-MM-DD)
------------------
* Fix nvcc compilation (:pr:`316`)
* Workaround numba #5929 (:pr:`312`)
* Restrict NumPy to less than 2.0.0 (:pr:`313`)

Expand Down
10 changes: 5 additions & 5 deletions africanus/util/nvcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

from os.path import join as pjoin

import distutils
from distutils import errors
from distutils import msvccompiler
from distutils import unixccompiler
import setuptools
from setuptools import errors
import setuptools._distutils._msvccompiler as msvccompiler
import setuptools._distutils.unixccompiler as unixccompiler

from africanus.util.code import format_code
from africanus.util.requirements import requires_optional
Expand Down Expand Up @@ -106,7 +106,7 @@ def get_cuda_path():
def get_nvcc_path():
nvcc = os.environ.get("NVCC", None)
if nvcc:
return distutils.split_quoted(nvcc)
return setuptools.split_quoted(nvcc)

cuda_path = get_cuda_path()
if cuda_path is None:
Expand Down