Remove some unnecessary uses of ContextResettingTestCase #507

gmarkall · 2025-10-07T12:16:30Z

Some cases that I think look safe to remove; a few more complicated ones still remain.

Testing on CI for now - seems to pass locally for me.

copy-pr-bot · 2025-10-07T12:16:33Z

Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

gmarkall · 2025-10-07T12:16:37Z

/ok to test

gmarkall · 2025-10-07T13:55:44Z

numba_cuda/numba/cuda/tests/cudadrv/test_select_device.py

        del dA
        del stream
-        cuda.close()
+        cuda.synchronize()


I think the intention of cuda.close() was to make sure any errors from asynchronous operations are detected; I think cuda.synchronize() should be sufficient for this purpose.

gmarkall · 2025-10-07T13:56:43Z

numba_cuda/numba/cuda/tests/cudadrv/test_reset_device.py



-class TestResetDevice(ContextResettingTestCase):
+class TestResetDevice(CUDATestCase):


The comment (and code) below suggests that the context on the main thread is unaffected (it creates new threads for the tests) so I think there should be no need to reset the context again after the test has run.

gmarkall · 2025-10-07T13:59:05Z

numba_cuda/numba/cuda/tests/cudapy/test_cuda_array_interface.py


 @skip_on_cudasim("CUDA Array Interface is not supported in the simulator")
-class TestCudaArrayInterface(ContextResettingTestCase):
+class TestCudaArrayInterface(CUDATestCase):


I don't think context resets are needed here - some tests check the list of pending deallocations and flush it, but that should not require a context reset.

copy-pr-bot · 2025-10-07T14:23:59Z

Auto-sync is disabled for ready for review pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

brandon-b-miller · 2025-10-08T01:54:07Z

numba_cuda/numba/cuda/tests/cudadrv/test_module_callbacks.py


 @skip_on_cudasim("Module loading not implemented in the simulator")
-class TestModuleCallbacksBasic(ContextResettingTestCase):
+class TestModuleCallbacksBasic(CUDATestCase):


Connected with @isVoid about these and they should be safe to remove.

One of the reasons I left this was because I hadn't dug into why it was used, and it wasn't obvious to me - can you share the reasoning please?

I believe it is superfluous. context.reset should have the effect of calling the finalizer on any modules.

brandon-b-miller · 2025-10-08T01:55:55Z

numba_cuda/numba/cuda/tests/cudadrv/test_host_alloc.py



-class TestHostAlloc(ContextResettingTestCase):
+class TestHostAlloc(CUDATestCase):


A lot of these are fairly old tests from the upstream numba code base where it looks like a lot of tests may have simply reset the device every time in an effort to be extra safe and start with a clean slate every time. This may have made sense at the time but might not anymore.

brandon-b-miller · 2025-10-08T12:10:14Z

/ok to test

brandon-b-miller · 2025-10-08T14:00:07Z

numba_cuda/numba/cuda/tests/cudadrv/test_cuda_memory.py

        self.context = devices.get_context()

    def tearDown(self):
+        self.context.reset()


cc @gmarkall I think this should clear things safely, this appears to free the resources within the context but is less scorched earth than a full reset

Does this mean it will no longer invalidate assumptions made by cuda-core?

@gmarkall are you asking if cuda.core protects against the context being reset in some kind of way, the answer is no. Resetting the context would 100% lead to any resources that existed being dangling and probably result in segfaults.

The reset name of this context method is perhaps a little misleading.

Step by step this method:

Calls reset on the context's MemoryManager, in this case a NumbaCUDAMemoryManager instance, whose implementation is inherited from HostOnlyCUDAMemoryManager here. This in turn calls clear on two of objects attached to the instance: First the allocations and then the deallocations. TL;DR, clearing the allocations member has the effect of adding everything the context allocated to its pending deallocs, and then deallocations.clear() eventually calls the dtor which maps to a true cuda free through the driver.

Does the same for all modules (same thing but terminating in cuModuleUnload)

Does the same for anything left in its own _PendingDeallocs list

My reading of this is that the net effect is that all resources owned by this context object are released - but it only releases resources it itself allocated.

