diff --git a/python/tests/backends/emulateInfleqtion.py b/python/tests/backends/emulateInfleqtion.py index 9e88905e81a..5b4a26a2f81 100644 --- a/python/tests/backends/emulateInfleqtion.py +++ b/python/tests/backends/emulateInfleqtion.py @@ -12,7 +12,7 @@ @pytest.fixture(scope="session", autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("infleqtion", emulate=True) yield "Running the tests." cudaq.__clearKernelRegistries() diff --git a/python/tests/backends/test_Infleqtion.py b/python/tests/backends/test_Infleqtion.py index 3bddda684cf..ea9e9427b63 100644 --- a/python/tests/backends/test_Infleqtion.py +++ b/python/tests/backends/test_Infleqtion.py @@ -17,7 +17,7 @@ @pytest.fixture(scope="session", autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("infleqtion") yield "Running the tests." cudaq.__clearKernelRegistries() diff --git a/python/tests/backends/test_Pasqal.py b/python/tests/backends/test_Pasqal.py index 9336a0e09df..80ae343631f 100644 --- a/python/tests/backends/test_Pasqal.py +++ b/python/tests/backends/test_Pasqal.py @@ -17,7 +17,8 @@ @pytest.fixture(scope="session", autouse=True) -def do_something(): + +def set_up_target(): # NOTE: Credentials can be set with environment variables. # This test covers the direct `pasqal` backend only. # QRMI-routed execution is validated separately because it requires a diff --git a/python/tests/backends/test_QuEra.py b/python/tests/backends/test_QuEra.py index 44998922bbd..9f6dcf01727 100644 --- a/python/tests/backends/test_QuEra.py +++ b/python/tests/backends/test_QuEra.py @@ -16,7 +16,7 @@ @pytest.fixture(scope="session", autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("quera") yield "Running the tests." cudaq.reset_target() diff --git a/python/tests/backends/test_braket.py b/python/tests/backends/test_braket.py index afdb5a898b3..c5ce06c9a82 100644 --- a/python/tests/backends/test_braket.py +++ b/python/tests/backends/test_braket.py @@ -19,7 +19,7 @@ @pytest.fixture(scope="session", autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("braket") yield "Running the tests." cudaq.__clearKernelRegistries() diff --git a/python/tests/backends/test_scaleway.py b/python/tests/backends/test_scaleway.py index 5cd369b422e..8ed22210932 100644 --- a/python/tests/backends/test_scaleway.py +++ b/python/tests/backends/test_scaleway.py @@ -21,7 +21,7 @@ @pytest.fixture(scope="session", autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("scaleway", machine="EMU-CUDAQ-64C-512M", max_duration="5m", diff --git a/python/tests/backends/test_tii.py b/python/tests/backends/test_tii.py index 25138927e74..2db4e1d6823 100644 --- a/python/tests/backends/test_tii.py +++ b/python/tests/backends/test_tii.py @@ -21,7 +21,7 @@ @pytest.fixture(scope="session", autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("tii", device="tii-sim", project=os.environ.get("TII_PROJECT", None)) diff --git a/python/tests/custom/test_custom_operations.py b/python/tests/custom/test_custom_operations.py index b9d9f7eac4d..78f38d5af67 100644 --- a/python/tests/custom/test_custom_operations.py +++ b/python/tests/custom/test_custom_operations.py @@ -12,7 +12,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def reset_and_run(): cudaq.reset_target() yield ## Ref: https://github.com/NVIDIA/cuda-quantum/issues/1954 diff --git a/python/tests/dynamics/integrators/test_evolve_dynamics_torch_integrators.py b/python/tests/dynamics/integrators/test_evolve_dynamics_torch_integrators.py index 2aa986aa21d..9bda060efc3 100644 --- a/python/tests/dynamics/integrators/test_evolve_dynamics_torch_integrators.py +++ b/python/tests/dynamics/integrators/test_evolve_dynamics_torch_integrators.py @@ -21,7 +21,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("dynamics") yield cudaq.reset_target() diff --git a/python/tests/dynamics/test_evolve_dynamics.py b/python/tests/dynamics/test_evolve_dynamics.py index 3bf05ff4de7..84417af34cf 100644 --- a/python/tests/dynamics/test_evolve_dynamics.py +++ b/python/tests/dynamics/test_evolve_dynamics.py @@ -18,7 +18,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("dynamics") yield cudaq.reset_target() diff --git a/python/tests/dynamics/test_evolve_simulators.py b/python/tests/dynamics/test_evolve_simulators.py index 641856d6b84..861adef6869 100644 --- a/python/tests/dynamics/test_evolve_simulators.py +++ b/python/tests/dynamics/test_evolve_simulators.py @@ -15,7 +15,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("density-matrix-cpu") yield cudaq.reset_target() diff --git a/python/tests/handlers/test_photonics_kernel.py b/python/tests/handlers/test_photonics_kernel.py index 456514f76da..2ad6c47737c 100644 --- a/python/tests/handlers/test_photonics_kernel.py +++ b/python/tests/handlers/test_photonics_kernel.py @@ -14,7 +14,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target("orca-photonics") yield cudaq.__clearKernelRegistries() diff --git a/python/tests/interop/test_interop.py b/python/tests/interop/test_interop.py index 858f0190da3..de8ff4264c5 100644 --- a/python/tests/interop/test_interop.py +++ b/python/tests/interop/test_interop.py @@ -10,7 +10,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_assignments.py b/python/tests/kernel/test_assignments.py index 0650c965581..e12bbd219cf 100644 --- a/python/tests/kernel/test_assignments.py +++ b/python/tests/kernel/test_assignments.py @@ -13,7 +13,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_control_negations.py b/python/tests/kernel/test_control_negations.py index a7e285ca530..8fb34f94c75 100644 --- a/python/tests/kernel/test_control_negations.py +++ b/python/tests/kernel/test_control_negations.py @@ -12,7 +12,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_direct_call_return_kernel.py b/python/tests/kernel/test_direct_call_return_kernel.py index 039966ddb18..0a43e902643 100644 --- a/python/tests/kernel/test_direct_call_return_kernel.py +++ b/python/tests/kernel/test_direct_call_return_kernel.py @@ -27,7 +27,7 @@ def is_close_array(actual, expected): @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_explicit_measurements.py b/python/tests/kernel/test_explicit_measurements.py index b29d55e50ee..2c69837c080 100644 --- a/python/tests/kernel/test_explicit_measurements.py +++ b/python/tests/kernel/test_explicit_measurements.py @@ -17,7 +17,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def reset_run_clear(): cudaq.reset_target() yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_ir_operations.py b/python/tests/kernel/test_ir_operations.py index 75303d4f9ea..e25400f3f66 100644 --- a/python/tests/kernel/test_ir_operations.py +++ b/python/tests/kernel/test_ir_operations.py @@ -15,7 +15,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_kernel_features.py b/python/tests/kernel/test_kernel_features.py index 125a63046f8..b3b99086028 100644 --- a/python/tests/kernel/test_kernel_features.py +++ b/python/tests/kernel/test_kernel_features.py @@ -20,7 +20,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_kernel_parameters.py b/python/tests/kernel/test_kernel_parameters.py index e1ef9279c79..72797d4a259 100644 --- a/python/tests/kernel/test_kernel_parameters.py +++ b/python/tests/kernel/test_kernel_parameters.py @@ -18,7 +18,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_library_kernels.py b/python/tests/kernel/test_library_kernels.py index daf6b5d06b7..3135346b627 100644 --- a/python/tests/kernel/test_library_kernels.py +++ b/python/tests/kernel/test_library_kernels.py @@ -13,7 +13,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_observe_kernel.py b/python/tests/kernel/test_observe_kernel.py index 4617c44279e..b5d27e366a5 100644 --- a/python/tests/kernel/test_observe_kernel.py +++ b/python/tests/kernel/test_observe_kernel.py @@ -17,7 +17,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_run_async_kernel.py b/python/tests/kernel/test_run_async_kernel.py index fa9023f2c24..ec5c7dcda82 100644 --- a/python/tests/kernel/test_run_async_kernel.py +++ b/python/tests/kernel/test_run_async_kernel.py @@ -29,7 +29,7 @@ def is_close_array(actual, expected): @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_run_kernel.py b/python/tests/kernel/test_run_kernel.py index 684558d8257..5ac44ea0286 100644 --- a/python/tests/kernel/test_run_kernel.py +++ b/python/tests/kernel/test_run_kernel.py @@ -33,7 +33,7 @@ def is_close_array(actual, expected): @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_sample_kernel.py b/python/tests/kernel/test_sample_kernel.py index f224fcddb62..97a11d94db2 100644 --- a/python/tests/kernel/test_sample_kernel.py +++ b/python/tests/kernel/test_sample_kernel.py @@ -16,7 +16,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_state_kernel.py b/python/tests/kernel/test_state_kernel.py index 56c65e792d8..3172178f9cd 100644 --- a/python/tests/kernel/test_state_kernel.py +++ b/python/tests/kernel/test_state_kernel.py @@ -19,7 +19,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/kernel/test_state_mps.py b/python/tests/kernel/test_state_mps.py index 60dc7e4da7b..596048b1645 100644 --- a/python/tests/kernel/test_state_mps.py +++ b/python/tests/kernel/test_state_mps.py @@ -21,7 +21,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() cudaq.reset_target() diff --git a/python/tests/kernel/test_target_attributes.py b/python/tests/kernel/test_target_attributes.py index d71afe1c744..6122557e334 100644 --- a/python/tests/kernel/test_target_attributes.py +++ b/python/tests/kernel/test_target_attributes.py @@ -15,7 +15,7 @@ @pytest.fixture -def do_something(): +def set_up_target(): cudaq.set_target("nvidia", option="fp32") yield "Running the tests." cudaq.__clearKernelRegistries() @@ -23,7 +23,7 @@ def do_something(): @skipIfNoGPU -def test_target_valid_option_attribute(do_something): +def test_target_valid_option_attribute(set_up_target): """Tests the target valid option attribute.""" target = cudaq.get_target() diff --git a/python/tests/kernel/test_unpack.py b/python/tests/kernel/test_unpack.py index 13630630eb5..3de99f10580 100644 --- a/python/tests/kernel/test_unpack.py +++ b/python/tests/kernel/test_unpack.py @@ -13,7 +13,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/parallel/test_mpi_mqpu.py b/python/tests/parallel/test_mpi_mqpu.py index 2db3f567300..d4bdf5c2d0a 100644 --- a/python/tests/parallel/test_mpi_mqpu.py +++ b/python/tests/parallel/test_mpi_mqpu.py @@ -23,7 +23,7 @@ def mpi_init_finalize(): @pytest.fixture(autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target('nvidia-mqpu') yield cudaq.__clearKernelRegistries() diff --git a/python/tests/parallel/test_mqpu.py b/python/tests/parallel/test_mqpu.py index 4406e53e778..7a418171e8e 100644 --- a/python/tests/parallel/test_mqpu.py +++ b/python/tests/parallel/test_mqpu.py @@ -22,7 +22,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def set_up_target(): cudaq.set_target('nvidia-mqpu') try: assert cudaq.get_target().num_qpus( diff --git a/python/tests/remote/test_remote_platform.py b/python/tests/remote/test_remote_platform.py index f1d5ea5a985..39dd393a648 100644 --- a/python/tests/remote/test_remote_platform.py +++ b/python/tests/remote/test_remote_platform.py @@ -70,7 +70,7 @@ def startUpMockServer(): @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/visualization/test_bloch_sphere.py b/python/tests/visualization/test_bloch_sphere.py index 4d386e0d531..cb7317d5a6b 100644 --- a/python/tests/visualization/test_bloch_sphere.py +++ b/python/tests/visualization/test_bloch_sphere.py @@ -19,7 +19,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def run_and_clear_registries(): yield cudaq.__clearKernelRegistries() diff --git a/python/tests/visualization/test_draw.py b/python/tests/visualization/test_draw.py index f73174d1aef..b25a84bcf45 100644 --- a/python/tests/visualization/test_draw.py +++ b/python/tests/visualization/test_draw.py @@ -13,7 +13,7 @@ @pytest.fixture(autouse=True) -def do_something(): +def reset_run_clear(): cudaq.reset_target() yield cudaq.__clearKernelRegistries()