warp-lang 1.0.0b5__py3-none-manylinux2014_x86_64.whl → 1.0.0b6__py3-none-manylinux2014_x86_64.whl

warp/tests/test_bvh.py

@@ -10,8 +10,7 @@ import unittest
 import numpy as np
 
 import warp as wp
-from warp.tests.test_base import *
-
+from warp.tests.unittest_utils import *
 
 wp.init()
 
@@ -118,8 +117,8 @@ def test_bvh(test, type, device):
         if test_case == 0:
             lowers = rng.random(size=(num_bounds, 3)) * 5.0
             uppers = lowers + rng.random(size=(num_bounds, 3)) * 5.0
-            wp.copy(device_lowers, wp.array(lowers, dtype=wp.vec3))
-            wp.copy(device_uppers, wp.array(uppers, dtype=wp.vec3))
+            wp.copy(device_lowers, wp.array(lowers, dtype=wp.vec3, device=device))
+            wp.copy(device_uppers, wp.array(uppers, dtype=wp.vec3, device=device))
             bvh.refit()
             bounds_intersected.zero_()
 
@@ -132,19 +131,17 @@ def test_bvh_query_ray(test, device):
     test_bvh(test, "ray", device)
 
 
-def register(parent):
-    devices = get_test_devices()
+devices = get_test_devices()
+
 
-    class TestBvh(parent):
-        pass
+class TestBvh(unittest.TestCase):
+    pass
 
-    add_function_test(TestBvh, "test_bvh_aabb", test_bvh_query_aabb, devices=devices)
-    add_function_test(TestBvh, "test_bvh_ray", test_bvh_query_ray, devices=devices)
 
-    return TestBvh
+add_function_test(TestBvh, "test_bvh_aabb", test_bvh_query_aabb, devices=devices)
+add_function_test(TestBvh, "test_bvh_ray", test_bvh_query_ray, devices=devices)
 
 
 if __name__ == "__main__":
     wp.build.clear_kernel_cache()
-    _ = register(unittest.TestCase)
     unittest.main(verbosity=2)

warp/tests/test_closest_point_edge_edge.py

@@ -5,12 +5,12 @@
 # distribution of this software and related documentation without an express
 # license agreement from NVIDIA CORPORATION is strictly prohibited.
 
-import numpy as np
-
 import unittest
 
+import numpy as np
+
 import warp as wp
-from warp.tests.test_base import *
+from warp.tests.unittest_utils import *
 
 wp.init()
 epsilon = 0.00001
@@ -171,62 +171,58 @@ def test_edge_edge_perpendicular_s0_t1(test, device):
     test.assertAlmostEqual(st0[1], 1.0)  # t value
 
 
-def register(parent):
-    devices = get_test_devices()
-
-    class TestClosestPointEdgeEdgeMethods(parent):
-        pass
-
-    add_function_test(
-        TestClosestPointEdgeEdgeMethods,
-        "test_edge_edge_middle_crossing",
-        test_edge_edge_middle_crossing,
-        devices=devices,
-    )
-    add_function_test(
-        TestClosestPointEdgeEdgeMethods, "test_edge_edge_parallel_s1_t0", test_edge_edge_parallel_s1_t0, devices=devices
-    )
-    add_function_test(
-        TestClosestPointEdgeEdgeMethods, "test_edge_edge_parallel_s0_t1", test_edge_edge_parallel_s0_t1, devices=devices
-    )
-    add_function_test(
-        TestClosestPointEdgeEdgeMethods,
-        "test_edge_edge_both_degenerate_case",
-        test_edge_edge_both_degenerate_case,
-        devices=devices,
-    )
-    add_function_test(
-        TestClosestPointEdgeEdgeMethods,
-        "test_edge_edge_degenerate_first_edge",
-        test_edge_edge_degenerate_first_edge,
-        devices=devices,
-    )
-    add_function_test(
-        TestClosestPointEdgeEdgeMethods,
-        "test_edge_edge_degenerate_second_edge",
-        test_edge_edge_degenerate_second_edge,
-        devices=devices,
-    )
-    add_function_test(
-        TestClosestPointEdgeEdgeMethods, "test_edge_edge_parallel", test_edge_edge_parallel, devices=devices
-    )
-    add_function_test(
-        TestClosestPointEdgeEdgeMethods,
-        "test_edge_edge_perpendicular_s1_t0",
-        test_edge_edge_perpendicular_s1_t0,
-        devices=devices,
-    )
-    add_function_test(
-        TestClosestPointEdgeEdgeMethods,
-        "test_edge_edge_perpendicular_s0_t1",
-        test_edge_edge_perpendicular_s0_t1,
-        devices=devices,
-    )
-
-    return TestClosestPointEdgeEdgeMethods
+devices = get_test_devices()
+
+
+class TestClosestPointEdgeEdgeMethods(unittest.TestCase):
+    pass
+
+
+add_function_test(
+    TestClosestPointEdgeEdgeMethods,
+    "test_edge_edge_middle_crossing",
+    test_edge_edge_middle_crossing,
+    devices=devices,
+)
+add_function_test(
+    TestClosestPointEdgeEdgeMethods, "test_edge_edge_parallel_s1_t0", test_edge_edge_parallel_s1_t0, devices=devices
+)
+add_function_test(
+    TestClosestPointEdgeEdgeMethods, "test_edge_edge_parallel_s0_t1", test_edge_edge_parallel_s0_t1, devices=devices
+)
+add_function_test(
+    TestClosestPointEdgeEdgeMethods,
+    "test_edge_edge_both_degenerate_case",
+    test_edge_edge_both_degenerate_case,
+    devices=devices,
+)
+add_function_test(
+    TestClosestPointEdgeEdgeMethods,
+    "test_edge_edge_degenerate_first_edge",
+    test_edge_edge_degenerate_first_edge,
+    devices=devices,
+)
+add_function_test(
+    TestClosestPointEdgeEdgeMethods,
+    "test_edge_edge_degenerate_second_edge",
+    test_edge_edge_degenerate_second_edge,
+    devices=devices,
+)
+add_function_test(TestClosestPointEdgeEdgeMethods, "test_edge_edge_parallel", test_edge_edge_parallel, devices=devices)
+add_function_test(
+    TestClosestPointEdgeEdgeMethods,
+    "test_edge_edge_perpendicular_s1_t0",
+    test_edge_edge_perpendicular_s1_t0,
+    devices=devices,
+)
+add_function_test(
+    TestClosestPointEdgeEdgeMethods,
+    "test_edge_edge_perpendicular_s0_t1",
+    test_edge_edge_perpendicular_s0_t1,
+    devices=devices,
+)
 
 
 if __name__ == "__main__":
     wp.build.clear_kernel_cache()
-    _ = register(unittest.TestCase)
     unittest.main(verbosity=2)

warp/tests/test_codegen.py

@@ -5,12 +5,11 @@
 # distribution of this software and related documentation without an express
 # license agreement from NVIDIA CORPORATION is strictly prohibited.
 
-# include parent path
 import sys
 import unittest
 
 import warp as wp
-from warp.tests.test_base import *
+from warp.tests.unittest_utils import *
 
 # wp.config.mode = "debug"
 
@@ -317,9 +316,36 @@ def test_range_constant_dynamic_nested(m: int):
     wp.expect_eq(s, N * m * N)
 
 
+@wp.kernel
+def test_range_expression():
+    idx = 1
+    batch_size = 100
+
+    a = wp.float(0.0)
+    c = wp.float(1.0)
+
+    # constant expression with a function
+    for i in range(4 * idx, wp.min(4 * idx + 4, batch_size)):
+        a += c
+
+    for i in range(4 * idx, min(4 * idx + 4, batch_size)):
+        a += c
+
+    tid = wp.tid()
+
+    # dynamic expression with a function
+    for i in range(4 * idx, wp.min(4 * idx, tid + 1000)):
+        a += c
+
+    for i in range(4 * idx, min(4 * idx, tid + 1000)):
+        a += c
+
+    wp.expect_eq(a, 8.0)
+
+
 def test_unresolved_func(test, device):
     # kernel with unresolved function must be in a separate module, otherwise the current module would fail to load
-    from warp.tests.test_unresolved_func import unresolved_func_kernel
+    from warp.tests.aux_test_unresolved_func import unresolved_func_kernel
 
     # ensure that an appropriate exception is raised when the bad module gets loaded
     with test.assertRaisesRegex(RuntimeError, "Could not find function wp.missing_func"):
@@ -327,13 +353,13 @@ def test_unresolved_func(test, device):
 
     # remove all references to the bad module so that subsequent calls to wp.force_load()
     # won't try to load it unless we explicitly re-import it again
-    del wp.context.user_modules["warp.tests.test_unresolved_func"]
-    del sys.modules["warp.tests.test_unresolved_func"]
+    del wp.context.user_modules["warp.tests.aux_test_unresolved_func"]
+    del sys.modules["warp.tests.aux_test_unresolved_func"]
 
 
 def test_unresolved_symbol(test, device):
     # kernel with unresolved symbol must be in a separate module, otherwise the current module would fail to load
-    from warp.tests.test_unresolved_symbol import unresolved_symbol_kernel
+    from warp.tests.aux_test_unresolved_symbol import unresolved_symbol_kernel
 
     # ensure that an appropriate exception is raised when the bad module gets loaded
     with test.assertRaisesRegex(KeyError, "Referencing undefined symbol: missing_symbol"):
@@ -341,136 +367,140 @@ def test_unresolved_symbol(test, device):
 
     # remove all references to the bad module so that subsequent calls to wp.force_load()
     # won't try to load it unless we explicitly re-import it again
-    del wp.context.user_modules["warp.tests.test_unresolved_symbol"]
-    del sys.modules["warp.tests.test_unresolved_symbol"]
-
-
-def register(parent):
-    class TestCodeGen(parent):
-        pass
-
-    devices = get_test_devices()
-
-    add_kernel_test(TestCodeGen, name="test_inplace", kernel=test_inplace, dim=1, devices=devices)
-    add_kernel_test(TestCodeGen, name="test_rename", kernel=test_rename, dim=1, devices=devices)
-    add_kernel_test(TestCodeGen, name="test_constant", kernel=test_constant, inputs=[1.0], dim=1, devices=devices)
-    add_kernel_test(
-        TestCodeGen, name="test_dynamic_for_rename", kernel=test_dynamic_for_rename, inputs=[10], dim=1, devices=devices
-    )
-    add_kernel_test(
-        TestCodeGen,
-        name="test_dynamic_for_inplace",
-        kernel=test_dynamic_for_inplace,
-        inputs=[10],
-        dim=1,
-        devices=devices,
-    )
-    add_kernel_test(TestCodeGen, name="test_reassign", kernel=test_reassign, dim=1, devices=devices)
-    add_kernel_test(
-        TestCodeGen, name="test_dynamic_reassign", kernel=test_dynamic_reassign, inputs=[2], dim=1, devices=devices
-    )
-
-    add_kernel_test(
-        TestCodeGen,
-        name="test_range_dynamic_forward",
-        kernel=test_range_dynamic,
-        dim=1,
-        inputs=[0, 4, 1],
-        expect=[0, 1, 2, 3],
-        devices=devices,
-    )
-    add_kernel_test(
-        TestCodeGen,
-        name="test_range_dynamic_reverse",
-        kernel=test_range_dynamic,
-        dim=1,
-        inputs=[4, 0, -1],
-        expect=[4, 3, 2, 1],
-        devices=devices,
-    )
-    add_kernel_test(
-        TestCodeGen,
-        name="test_range_dynamic_foward_step",
-        kernel=test_range_dynamic,
-        dim=1,
-        inputs=[0, 8, 2],
-        expect=[0, 2, 4, 6],
-        devices=devices,
-    )
-    add_kernel_test(
-        TestCodeGen,
-        name="test_range_dynamic_reverse_step",
-        kernel=test_range_dynamic,
-        dim=1,
-        inputs=[8, 0, -2],
-        expect=[8, 6, 4, 2],
-        devices=devices,
-    )
-
-    add_kernel_test(
-        TestCodeGen,
-        name="test_range_static_sum",
-        kernel=test_range_static_sum,
-        dim=1,
-        expect=[10, 10, 10],
-        devices=devices,
-    )
-    add_kernel_test(
-        TestCodeGen,
-        name="test_range_dynamic_sum",
-        kernel=test_range_dynamic_sum,
-        dim=1,
-        inputs=[0, 10, 2],
-        expect=[10, 10, 10, 10],
-        devices=devices,
-    )
-    add_kernel_test(
-        TestCodeGen,
-        name="test_range_dynamic_sum_zero",
-        kernel=test_range_dynamic_sum,
-        dim=1,
-        inputs=[0, 0, 1],
-        expect=[0, 0, 0, 0],
-        devices=devices,
-    )
-    add_kernel_test(TestCodeGen, name="test_range_constant", kernel=test_range_constant, dim=1, devices=devices)
-    add_kernel_test(
-        TestCodeGen,
-        name="test_range_constant_dynamic_nested",
-        kernel=test_range_constant_dynamic_nested,
-        dim=1,
-        inputs=[10],
-        devices=devices,
-    )
-    add_kernel_test(
-        TestCodeGen,
-        name="test_range_dynamic_nested",
-        kernel=test_range_dynamic_nested,
-        dim=1,
-        inputs=[4],
-        devices=devices,
-    )
-
-    add_kernel_test(TestCodeGen, name="test_while_zero", kernel=test_while, dim=1, inputs=[0], devices=devices)
-    add_kernel_test(TestCodeGen, name="test_while_positive", kernel=test_while, dim=1, inputs=[16], devices=devices)
-    add_kernel_test(TestCodeGen, name="test_pass", kernel=test_pass, dim=1, inputs=[16], devices=devices)
-
-    add_kernel_test(TestCodeGen, name="test_break", kernel=test_break, dim=1, inputs=[10], devices=devices)
-    add_kernel_test(TestCodeGen, name="test_break_early", kernel=test_break_early, dim=1, inputs=[10], devices=devices)
-    add_kernel_test(TestCodeGen, name="test_break_unroll", kernel=test_break_unroll, dim=1, devices=devices)
-    add_kernel_test(
-        TestCodeGen, name="test_break_multiple", kernel=test_break_multiple, dim=1, inputs=[10], devices=devices
-    )
-    add_kernel_test(TestCodeGen, name="test_continue", kernel=test_continue, dim=1, inputs=[10], devices=devices)
-    add_kernel_test(TestCodeGen, name="test_continue_unroll", kernel=test_continue_unroll, dim=1, devices=devices)
-
-    add_function_test(TestCodeGen, func=test_unresolved_func, name="test_unresolved_func", devices=devices)
-    add_function_test(TestCodeGen, func=test_unresolved_symbol, name="test_unresolved_symbol", devices=devices)
-
-    return TestCodeGen
+    del wp.context.user_modules["warp.tests.aux_test_unresolved_symbol"]
+    del sys.modules["warp.tests.aux_test_unresolved_symbol"]
+
+
+class TestCodeGen(unittest.TestCase):
+    pass
+
+
+devices = get_test_devices()
+
+add_kernel_test(TestCodeGen, name="test_inplace", kernel=test_inplace, dim=1, devices=devices)
+add_kernel_test(TestCodeGen, name="test_rename", kernel=test_rename, dim=1, devices=devices)
+add_kernel_test(TestCodeGen, name="test_constant", kernel=test_constant, inputs=[1.0], dim=1, devices=devices)
+add_kernel_test(
+    TestCodeGen, name="test_dynamic_for_rename", kernel=test_dynamic_for_rename, inputs=[10], dim=1, devices=devices
+)
+add_kernel_test(
+    TestCodeGen,
+    name="test_dynamic_for_inplace",
+    kernel=test_dynamic_for_inplace,
+    inputs=[10],
+    dim=1,
+    devices=devices,
+)
+add_kernel_test(TestCodeGen, name="test_reassign", kernel=test_reassign, dim=1, devices=devices)
+add_kernel_test(
+    TestCodeGen, name="test_dynamic_reassign", kernel=test_dynamic_reassign, inputs=[2], dim=1, devices=devices
+)
+
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_dynamic_forward",
+    kernel=test_range_dynamic,
+    dim=1,
+    inputs=[0, 4, 1],
+    expect=[0, 1, 2, 3],
+    devices=devices,
+)
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_dynamic_reverse",
+    kernel=test_range_dynamic,
+    dim=1,
+    inputs=[4, 0, -1],
+    expect=[4, 3, 2, 1],
+    devices=devices,
+)
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_dynamic_forward_step",
+    kernel=test_range_dynamic,
+    dim=1,
+    inputs=[0, 8, 2],
+    expect=[0, 2, 4, 6],
+    devices=devices,
+)
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_dynamic_reverse_step",
+    kernel=test_range_dynamic,
+    dim=1,
+    inputs=[8, 0, -2],
+    expect=[8, 6, 4, 2],
+    devices=devices,
+)
+
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_static_sum",
+    kernel=test_range_static_sum,
+    dim=1,
+    expect=[10, 10, 10],
+    devices=devices,
+)
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_dynamic_sum",
+    kernel=test_range_dynamic_sum,
+    dim=1,
+    inputs=[0, 10, 2],
+    expect=[10, 10, 10, 10],
+    devices=devices,
+)
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_dynamic_sum_zero",
+    kernel=test_range_dynamic_sum,
+    dim=1,
+    inputs=[0, 0, 1],
+    expect=[0, 0, 0, 0],
+    devices=devices,
+)
+add_kernel_test(TestCodeGen, name="test_range_constant", kernel=test_range_constant, dim=1, devices=devices)
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_constant_dynamic_nested",
+    kernel=test_range_constant_dynamic_nested,
+    dim=1,
+    inputs=[10],
+    devices=devices,
+)
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_dynamic_nested",
+    kernel=test_range_dynamic_nested,
+    dim=1,
+    inputs=[4],
+    devices=devices,
+)
+add_kernel_test(
+    TestCodeGen,
+    name="test_range_expression",
+    kernel=test_range_expression,
+    dim=1,
+    devices=devices,
+)
+
+add_kernel_test(TestCodeGen, name="test_while_zero", kernel=test_while, dim=1, inputs=[0], devices=devices)
+add_kernel_test(TestCodeGen, name="test_while_positive", kernel=test_while, dim=1, inputs=[16], devices=devices)
+add_kernel_test(TestCodeGen, name="test_pass", kernel=test_pass, dim=1, inputs=[16], devices=devices)
+
+add_kernel_test(TestCodeGen, name="test_break", kernel=test_break, dim=1, inputs=[10], devices=devices)
+add_kernel_test(TestCodeGen, name="test_break_early", kernel=test_break_early, dim=1, inputs=[10], devices=devices)
+add_kernel_test(TestCodeGen, name="test_break_unroll", kernel=test_break_unroll, dim=1, devices=devices)
+add_kernel_test(
+    TestCodeGen, name="test_break_multiple", kernel=test_break_multiple, dim=1, inputs=[10], devices=devices
+)
+add_kernel_test(TestCodeGen, name="test_continue", kernel=test_continue, dim=1, inputs=[10], devices=devices)
+add_kernel_test(TestCodeGen, name="test_continue_unroll", kernel=test_continue_unroll, dim=1, devices=devices)
+
+add_function_test(TestCodeGen, func=test_unresolved_func, name="test_unresolved_func", devices=devices)
+add_function_test(TestCodeGen, func=test_unresolved_symbol, name="test_unresolved_symbol", devices=devices)
 
 
 if __name__ == "__main__":
     wp.build.clear_kernel_cache()