This is distinct from the full gpu reset function called by ContextResettingTestCase which destroys all the contexts on the device. If cuda.core has cached contexts it interacts with internally after this is called, I can imagine things going wrong... but this particular kind of reset should just be cleaning up objects that are being carefully kept track of.

Thanks for clarifying - this makes sense.

brandon-b-miller · 2025-10-08T14:11:11Z

/ok to test

gmarkall

I think all the changes you made look good, but I note:

There is still a use of ContextResettingTestCase in test_managed_alloc - should that be there?
If the use in test_managed_alloc does get removed, can we delete the ContextResettingTestCase class from numba.cuda.testing so that nobody will be tempted to use it in future?

brandon-b-miller · 2025-10-09T00:07:00Z

/ok to test

brandon-b-miller · 2025-10-09T01:00:45Z

numba_cuda/numba/cuda/tests/cudadrv/test_context_stack.py

        # Reset before testing
-        cuda.close()
-
-    def test_gpus_current(self):


This test seems to rely on there being no active context at all which is hard to guarantee without the hard cuda.close.

brandon-b-miller · 2025-10-09T15:55:18Z

@gmarkall do these latest changes seem reasonable?

- Add support for cache-hinted load and store operations (NVIDIA#587) - Add more thirdparty tests (NVIDIA#586) - Add sphinx-lint to pre-commit and fix errors (NVIDIA#597) - Add DWARF variant part support for polymorphic variables in CUDA debug info (NVIDIA#544) - chore: clean up dead workaround for unavailable `lru_cache` (NVIDIA#598) - chore(docs): format types docs (NVIDIA#596) - refactor: decouple `Context` from `Stream` and `Event` objects (NVIDIA#579) - Fix freezing in of constant arrays with negative strides (NVIDIA#589) - Update tests to accept variants of generated PTX (NVIDIA#585) - refactor: replace device functionality with `cuda.core` APIs (NVIDIA#581) - Move frontend tests to `cudapy` namespace (NVIDIA#558) - Generalize the concurrency group for main merges (NVIDIA#582) - ci: move pre-commit checks to pre commit action (NVIDIA#577) - chore(pixi): set up doc builds; remove most `build-conda` dependencies (NVIDIA#574) - ci: ensure that python version in ci matches matrix (NVIDIA#575) - Fix the `cuda.is_supported_version()` API (NVIDIA#571) - Fix checks on main (NVIDIA#576) - feat: add `math.nextafter` (NVIDIA#543) - ci: replace conda testing with pixi (NVIDIA#554) - [CI] Run PR workflow on merge to main (NVIDIA#572) - Propose Alternative Module Path for `ext_types` and Maintain `numba.cuda.types.bfloat16` Import API (NVIDIA#569) - test: enable fail-on-warn and clean up resulting failures (NVIDIA#529) - [Refactor][NFC] Vendor-in compiler_lock for future CUDA-specific changes (NVIDIA#565) - Fix registration with Numba, vendor MakeFunctionToJITFunction tests (NVIDIA#566) - [Refactor][NFC][Cleanups] Update imports to upstream numba to use the numba.cuda modules (NVIDIA#561) - test: refactor process-based tests to use concurrent futures in order to simplify tests (NVIDIA#550) - test: revert back to ipc futures that await each iteration (NVIDIA#564) - chore(deps): move to self-contained pixi.toml to avoid mixed-pypi-pixi environments (NVIDIA#551) - [Refactor][NFC] Vendor-in errors for future CUDA-specific changes (NVIDIA#534) - Remove dependencies on target_extension for CUDA target (NVIDIA#555) - Relax the pinning to `cuda-core` to allow it floating across minor releases (NVIDIA#559) - [WIP] Port numpy reduction tests to CUDA (NVIDIA#523) - ci: add timeout to avoid blocking the job queue (NVIDIA#556) - Handle `cuda.core.Stream` in driver operations (NVIDIA#401) - feat: add support for `math.exp2` (NVIDIA#541) - Vendor in types and datamodel for CUDA-specific changes (NVIDIA#533) - refactor: cleanup device constructor (NVIDIA#548) - bench: add cupy to array constructor kernel launch benchmarks (NVIDIA#547) - perf: cache dimension computations (NVIDIA#542) - perf: remove duplicated size computation (NVIDIA#537) - chore(perf): add torch to benchmark (NVIDIA#539) - test: speed up ipc tests by ~6.5x (NVIDIA#527) - perf: speed up kernel launch (NVIDIA#510) - perf: remove context threading in various pointer abstractions (NVIDIA#536) - perf: reduce the number of `__cuda_array_interface__` accesses (NVIDIA#538) - refactor: remove unnecessary custom map and set implementations (NVIDIA#530) - [Refactor][NFC] Vendor-in vectorize decorators for future CUDA-specific changes (NVIDIA#513) - test: add benchmarks for kernel launch for reproducibility (NVIDIA#528) - test(pixi): update pixi testing command to work with the new `testing` directory (NVIDIA#522) - refactor: fully remove `USE_NV_BINDING` (NVIDIA#525) - Draft: Vendor in the IR module (NVIDIA#439) - pyproject.toml: add search path for Pyrefly (NVIDIA#524) - Vendor in numba.core.typing for CUDA-specific changes (NVIDIA#473) - Use numba.config when available, otherwise use numba.cuda.config (NVIDIA#497) - [MNT] Drop NUMBA_CUDA_USE_NVIDIA_BINDING; always use cuda.core and cuda.bindings as fallback (NVIDIA#479) - Vendor in dispatcher, entrypoints, pretty_annotate for CUDA-specific changes (NVIDIA#502) - build: allow parallelization of nvcc testing builds (NVIDIA#521) - chore(dev-deps): add pixi (NVIDIA#505) - Vendor the imputils module for CUDA refactoring (NVIDIA#448) - Don't use `MemoryLeakMixin` for tests that don't use NRT (NVIDIA#519) - Switch back to stable cuDF release in thirdparty tests (NVIDIA#518) - Updating .gitignore with binaries in the `testing` folder (NVIDIA#516) - Remove some unnecessary uses of ContextResettingTestCase (NVIDIA#507) - Vendor in _helperlib cext for CUDA-specific changes (NVIDIA#512) - Vendor in typeconv for future CUDA-specific changes (NVIDIA#499) - [Refactor][NFC] Vendor-in numba.cpython modules for future CUDA-specific changes (NVIDIA#493) - [Refactor][NFC] Vendor-in numba.np modules for future CUDA-specific changes (NVIDIA#494) - Make the CUDA target the default for CUDA overload decorators (NVIDIA#511) - Remove C extension loading hacks (NVIDIA#506) - Ensure NUMBA can manipulate memory from CUDA graphs before the graph is launched (NVIDIA#437) - [Refactor][NFC] Vendor-in core Numba analysis utils for CUDA-specific changes (NVIDIA#433) - Fix Bf16 Test OB Error (NVIDIA#509) - Vendor in components from numba.core.runtime for CUDA-specific changes (NVIDIA#498) - [Refactor] Vendor in _dispatcher, _devicearray, mviewbuf C extension for CUDA-specific customization (NVIDIA#373) - [MNT] Managed UM memset fallback and skip CUDA IPC tests on WSL2 (NVIDIA#488) - Improve debug value range coverage (NVIDIA#461) - Add `compile_all` API (NVIDIA#484) - Vendor in core.registry for CUDA-specific changes (NVIDIA#485) - [Refactor][NFC] Vendor in numba.misc for CUDA-specific changes (NVIDIA#457) - Vendor in optional, boxing for CUDA-specific changes, fix dangling imports (NVIDIA#476) - [test] Remove dependency on cpu_target (NVIDIA#490) - Change dangling imports of numba.core.lowering to numba.cuda.lowering (NVIDIA#475) - [test] Use numpy's tolerance for float16 (NVIDIA#491) - [Refactor][NFC] Vendor-in numba.extending for future CUDA-specific changes (NVIDIA#466) - [Refactor][NFC] Vendor-in more cpython registries for future CUDA-specific changes (NVIDIA#478)

- Add support for cache-hinted load and store operations (#587) - Add more thirdparty tests (#586) - Add sphinx-lint to pre-commit and fix errors (#597) - Add DWARF variant part support for polymorphic variables in CUDA debug info (#544) - chore: clean up dead workaround for unavailable `lru_cache` (#598) - chore(docs): format types docs (#596) - refactor: decouple `Context` from `Stream` and `Event` objects (#579) - Fix freezing in of constant arrays with negative strides (#589) - Update tests to accept variants of generated PTX (#585) - refactor: replace device functionality with `cuda.core` APIs (#581) - Move frontend tests to `cudapy` namespace (#558) - Generalize the concurrency group for main merges (#582) - ci: move pre-commit checks to pre commit action (#577) - chore(pixi): set up doc builds; remove most `build-conda` dependencies (#574) - ci: ensure that python version in ci matches matrix (#575) - Fix the `cuda.is_supported_version()` API (#571) - Fix checks on main (#576) - feat: add `math.nextafter` (#543) - ci: replace conda testing with pixi (#554) - [CI] Run PR workflow on merge to main (#572) - Propose Alternative Module Path for `ext_types` and Maintain `numba.cuda.types.bfloat16` Import API (#569) - test: enable fail-on-warn and clean up resulting failures (#529) - [Refactor][NFC] Vendor-in compiler_lock for future CUDA-specific changes (#565) - Fix registration with Numba, vendor MakeFunctionToJITFunction tests (#566) - [Refactor][NFC][Cleanups] Update imports to upstream numba to use the numba.cuda modules (#561) - test: refactor process-based tests to use concurrent futures in order to simplify tests (#550) - test: revert back to ipc futures that await each iteration (#564) - chore(deps): move to self-contained pixi.toml to avoid mixed-pypi-pixi environments (#551) - [Refactor][NFC] Vendor-in errors for future CUDA-specific changes (#534) - Remove dependencies on target_extension for CUDA target (#555) - Relax the pinning to `cuda-core` to allow it floating across minor releases (#559) - [WIP] Port numpy reduction tests to CUDA (#523) - ci: add timeout to avoid blocking the job queue (#556) - Handle `cuda.core.Stream` in driver operations (#401) - feat: add support for `math.exp2` (#541) - Vendor in types and datamodel for CUDA-specific changes (#533) - refactor: cleanup device constructor (#548) - bench: add cupy to array constructor kernel launch benchmarks (#547) - perf: cache dimension computations (#542) - perf: remove duplicated size computation (#537) - chore(perf): add torch to benchmark (#539) - test: speed up ipc tests by ~6.5x (#527) - perf: speed up kernel launch (#510) - perf: remove context threading in various pointer abstractions (#536) - perf: reduce the number of `__cuda_array_interface__` accesses (#538) - refactor: remove unnecessary custom map and set implementations (#530) - [Refactor][NFC] Vendor-in vectorize decorators for future CUDA-specific changes (#513) - test: add benchmarks for kernel launch for reproducibility (#528) - test(pixi): update pixi testing command to work with the new `testing` directory (#522) - refactor: fully remove `USE_NV_BINDING` (#525) - Draft: Vendor in the IR module (#439) - pyproject.toml: add search path for Pyrefly (#524) - Vendor in numba.core.typing for CUDA-specific changes (#473) - Use numba.config when available, otherwise use numba.cuda.config (#497) - [MNT] Drop NUMBA_CUDA_USE_NVIDIA_BINDING; always use cuda.core and cuda.bindings as fallback (#479) - Vendor in dispatcher, entrypoints, pretty_annotate for CUDA-specific changes (#502) - build: allow parallelization of nvcc testing builds (#521) - chore(dev-deps): add pixi (#505) - Vendor the imputils module for CUDA refactoring (#448) - Don't use `MemoryLeakMixin` for tests that don't use NRT (#519) - Switch back to stable cuDF release in thirdparty tests (#518) - Updating .gitignore with binaries in the `testing` folder (#516) - Remove some unnecessary uses of ContextResettingTestCase (#507) - Vendor in _helperlib cext for CUDA-specific changes (#512) - Vendor in typeconv for future CUDA-specific changes (#499) - [Refactor][NFC] Vendor-in numba.cpython modules for future CUDA-specific changes (#493) - [Refactor][NFC] Vendor-in numba.np modules for future CUDA-specific changes (#494) - Make the CUDA target the default for CUDA overload decorators (#511) - Remove C extension loading hacks (#506) - Ensure NUMBA can manipulate memory from CUDA graphs before the graph is launched (#437) - [Refactor][NFC] Vendor-in core Numba analysis utils for CUDA-specific changes (#433) - Fix Bf16 Test OB Error (#509) - Vendor in components from numba.core.runtime for CUDA-specific changes (#498) - [Refactor] Vendor in _dispatcher, _devicearray, mviewbuf C extension for CUDA-specific customization (#373) - [MNT] Managed UM memset fallback and skip CUDA IPC tests on WSL2 (#488) - Improve debug value range coverage (#461) - Add `compile_all` API (#484) - Vendor in core.registry for CUDA-specific changes (#485) - [Refactor][NFC] Vendor in numba.misc for CUDA-specific changes (#457) - Vendor in optional, boxing for CUDA-specific changes, fix dangling imports (#476) - [test] Remove dependency on cpu_target (#490) - Change dangling imports of numba.core.lowering to numba.cuda.lowering (#475) - [test] Use numpy's tolerance for float16 (#491) - [Refactor][NFC] Vendor-in numba.extending for future CUDA-specific changes (#466) - [Refactor][NFC] Vendor-in more cpython registries for future CUDA-specific changes (#478)

Remove some unnecessary uses of ContextResettingTestCase

e888d07

gmarkall added the 2 - In Progress Currently a work in progress label Oct 7, 2025

gmarkall commented Oct 7, 2025

View reviewed changes

gmarkall added 3 - Ready for Review Ready for review by team and removed 2 - In Progress Currently a work in progress labels Oct 7, 2025

gmarkall marked this pull request as ready for review October 7, 2025 14:23

gmarkall requested a review from brandon-b-miller October 7, 2025 14:24

kkraus14 previously approved these changes Oct 7, 2025

View reviewed changes

remove remaining cases

ee4b8d3

brandon-b-miller dismissed kkraus14’s stale review via ee4b8d3 October 8, 2025 01:53

brandon-b-miller reviewed Oct 8, 2025

View reviewed changes

kkraus14 previously approved these changes Oct 8, 2025

View reviewed changes

clean up memory without destroying the context

aae6461

brandon-b-miller dismissed kkraus14’s stale review via aae6461 October 8, 2025 13:56

brandon-b-miller reviewed Oct 8, 2025

View reviewed changes

reset in TestHostAlloc

90c8909

gmarkall commented Oct 8, 2025

View reviewed changes

gmarkall added 4 - Waiting on author Waiting for author to respond to review and removed 3 - Ready for Review Ready for review by team labels Oct 8, 2025

brandon-b-miller added 2 commits October 8, 2025 17:00

fix tests

bb10c44

remove ContextResettingTestCase

62c044e

brandon-b-miller reviewed Oct 9, 2025

View reviewed changes

kkraus14 approved these changes Oct 9, 2025

View reviewed changes

brandon-b-miller added 5 - Ready to merge Testing and reviews complete, ready to merge and removed 4 - Waiting on author Waiting for author to respond to review labels Oct 13, 2025

brandon-b-miller merged commit 99cab49 into NVIDIA:main Oct 13, 2025
76 checks passed

brandon-b-miller mentioned this pull request Oct 30, 2025

Handle cuda.core.Stream in driver operations #401

Merged

gmarkall mentioned this pull request Nov 20, 2025

Bump version to 0.21.0 #602

Merged



		class TestResetDevice(ContextResettingTestCase):
		class TestResetDevice(CUDATestCase):



		class TestHostAlloc(ContextResettingTestCase):
		class TestHostAlloc(CUDATestCase):

Remove some unnecessary uses of ContextResettingTestCase #507

Remove some unnecessary uses of ContextResettingTestCase #507

Uh oh!

Conversation

gmarkall commented Oct 7, 2025

Uh oh!

copy-pr-bot bot commented Oct 7, 2025

Uh oh!

gmarkall commented Oct 7, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

copy-pr-bot bot commented Oct 7, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

brandon-b-miller commented Oct 8, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

brandon-b-miller commented Oct 8, 2025

Uh oh!

gmarkall left a comment

Choose a reason for hiding this comment

Uh oh!

brandon-b-miller commented Oct 9, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

brandon-b-miller commented Oct 9, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants