warp-lang 0.9.0__py3-none-win_amd64.whl → 0.11.0__py3-none-win_amd64.whl

warp/tests/test_noise.py

@@ -5,11 +5,13 @@
 # distribution of this software and related documentation without an express
 # license agreement from NVIDIA CORPORATION is strictly prohibited.
 
-import warp as wp
-from warp.tests.test_base import *
+import unittest
 
 import numpy as np
 
+import warp as wp
+from warp.tests.unittest_utils import *
+
 # import matplotlib.pyplot as plt
 
 wp.init()
@@ -229,19 +231,18 @@ def test_adj_noise(test, device):
     test.assertTrue(err < 1.0e-8)
 
 
-def register(parent):
-    devices = get_test_devices()
+devices = get_test_devices()
+
 
-    class TestNoise(parent):
-        pass
+class TestNoise(unittest.TestCase):
+    pass
 
-    add_function_test(TestNoise, "test_pnoise", test_pnoise, devices=devices)
-    add_function_test(TestNoise, "test_curlnoise", test_curlnoise, devices=devices)
-    add_function_test(TestNoise, "test_adj_noise", test_adj_noise, devices=devices)
 
-    return TestNoise
+add_function_test(TestNoise, "test_pnoise", test_pnoise, devices=devices)
+add_function_test(TestNoise, "test_curlnoise", test_curlnoise, devices=devices)
+add_function_test(TestNoise, "test_adj_noise", test_adj_noise, devices=devices)
 
 
 if __name__ == "__main__":
-    c = register(unittest.TestCase)
+    wp.build.clear_kernel_cache()
     unittest.main(verbosity=2)

warp/tests/test_operators.py

@@ -5,11 +5,10 @@
 # distribution of this software and related documentation without an express
 # license agreement from NVIDIA CORPORATION is strictly prohibited.
 
-import numpy as np
-import math
+import unittest
 
 import warp as wp
-from warp.tests.test_base import *
+from warp.tests.unittest_utils import *
 
 wp.init()
 
@@ -227,28 +226,25 @@ def test_operators_mat44():
     expect_eq(r0[3], wp.vec4(39.0, 42.0, 45.0, 48.0))
 
 
-def register(parent):
-    devices = get_test_devices()
+devices = get_test_devices()
 
-    class TestOperators(parent):
-        pass
 
-    add_kernel_test(TestOperators, test_operators_scalar_float, dim=1, devices=devices)
-    add_kernel_test(TestOperators, test_operators_scalar_int, dim=1, devices=devices)
-    add_kernel_test(TestOperators, test_operators_matrix_index, dim=1, devices=devices)
-    add_kernel_test(TestOperators, test_operators_vector_index, dim=1, devices=devices)
-    add_kernel_test(TestOperators, test_operators_vec3, dim=1, devices=devices)
-    add_kernel_test(TestOperators, test_operators_vec4, dim=1, devices=devices)
+class TestOperators(unittest.TestCase):
+    pass
 
-    add_kernel_test(TestOperators, test_operators_mat22, dim=1, devices=devices)
-    add_kernel_test(TestOperators, test_operators_mat33, dim=1, devices=devices)
-    add_kernel_test(TestOperators, test_operators_mat44, dim=1, devices=devices)
 
-    return TestOperators
+add_kernel_test(TestOperators, test_operators_scalar_float, dim=1, devices=devices)
+add_kernel_test(TestOperators, test_operators_scalar_int, dim=1, devices=devices)
+add_kernel_test(TestOperators, test_operators_matrix_index, dim=1, devices=devices)
+add_kernel_test(TestOperators, test_operators_vector_index, dim=1, devices=devices)
+add_kernel_test(TestOperators, test_operators_vec3, dim=1, devices=devices)
+add_kernel_test(TestOperators, test_operators_vec4, dim=1, devices=devices)
 
+add_kernel_test(TestOperators, test_operators_mat22, dim=1, devices=devices)
+add_kernel_test(TestOperators, test_operators_mat33, dim=1, devices=devices)
+add_kernel_test(TestOperators, test_operators_mat44, dim=1, devices=devices)
 
-if __name__ == "__main__":
-    wp.force_load()
 
-    c = register(unittest.TestCase)
+if __name__ == "__main__":
+    wp.build.clear_kernel_cache()
     unittest.main(verbosity=2)

warp/tests/test_options.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()
 
@@ -93,19 +93,19 @@ def test_options_4(test, device):
     assert_np_equal(tape.gradients[x].numpy(), np.array(0.0))
 
 
-def register(parent):
-    devices = get_test_devices()
+devices = get_test_devices()
 
-    class TestOptions(parent):
-        pass
 
