address review feedback

Author: juenglin

cuda_core/examples/batched_memcpy.py

@@ -18,6 +18,7 @@
 # dependencies = ["cuda_bindings", "cuda_core"]
 # ///
 
+import ctypes
 import sys
 
 from cuda.core import Device, Host, LegacyPinnedMemoryResource, ManagedMemoryResource
@@ -29,7 +30,6 @@ def readback(any_buf, pinned_mr, *, stream):
     host_buf = pinned_mr.allocate(any_buf.size)
     any_buf.copy_to(host_buf, stream=stream)
     stream.sync()
-    import ctypes
 
     ptr = ctypes.cast(int(host_buf.handle), ctypes.POINTER(ctypes.c_byte))
     data = ctypes.string_at(ptr, host_buf.size)

cuda_core/tests/example_tests/test_basic_examples.py

@@ -76,18 +76,11 @@ def has_recent_memory_pool_support() -> bool:
 
 def has_copy_batch_support() -> bool:
     """Check if cuMemcpyBatchAsync is available (CUDA 13+)."""
-    from cuda.core._utils.version import binding_version
+    from cuda.core._memory._copy_ops import (
+        _batch_entry_point_in_use as cu_memcpy_batch_available,
+    )
 
-    if binding_version() < (13, 0, 0):
-        return False
-    try:
-        from cuda.bindings import driver
-
-        if not hasattr(driver, "cuMemcpyBatchAsync"):
-            return False
-    except AttributeError:
-        return False
-    return True
+    return cu_memcpy_batch_available()
 
 
 SYSTEM_REQUIREMENTS = {

cuda_core/tests/memory/__init__.py

@@ -1,18 +1,3 @@
 # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
-
-# Marks `tests/memory` as a package. Under pytest's default "prepend" import
-# mode, a test file's sys.path entry is the first parent directory *without* an
-# __init__.py. Adding this file moves that entry up from `tests/memory` to
-# `tests/`, which is what we want for two reasons:
-#
-#   * `tests/memory` is no longer on sys.path, so the `from conftest import ...`
-#     in test_managed_ops.py resolves to the root tests/conftest.py. Without it
-#     the local memory/conftest.py wins and the import fails with ImportError.
-#   * Modules are named `memory.test_x` rather than `test_x`, so a file basename
-#     reused under another directory cannot collide.
-#
-# Both follow from module identity tracking the directory layout instead of
-# whichever directory happens to land on sys.path. `tests/memory_ipc/` carries
-# an __init__.py for the same reasons.

cuda_core/tests/memory/conftest.py

@@ -12,36 +12,16 @@
 from helpers.copy_batch import COPY_BATCH_COUNT, COPY_BATCH_SIZE
 
 from cuda.core import Device, LegacyPinnedMemoryResource
-from cuda.core._memory._copy_ops import _batch_entry_point_in_use
 
 
 @pytest.fixture
 def copy_batch_device(init_cuda):
-    """``copy_batch`` works on every supported toolkit, so this never skips.
-
-    Only non-default ``CopyOptions`` need CUDA 13; those tests take
-    ``requires_copy_options`` as well.
-    """
+    """``copy_batch`` works on every supported toolkit, so this never skips."""
     device = Device()
     device.set_current()
     return device
 
 
-@pytest.fixture
-def requires_copy_options():
-    """Skip when ``CopyOptions`` cannot reach the driver.
-
-    Options travel only through ``cuMemcpyBatchAsync``. Where that is
-    unavailable, ``copy_batch`` falls back to per-copy ``cuMemcpyAsync``,
-    which cannot convey attributes, so non-default options are rejected.
-    """
-    if not _batch_entry_point_in_use():
-        pytest.skip(
-            "non-default CopyOptions requires cuda.core built against CUDA 13, "
-            "cuda.bindings 13.0+, and a driver reporting CUDA 13.0 or newer"
-        )
-
-
 @pytest.fixture
 def copy_stream(copy_batch_device):
     """The single stream used for both allocation and copies in a test.

cuda_core/tests/memory/test_copy_batch_options.py

@@ -24,7 +24,12 @@
 
 from cuda.core import Device, Host, LegacyPinnedMemoryResource
 from cuda.core._memory._copy_enums import _attr_run_starts
-from cuda.core._memory._copy_ops import _batch_entry_point_in_use, _normalize_copy_options
+from cuda.core._memory._copy_ops import (
+    _batch_entry_point_in_use as cu_memcpy_batch_available,
+)
+from cuda.core._memory._copy_ops import (
+    _normalize_copy_options,
+)
 from cuda.core.utils import (
     CopyOptions,
     MemcpyOverlapMode,
@@ -356,7 +361,7 @@ class TestPerCopyFallback:
 
     @pytest.fixture(autouse=True)
     def _skip_if_batched(self):
-        if _batch_entry_point_in_use():
+        if cu_memcpy_batch_available():
             pytest.skip("cuMemcpyBatchAsync is in use; fallback path not exercised")
 
     @pytest.mark.agent_authored(model="Claude Opus 5")