From be69877c3a45aef72a19d0524a63ec75422cecd2 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 28 Oct 2024 10:03:42 +0200 Subject: [PATCH 1/3] Fix nvcc compilation --- africanus/util/nvcc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/africanus/util/nvcc.py b/africanus/util/nvcc.py index 6b996b85..89c449c2 100644 --- a/africanus/util/nvcc.py +++ b/africanus/util/nvcc.py @@ -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 +from setuptools._distutils.ccompiler import msvccompiler +from setuptools._distutils.ccompiler import unixccompiler from africanus.util.code import format_code from africanus.util.requirements import requires_optional @@ -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: From 40b15e293428de1384c8dc3f5d62ab537bb6aa71 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 28 Oct 2024 10:21:27 +0200 Subject: [PATCH 2/3] Fix setuptools impotrs --- africanus/util/nvcc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/africanus/util/nvcc.py b/africanus/util/nvcc.py index 89c449c2..fe05ab73 100644 --- a/africanus/util/nvcc.py +++ b/africanus/util/nvcc.py @@ -16,8 +16,8 @@ import setuptools from setuptools import errors -from setuptools._distutils.ccompiler import msvccompiler -from setuptools._distutils.ccompiler import unixccompiler +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 From ececa7dab33bd80c4a5ffa4efbef7b77d7f1ba64 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 28 Oct 2024 10:52:54 +0200 Subject: [PATCH 3/3] [skip ci] Update HISTORY.rst --- HISTORY.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.rst b/HISTORY.rst index f1b20a76..bbbcaed3 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -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`)