-    _ = register(unittest.TestCase)
     unittest.main(verbosity=2, failfast=True)

warp/tests/test_compile_consts.py

@@ -5,14 +5,11 @@
 # distribution of this software and related documentation without an express
 # license agreement from NVIDIA CORPORATION is strictly prohibited.
 
-import os
-import sys
-
 import unittest
-from warp.tests.test_base import *
-import warp.tests.test_compile_consts_dummy
 
 import warp as wp
+import warp.tests.aux_test_compile_consts_dummy
+from warp.tests.unittest_utils import *
 
 wp.init()
 
@@ -40,7 +37,7 @@ def test_constants_bool():
 @wp.kernel
 def test_constants_int(a: int):
     if Foobar.ONE > 0:
-        a = 123 + Foobar.TWO + warp.tests.test_compile_consts_dummy.MINUS_ONE
+        a = 123 + Foobar.TWO + warp.tests.aux_test_compile_consts_dummy.MINUS_ONE
     else:
         a = 456 + LOCAL_ONE
     expect_eq(a, 124)
@@ -82,26 +79,23 @@ def test_constant_closure_capture(test, device):
     wp.launch(two_closure, dim=(1), inputs=[2], device=device)
 
 
-def register(parent):
-    class TestConstants(parent):
-        pass
+class TestConstants(unittest.TestCase):
+    pass
 
-    a = 0
-    x = 0.0
 
-    devices = get_test_devices()
+a = 0
+x = 0.0
 
-    add_kernel_test(TestConstants, test_constants_bool, dim=1, inputs=[], devices=devices)
-    add_kernel_test(TestConstants, test_constants_int, dim=1, inputs=[a], devices=devices)
-    add_kernel_test(TestConstants, test_constants_float, dim=1, inputs=[x], devices=devices)
+devices = get_test_devices()
 
-    add_function_test(TestConstants, "test_constant_math", test_constant_math, devices=devices)
-    add_function_test(TestConstants, "test_constant_closure_capture", test_constant_closure_capture, devices=devices)
+add_kernel_test(TestConstants, test_constants_bool, dim=1, inputs=[], devices=devices)
+add_kernel_test(TestConstants, test_constants_int, dim=1, inputs=[a], devices=devices)
+add_kernel_test(TestConstants, test_constants_float, dim=1, inputs=[x], devices=devices)
 
-    return TestConstants
+add_function_test(TestConstants, "test_constant_math", test_constant_math, devices=devices)
+add_function_test(TestConstants, "test_constant_closure_capture", test_constant_closure_capture, devices=devices)
 
 
 if __name__ == "__main__":
     wp.build.clear_kernel_cache()
