diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index 9d3095ca..5556d926 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -6,6 +6,7 @@ channels: - conda-forge dependencies: - click >=8.1 +- cuda-core==0.3.* - cuda-nvcc-impl - cuda-nvrtc - cuda-version=12.9 @@ -15,7 +16,6 @@ dependencies: - kvikio==25.10.*,>=0.0.0a0 - numactl-devel-cos7-aarch64 - numba-cuda>=0.19.0,<0.20.0a0 -- numba>=0.60.0,<0.62.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 - pandas>=1.3 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index dd017054..2567ea4f 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -6,6 +6,7 @@ channels: - conda-forge dependencies: - click >=8.1 +- cuda-core==0.3.* - cuda-nvcc-impl - cuda-nvrtc - cuda-version=12.9 @@ -15,7 +16,6 @@ dependencies: - kvikio==25.10.*,>=0.0.0a0 - numactl-devel-cos7-x86_64 - numba-cuda>=0.19.0,<0.20.0a0 -- numba>=0.60.0,<0.62.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 - pandas>=1.3 diff --git a/dask_cuda/initialize.py b/dask_cuda/initialize.py index 7d731677..2317f8d5 100644 --- a/dask_cuda/initialize.py +++ b/dask_cuda/initialize.py @@ -5,7 +5,7 @@ import os import click -import numba.cuda +import cuda.core.experimental import dask from distributed.diagnostics.nvml import get_device_index_and_uuid, has_cuda_context @@ -18,11 +18,11 @@ def _create_cuda_context_handler(): if int(os.environ.get("DASK_CUDA_TEST_SINGLE_GPU", "0")) != 0: try: - numba.cuda.current_context() - except numba.cuda.cudadrv.error.CudaSupportError: + cuda.core.experimental.Device().set_current() + except Exception: pass else: - numba.cuda.current_context() + cuda.core.experimental.Device().set_current() def _warn_generic(): @@ -100,9 +100,6 @@ def _initialize_ucxx(): def _create_cuda_context(protocol="ucx"): - if protocol not in ["ucx", "ucxx", "ucx-old"]: - return - try: ucx_implementation = _get_active_ucx_implementation_name(protocol) except ValueError: diff --git a/dependencies.yaml b/dependencies.yaml index 43bafe11..7c6edfd7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -142,24 +142,12 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - click >=8.1 - - numba>=0.60.0,<0.62.0a0 + - cuda-core==0.3.* - numpy>=1.23,<3.0a0 - pandas>=1.3 - pynvml>=12.0.0,<13.0.0a0 - rapids-dask-dependency==25.10.*,>=0.0.0a0 - zict>=2.0.0 - - output_types: [conda] - packages: - - &numba_cuda numba-cuda>=0.19.0,<0.20.0a0 - specific: - - output_types: [requirements, pyproject] - matrices: - - matrix: {cuda: "12.*"} - packages: - - &numba_cuda_cu12 numba-cuda[cu12]>=0.19.0,<0.20.0a0 - - matrix: # Fallback for no matrix - packages: - - *numba_cuda_cu12 test_python: common: - output_types: [conda, requirements, pyproject] @@ -175,6 +163,8 @@ dependencies: - &kvikio_unsuffixed kvikio==25.10.*,>=0.0.0a0 - &ucx_py_unsuffixed ucx-py==0.46.*,>=0.0.0a0 - ucxx==0.46.*,>=0.0.0a0 + - &numba_cuda numba-cuda>=0.19.0,<0.20.0a0 + specific: - output_types: conda matrices: @@ -197,6 +187,7 @@ dependencies: - distributed-ucxx-cu12==0.46.*,>=0.0.0a0 - kvikio-cu12==25.10.*,>=0.0.0a0 - ucx-py-cu12==0.46.*,>=0.0.0a0 + - &numba_cuda_cu12 numba-cuda[cu12]>=0.19.0,<0.20.0a0 - matrix: packages: - *cudf_unsuffixed @@ -204,6 +195,7 @@ dependencies: - *distributed_ucxx_unsuffixed - *kvikio_unsuffixed - *ucx_py_unsuffixed + - *numba_cuda_cu12 depends_on_dask_cuda: common: - output_types: conda diff --git a/pyproject.toml b/pyproject.toml index 4d1bfb46..cad84bfd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,8 +18,7 @@ license = { text = "Apache-2.0" } requires-python = ">=3.10" dependencies = [ "click >=8.1", - "numba-cuda[cu12]>=0.19.0,<0.20.0a0", - "numba>=0.60.0,<0.62.0a0", + "cuda-core==0.3.*", "numpy>=1.23,<3.0a0", "pandas>=1.3", "pynvml>=12.0.0,<13.0.0a0",