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

warp/tests/{test_base.py → unittest_utils.py}

@@ -9,15 +9,25 @@ import ctypes
 import ctypes.util
 import os
 import sys
+import unittest
 
 import numpy as np
+
 import warp as wp
 
+try:
+    import pxr  # noqa: F401
+
+    USD_AVAILABLE = True
+except ImportError as e:
+    USD_AVAILABLE = False
+    print(f"Skipping USD tests for reason: {e}")
+
 # default test mode (see get_test_devices())
 #   "basic" - only run on CPU and first GPU device
 #   "unique" - run on CPU and all unique GPU arches
 #   "all" - run on all devices
-test_mode = "basic"
+test_mode = "unique"
 
 try:
     if sys.platform == "win32":
@@ -29,7 +39,40 @@ except OSError:
     LIBC = None
 
 
+def get_unique_cuda_test_devices(mode=None):
+    """Returns a list of unique CUDA devices according to the CUDA arch.
+
+    If ``mode`` is ``None``, the ``global test_mode`` value will be used and
+    this list will be a subset of the devices returned from ``get_test_devices()``.
+    """
+
+    if mode is None:
+        global test_mode
+        mode = test_mode
+
+    if mode == "basic":
+        cuda_devices = [wp.get_device("cuda:0")]
+    else:
+        cuda_devices = wp.get_cuda_devices()
+
+    unique_cuda_devices = {}
+    for d in cuda_devices:
+        if d.arch not in unique_cuda_devices:
+            unique_cuda_devices[d.arch] = d
+
+    return list(unique_cuda_devices.values())
+
+
 def get_test_devices(mode=None):
+    """Returns a list of devices based on the mode selected.
+
+    Args:
+        mode (str, optional): The testing mode to specify which devices to include. If not provided or ``None``, the
+          ``global test_mode`` value will be used.
+          "basic" (default): Returns the CPU and the first GPU device when available.
+          "unique": Returns the CPU and all unique GPU architectures.
+          "all": Returns all available devices.
+    """
     if mode is None:
         global test_mode
         mode = test_mode
@@ -48,14 +91,7 @@ def get_test_devices(mode=None):
         if wp.is_cpu_available():
             devices.append(wp.get_device("cpu"))
 
-        cuda_devices = wp.get_cuda_devices()
-
-        unique_cuda_devices = {}
-        for d in cuda_devices:
-            if d.arch not in unique_cuda_devices:
-                unique_cuda_devices[d.arch] = d
-
-        devices.extend(list(unique_cuda_devices.values()))
+        devices.extend(get_unique_cuda_test_devices())
 
     # run on all devices
     elif mode == "all":
@@ -78,7 +114,8 @@ class StdOutCapture:
         self.target = os.dup(self.saved.fileno())
 
         # create temporary capture stream