-    _ = register(unittest.TestCase)
     unittest.main(verbosity=2)

warp/tests/test_conditional.py

@@ -8,7 +8,7 @@
 import unittest
 
 import warp as wp
-from warp.tests.test_base import *
+from warp.tests.unittest_utils import *
 
 wp.init()
 
@@ -203,46 +203,44 @@ def test_conditional_chain_mixed():
 
 def test_conditional_unequal_types(test: unittest.TestCase, device):
     # The bad kernel must be in a separate module, otherwise the current module would fail to load
-    from warp.tests.test_conditional_unequal_types_kernels import unequal_types_kernel
+    from warp.tests.aux_test_conditional_unequal_types_kernels import (
+        unequal_types_kernel,
+    )
 
     with test.assertRaises(TypeError):
         wp.launch(unequal_types_kernel, dim=(1,), inputs=[], device=device)
 
     # remove all references to the bad module so that subsequent calls to wp.force_load()
     # won't try to load it unless we explicitly re-import it again
-    del wp.context.user_modules["warp.tests.test_conditional_unequal_types_kernels"]
-    del sys.modules["warp.tests.test_conditional_unequal_types_kernels"]
-
-
-def register(parent):
-    devices = get_test_devices()
-
-    class TestConditional(parent):
-        pass
-
-    add_kernel_test(TestConditional, kernel=test_conditional_if_else, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_conditional_if_else_nested, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_boolean_and, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_boolean_or, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_boolean_compound, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_boolean_literal, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_int_logical_not, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_int_conditional_assign_overload, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_bool_param_conditional, dim=1, inputs=[True], devices=devices)
-    add_kernel_test(TestConditional, kernel=test_conditional_chain_basic, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_conditional_chain_empty_range, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_conditional_chain_faker, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_conditional_chain_and, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_conditional_chain_eqs, dim=1, devices=devices)
-    add_kernel_test(TestConditional, kernel=test_conditional_chain_mixed, dim=1, devices=devices)
-    add_function_test(
-        TestConditional, "test_conditional_unequal_types", test_conditional_unequal_types, devices=devices
-    )
+    del wp.context.user_modules["warp.tests.aux_test_conditional_unequal_types_kernels"]
+    del sys.modules["warp.tests.aux_test_conditional_unequal_types_kernels"]
+
+
+devices = get_test_devices()
+
+
+class TestConditional(unittest.TestCase):
+    pass
+
 
-    return TestConditional
+add_kernel_test(TestConditional, kernel=test_conditional_if_else, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_conditional_if_else_nested, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_boolean_and, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_boolean_or, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_boolean_compound, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_boolean_literal, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_int_logical_not, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_int_conditional_assign_overload, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_bool_param_conditional, dim=1, inputs=[True], devices=devices)
+add_kernel_test(TestConditional, kernel=test_conditional_chain_basic, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_conditional_chain_empty_range, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_conditional_chain_faker, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_conditional_chain_and, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_conditional_chain_eqs, dim=1, devices=devices)
+add_kernel_test(TestConditional, kernel=test_conditional_chain_mixed, dim=1, devices=devices)
+add_function_test(TestConditional, "test_conditional_unequal_types", test_conditional_unequal_types, devices=devices)
 
 
 if __name__ == "__main__":
     wp.build.clear_kernel_cache()
-    _ = register(unittest.TestCase)
     unittest.main(verbosity=2)