-    add_function_test(TestOptions, "test_options_1", test_options_1, devices=devices)
-    add_function_test(TestOptions, "test_options_2", test_options_2, devices=devices)
-    add_function_test(TestOptions, "test_options_3", test_options_3, devices=devices)
-    add_function_test(TestOptions, "test_options_4", test_options_4, devices=devices)
-    return TestOptions
+class TestOptions(unittest.TestCase):
+    pass
+
+
+add_function_test(TestOptions, "test_options_1", test_options_1, devices=devices)
+add_function_test(TestOptions, "test_options_2", test_options_2, devices=devices)
+add_function_test(TestOptions, "test_options_3", test_options_3, devices=devices)
+add_function_test(TestOptions, "test_options_4", test_options_4, devices=devices)
 
 
 if __name__ == "__main__":
-    _ = register(unittest.TestCase)
+    wp.build.clear_kernel_cache()
     unittest.main(verbosity=2)

warp/tests/test_pinned.py

@@ -5,16 +5,17 @@
 # distribution of this software and related documentation without an express
 # license agreement from NVIDIA CORPORATION is strictly prohibited.
 
+import unittest
+
 import numpy as np
-import warp as wp
-from warp.tests.test_base import *
 
-import unittest
+import warp as wp
+from warp.tests.unittest_utils import *
 
 wp.init()
 
 
-def test_pinned(test, device):
+def test_pinned(test: unittest.TestCase, device):
     assert wp.get_device(device).is_cuda, "Test device must be a CUDA device"
 
     n = 1024 * 1024
@@ -25,20 +26,20 @@ def test_pinned(test, device):
     a_pageable1 = wp.array(ones, dtype=float, device="cpu")
     a_pageable2 = wp.zeros_like(a_pageable1)
 
-    assert a_pageable1.pinned == False
-    assert a_pageable2.pinned == False
+    test.assertFalse(a_pageable1.pinned)
+    test.assertFalse(a_pageable2.pinned)
 
     # pinned host arrays for asynchronous transfers
     a_pinned1 = wp.array(ones, dtype=float, device="cpu", pinned=True)
     a_pinned2 = wp.zeros_like(a_pinned1)
 
-    assert a_pinned1.pinned == True
-    assert a_pinned2.pinned == True
+    test.assertTrue(a_pinned1.pinned)
+    test.assertTrue(a_pinned2.pinned)
 
     # device array
     a_device = wp.zeros(n, dtype=float, device=device)
 
-    assert a_device.pinned == False
+    test.assertFalse(a_device.pinned)
 
     wp.synchronize_device(device)
 
@@ -59,21 +60,19 @@ def test_pinned(test, device):
     assert_np_equal(a_pinned2.numpy(), ones)
 
     # ensure that launching asynchronous transfers took less CPU time
-    assert pinned_timer.elapsed < pageable_timer.elapsed, "Pinned transfers did not take less CPU time"
+    test.assertTrue(pinned_timer.elapsed < pageable_timer.elapsed, "Pinned transfers did not take less CPU time")
+
 
+devices = get_unique_cuda_test_devices()
 
-def register(parent):
-    cuda_devices = wp.get_cuda_devices()
 
-    class TestPinned(parent):
-        pass
+class TestPinned(unittest.TestCase):
+    pass
 
-    if cuda_devices:
-        add_function_test(TestPinned, "test_pinned", test_pinned, devices=cuda_devices)
 
-    return TestPinned
+add_function_test(TestPinned, "test_pinned", test_pinned, devices=devices)
 
 
 if __name__ == "__main__":
-    c = register(unittest.TestCase)
+    wp.build.clear_kernel_cache()
     unittest.main(verbosity=2)

warp/tests/test_print.py

@@ -5,28 +5,49 @@
 # distribution of this software and related documentation without an express
 # license agreement from NVIDIA CORPORATION is strictly prohibited.
 
-# include parent path
-import numpy as np
-import math
+import unittest
 
 import warp as wp
-from warp.tests.test_base import *
-
-np.random.seed(42)
+from warp.tests.unittest_utils import *
 
 wp.init()
-wp.verify_cuda = True
 
 
 @wp.kernel
-def test_print():
+def test_print_kernel():
     wp.print(1.0)
     wp.print("this is a string")
     wp.printf("this is a float %f\n", 457.5)
     wp.printf("this is an int %d\n", 123)
 
 
-wp.launch(kernel=test_print, dim=1, inputs=[], outputs=[], device="cuda")
+def test_print(test, device):
+    wp.load_module(device=device)
+    capture = StdOutCapture()
+    capture.begin()
+    wp.launch(kernel=test_print_kernel, dim=1, inputs=[], device=device)
+    wp.synchronize_device(device)
+    s = capture.end()
+
+    # The CPU kernel printouts don't get captured by StdOutCapture()
+    if device.is_cuda:
+        test.assertRegex(
+            s,
+            rf"1{os.linesep}"
+            rf"this is a string{os.linesep}"
+            rf"this is a float 457\.500000{os.linesep}"
+            rf"this is an int 123",
+        )
+
+
+class TestPrint(unittest.TestCase):
+    pass
+
+
+devices = get_test_devices()
+add_function_test(TestPrint, "test_print", test_print, devices=devices, check_output=False)
+
 
-wp.synchronize()
-print("finished")
+if __name__ == "__main__":
+    wp.build.clear_kernel_cache()
+    unittest.main(verbosity=2)