-        import io, tempfile
+        import io
+        import tempfile
 
         self.tempfile = io.TextIOWrapper(
             tempfile.TemporaryFile(buffering=0), encoding="utf-8", errors="replace", newline="", write_through=True
@@ -126,12 +163,8 @@ class CheckOutput:
             self.test.fail(f"Unexpected output:\n'{s.rstrip()}'")
 
 
-def assert_array_equal(result, expect):
-    a = result.numpy()
-    b = expect.numpy()
-
-    if (a == b).all() == False:
-        raise AssertionError(f"Unexpected result, got: {a} expected: {b}")
+def assert_array_equal(result: wp.array, expect: wp.array):
+    np.testing.assert_equal(result.numpy(), expect.numpy())
 
 
 def assert_np_equal(result, expect, tol=0.0):
@@ -139,7 +172,7 @@ def assert_np_equal(result, expect, tol=0.0):
     b = expect.flatten()
 
     if tol == 0.0:
-        if (a == b).all() == False:
+        if not (a == b).all():
             raise AssertionError(f"Unexpected result, got: {a} expected: {b}")
 
     else:
@@ -153,7 +186,6 @@ def assert_np_equal(result, expect, tol=0.0):
 
 # if check_output is True any output to stdout will be treated as an error
 def create_test_func(func, device, check_output, **kwargs):
-    
     # pass args to func
     def test_func(self):
         if check_output:
@@ -165,6 +197,11 @@ def create_test_func(func, device, check_output, **kwargs):
     return test_func
 
 
+def skip_test_func(self):
+    # A function to use so we can tell unittest that the test was skipped.
+    self.skipTest("No suitable devices to run the test.")
+
+
 def sanitize_identifier(s):
     """replace all non-identifier characters with '_'"""
 
@@ -174,15 +211,25 @@ def sanitize_identifier(s):
     else:
         import re
 
-        return re.sub("\W|^(?=\d)", "_", s)
+        return re.sub(r"\W|^(?=\d)", "_", s)
 
 
 def add_function_test(cls, name, func, devices=None, check_output=True, **kwargs):
     if devices is None:
         setattr(cls, name, create_test_func(func, None, check_output, **kwargs))
+    elif isinstance(devices, list):
+        if not devices:
+            # No devices to run this test
+            setattr(cls, name, skip_test_func)
+        else:
+            for device in devices:
+                setattr(
+                    cls,
+                    name + "_" + sanitize_identifier(device),
+                    create_test_func(func, device, check_output, **kwargs),
+                )
     else:
-        for device in devices:
-            setattr(cls, name + "_" + sanitize_identifier(device), create_test_func(func, device, check_output, **kwargs))
+        setattr(cls, name + "_" + sanitize_identifier(devices), create_test_func(func, devices, check_output, **kwargs))
 
 
 def add_kernel_test(cls, kernel, dim, name=None, expect=None, inputs=None, devices=None):
@@ -217,13 +264,79 @@ def add_kernel_test(cls, kernel, dim, name=None, expect=None, inputs=None, devic
 
     # register test func with class for the given devices
     for d in devices:
-        # use a lambda to forward the device to the inner test function
-        test_lambda = lambda test, device=d: test_func(test, device)
-        setattr(cls, name + "_" + sanitize_identifier(d), test_lambda)
+        # use a function to forward the device to the inner test function
+        def test_func_wrapper(test, device=d):
+            test_func(test, device)
+
+        setattr(cls, name + "_" + sanitize_identifier(d), test_func_wrapper)
 
 
-# helper that first calls the test function to generate all kernel permuations
+# helper that first calls the test function to generate all kernel permutations
 # so that compilation is done in one-shot instead of per-test
 def add_function_test_register_kernel(cls, name, func, devices=None, **kwargs):
     func(None, None, **kwargs, register_kernels=True)
     add_function_test(cls, name, func, devices=devices, **kwargs)
+
+
+class TeamCityTestResult(unittest.TextTestResult):
+    """This class will report each test result to TeamCity"""
+
+    def __init__(self, stream, descriptions, verbosity):
+        super(TeamCityTestResult, self).__init__(stream, descriptions, verbosity)
+
+    def addSuccess(self, test):
+        super(TeamCityTestResult, self).addSuccess(test)
+        self.reportSuccess(test)
+
+    def addError(self, test, err):
+        super(TeamCityTestResult, self).addError(test, err)
+        self.reportFailure(test)
+
+    def addFailure(self, test, err):
+        super(TeamCityTestResult, self).addFailure(test, err)
+        self.reportFailure(test)
+
+    def addSkip(self, test, reason):
+        super(TeamCityTestResult, self).addSkip(test, reason)
+
+    def addExpectedFailure(self, test, err):
+        super(TeamCityTestResult, self).addExpectedFailure(test, err)
+        self.reportSuccess(test)
+
+    def addUnexpectedSuccess(self, test):
+        super(TeamCityTestResult, self).addUnexpectedSuccess(test)
+        self.reportFailure(test)
+
+    def reportSuccess(self, test):
+        test_id = test.id()
+        print(f"##teamcity[testStarted name='{test_id}']")
+        print(f"##teamcity[testFinished name='{test_id}']")
+
+    def reportFailure(self, test):
+        test_id = test.id()
+        print(f"##teamcity[testStarted name='{test_id}']")
+        print(f"##teamcity[testFailed name='{test_id}']")
+        print(f"##teamcity[testFinished name='{test_id}']")
+
+
+class TeamCityTestRunner(unittest.TextTestRunner):
+    """Test runner that will report test results to TeamCity if running in TeamCity"""
+
+    def __init__(self, **kwargs):
+        self.running_in_teamcity = os.environ.get("TEAMCITY_VERSION") is not None
+        if self.running_in_teamcity:
+            kwargs["resultclass"] = TeamCityTestResult
+        super(TeamCityTestRunner, self).__init__(**kwargs)
+
+    def run(self, test, name):
+        if self.running_in_teamcity:
+            print(f"##teamcity[testSuiteStarted name='{name}']")
+
+        result = super(TeamCityTestRunner, self).run(test)
+
+        if self.running_in_teamcity:
+            print(f"##teamcity[testSuiteFinished name='{name}']")
+            if not result.wasSuccessful():
+                print("##teamcity[buildStatus status='FAILURE']")
+
+        return result

warp/tests/{test_misc.py → unused_test_misc.py}

@@ -1,8 +1,17 @@
-import warp as wp
+# Copyright (c) 2021 NVIDIA CORPORATION.  All rights reserved.
+# NVIDIA CORPORATION and its licensors retain all intellectual property
+# and proprietary rights in and to this software, related documentation
+# and any modifications thereto.  Any use, reproduction, disclosure or
+# distribution of this software and related documentation without an express
+# license agreement from NVIDIA CORPORATION is strictly prohibited.
+
 import numpy as np
 
+import warp as wp
+
 wp.init()
 
+
 @wp.kernel
 def arange(out: wp.array(dtype=int)):
     tid = wp.tid()
@@ -28,7 +37,7 @@ for i in range(5):
 
 graph = wp.capture_end()
 
-#---------------------------------------
+# ---------------------------------------
 
 ref = np.arange(0, n, dtype=int)
 wp.capture_launch(graph)
@@ -37,7 +46,7 @@ for i in range(5):
     print(arrays[i].numpy())
 
 
-#---------------------------------------
+# ---------------------------------------
 
 n = 16
 arrays = []
@@ -49,7 +58,7 @@ for i in range(5):
 for i in range(5):
     cmd.set_dim(n)
     cmd.set_param(arrays[i])
-    
+
     cmd.update_graph()
 
 
@@ -60,4 +69,3 @@ ref = np.arange(0, n, dtype=int)
 
 for i in range(5):
     print(arrays[i].numpy())
-

warp/tests/{test_debug.py → walkthough_debug.py}

@@ -49,10 +49,7 @@
 #
 ####################################################################################################
 
-import unittest
-
 import warp as wp
-from warp.tests.test_base import *
 
 # The init() function prints the directory of the kernel cache which contains the .cpp files
 # generated from Warp kernels. You can put breakpoints in these C++ files through Visual Studio Code,
@@ -67,7 +64,7 @@ assert wp.context.runtime.core.is_debug_enabled(), "Warp must be built in debug
 
 
 @wp.kernel
-def test_breakpoint(n: int):
+def example_breakpoint(n: int):
     a = int(0)
 
     for i in range(0, n):
@@ -83,16 +80,6 @@ def test_breakpoint(n: int):
     wp.expect_eq(a, 5)
 
 
-def register(parent):
-    class TestDebug(parent):
-        pass
-
-    add_kernel_test(TestDebug, name="test_breakpoint", kernel=test_breakpoint, dim=1, inputs=[10], devices=["cpu"])
-
-    return TestDebug
-
-
 if __name__ == "__main__":
     wp.build.clear_kernel_cache()
-    _ = register(unittest.TestCase)
-    unittest.main(verbosity=2, failfast=True)
+    wp.launch(example_breakpoint, dim=1, inputs=[10], device="cpu")