warp-lang 1.0.2__py3-none-win_amd64.whl → 1.2.0__py3-none-win_amd64.whl

warp/tests/test_model.py

@@ -1,110 +1,108 @@
-# Copyright (c) 2022 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 unittest
-
-import numpy as np
-
-import warp as wp
-from warp.sim import ModelBuilder
-from warp.tests.unittest_utils import *
-
-wp.init()
-
-
-class TestModel(unittest.TestCase):
-    def test_add_triangles(self):
-        rng = np.random.default_rng(123)
-
-        pts = np.array(
-            [
-                [-0.00585869, 0.34189449, -1.17415233],
-                [-1.894547, 0.1788074, 0.9251329],
-                [-1.26141048, 0.16140787, 0.08823282],
-                [-0.08609255, -0.82722546, 0.65995427],
-                [0.78827592, -1.77375711, -0.55582718],
-            ]
-        )
-        tris = np.array([[0, 3, 4], [0, 2, 3], [2, 1, 3], [1, 4, 3]])
-
-        builder1 = ModelBuilder()
-        builder2 = ModelBuilder()
-        for pt in pts:
-            builder1.add_particle(wp.vec3(pt), wp.vec3(), 1.0)
-            builder2.add_particle(wp.vec3(pt), wp.vec3(), 1.0)
-
-        # test add_triangle(s) with default arguments:
-        areas = builder2.add_triangles(tris[:, 0], tris[:, 1], tris[:, 2])
-        for i, t in enumerate(tris):
-            area = builder1.add_triangle(t[0], t[1], t[2])
-            self.assertAlmostEqual(area, areas[i], places=6)
-
-        # test add_triangle(s) with non default arguments:
-        tri_ke = rng.standard_normal(size=pts.shape[0])
-        tri_ka = rng.standard_normal(size=pts.shape[0])
-        tri_kd = rng.standard_normal(size=pts.shape[0])
-        tri_drag = rng.standard_normal(size=pts.shape[0])
-        tri_lift = rng.standard_normal(size=pts.shape[0])
-        for i, t in enumerate(tris):
-            builder1.add_triangle(
-                t[0],
-                t[1],
-                t[2],
-                tri_ke[i],
-                tri_ka[i],
-                tri_kd[i],
-                tri_drag[i],
-                tri_lift[i],
-            )
-        builder2.add_triangles(tris[:, 0], tris[:, 1], tris[:, 2], tri_ke, tri_ka, tri_kd, tri_drag, tri_lift)
-
-        assert_np_equal(np.array(builder1.tri_indices), np.array(builder2.tri_indices))
-        assert_np_equal(np.array(builder1.tri_poses), np.array(builder2.tri_poses), tol=1.0e-6)
-        assert_np_equal(np.array(builder1.tri_activations), np.array(builder2.tri_activations))
-        assert_np_equal(np.array(builder1.tri_materials), np.array(builder2.tri_materials))
-
-    def test_add_edges(self):
-        rng = np.random.default_rng(123)
-
-        pts = np.array(
-            [
-                [-0.00585869, 0.34189449, -1.17415233],
-                [-1.894547, 0.1788074, 0.9251329],
-                [-1.26141048, 0.16140787, 0.08823282],
-                [-0.08609255, -0.82722546, 0.65995427],
-                [0.78827592, -1.77375711, -0.55582718],
-            ]
-        )
-        edges = np.array([[0, 4, 3, 1], [3, 2, 4, 1]])
-
-        builder1 = ModelBuilder()
-        builder2 = ModelBuilder()
-        for pt in pts:
-            builder1.add_particle(wp.vec3(pt), wp.vec3(), 1.0)
-            builder2.add_particle(wp.vec3(pt), wp.vec3(), 1.0)
-
-        # test defaults:
-        for i in range(2):
-            builder1.add_edge(edges[i, 0], edges[i, 1], edges[i, 2], edges[i, 3])
-        builder2.add_edges(edges[:, 0], edges[:, 1], edges[:, 2], edges[:, 3])
-
-        # test non defaults:
-        rest = rng.standard_normal(size=2)
-        edge_ke = rng.standard_normal(size=2)
-        edge_kd = rng.standard_normal(size=2)
-        for i in range(2):
-            builder1.add_edge(edges[i, 0], edges[i, 1], edges[i, 2], edges[i, 3], rest[i], edge_ke[i], edge_kd[i])
-        builder2.add_edges(edges[:, 0], edges[:, 1], edges[:, 2], edges[:, 3], rest, edge_ke, edge_kd)
-
-        assert_np_equal(np.array(builder1.edge_indices), np.array(builder2.edge_indices))
-        assert_np_equal(np.array(builder1.edge_rest_angle), np.array(builder2.edge_rest_angle), tol=1.0e-4)
-        assert_np_equal(np.array(builder1.edge_bending_properties), np.array(builder2.edge_bending_properties))
-
-
-if __name__ == "__main__":
-    wp.build.clear_kernel_cache()
-    unittest.main(verbosity=2)
+# Copyright (c) 2022 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 unittest
+
+import numpy as np
+
+import warp as wp
+from warp.sim import ModelBuilder
+from warp.tests.unittest_utils import *
+
+
+class TestModel(unittest.TestCase):
+    def test_add_triangles(self):
+        rng = np.random.default_rng(123)
+
+        pts = np.array(
+            [
+                [-0.00585869, 0.34189449, -1.17415233],
+                [-1.894547, 0.1788074, 0.9251329],
+                [-1.26141048, 0.16140787, 0.08823282],
+                [-0.08609255, -0.82722546, 0.65995427],
+                [0.78827592, -1.77375711, -0.55582718],
+            ]
+        )
+        tris = np.array([[0, 3, 4], [0, 2, 3], [2, 1, 3], [1, 4, 3]])
+
+        builder1 = ModelBuilder()
+        builder2 = ModelBuilder()
+        for pt in pts:
+            builder1.add_particle(wp.vec3(pt), wp.vec3(), 1.0)
+            builder2.add_particle(wp.vec3(pt), wp.vec3(), 1.0)
+
+        # test add_triangle(s) with default arguments:
+        areas = builder2.add_triangles(tris[:, 0], tris[:, 1], tris[:, 2])
+        for i, t in enumerate(tris):
+            area = builder1.add_triangle(t[0], t[1], t[2])
+            self.assertAlmostEqual(area, areas[i], places=6)
+
+        # test add_triangle(s) with non default arguments:
+        tri_ke = rng.standard_normal(size=pts.shape[0])
+        tri_ka = rng.standard_normal(size=pts.shape[0])
+        tri_kd = rng.standard_normal(size=pts.shape[0])
+        tri_drag = rng.standard_normal(size=pts.shape[0])
+        tri_lift = rng.standard_normal(size=pts.shape[0])
+        for i, t in enumerate(tris):
+            builder1.add_triangle(
+                t[0],
+                t[1],
+                t[2],
+                tri_ke[i],
+                tri_ka[i],
+                tri_kd[i],
+                tri_drag[i],
+                tri_lift[i],
+            )
+        builder2.add_triangles(tris[:, 0], tris[:, 1], tris[:, 2], tri_ke, tri_ka, tri_kd, tri_drag, tri_lift)
+
+        assert_np_equal(np.array(builder1.tri_indices), np.array(builder2.tri_indices))
+        assert_np_equal(np.array(builder1.tri_poses), np.array(builder2.tri_poses), tol=1.0e-6)
+        assert_np_equal(np.array(builder1.tri_activations), np.array(builder2.tri_activations))
+        assert_np_equal(np.array(builder1.tri_materials), np.array(builder2.tri_materials))
+
+    def test_add_edges(self):
+        rng = np.random.default_rng(123)
+
+        pts = np.array(
+            [
+                [-0.00585869, 0.34189449, -1.17415233],
+                [-1.894547, 0.1788074, 0.9251329],
+                [-1.26141048, 0.16140787, 0.08823282],
+                [-0.08609255, -0.82722546, 0.65995427],
+                [0.78827592, -1.77375711, -0.55582718],
+            ]
+        )
+        edges = np.array([[0, 4, 3, 1], [3, 2, 4, 1]])
+
+        builder1 = ModelBuilder()
+        builder2 = ModelBuilder()
+        for pt in pts:
+            builder1.add_particle(wp.vec3(pt), wp.vec3(), 1.0)
+            builder2.add_particle(wp.vec3(pt), wp.vec3(), 1.0)
+
+        # test defaults:
+        for i in range(2):
+            builder1.add_edge(edges[i, 0], edges[i, 1], edges[i, 2], edges[i, 3])
+        builder2.add_edges(edges[:, 0], edges[:, 1], edges[:, 2], edges[:, 3])
+
+        # test non defaults:
+        rest = rng.standard_normal(size=2)
+        edge_ke = rng.standard_normal(size=2)
+        edge_kd = rng.standard_normal(size=2)
+        for i in range(2):
+            builder1.add_edge(edges[i, 0], edges[i, 1], edges[i, 2], edges[i, 3], rest[i], edge_ke[i], edge_kd[i])
+        builder2.add_edges(edges[:, 0], edges[:, 1], edges[:, 2], edges[:, 3], rest, edge_ke, edge_kd)
+
+        assert_np_equal(np.array(builder1.edge_indices), np.array(builder2.edge_indices))
+        assert_np_equal(np.array(builder1.edge_rest_angle), np.array(builder2.edge_rest_angle), tol=1.0e-4)
+        assert_np_equal(np.array(builder1.edge_bending_properties), np.array(builder2.edge_bending_properties))
+
+
+if __name__ == "__main__":
+    wp.build.clear_kernel_cache()
+    unittest.main(verbosity=2)

warp/tests/test_module_hashing.py

@@ -0,0 +1,111 @@
+# Copyright (c) 2022 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.
+
+# TODO: add more tests for kernels and generics
+
+import os
+import tempfile
+import unittest
+from importlib import util
+
+import warp as wp
+from warp.tests.unittest_utils import *
+
+FUNC_OVERLOAD_1 = """# -*- coding: utf-8 -*-
+import warp as wp
+
+@wp.func
+def fn():
+    wp.print(17)
+
+@wp.func
+def fn(value: int):
+    wp.print(value)
+"""
+
+# should be same hash as FUNC_OVERLOAD_1
+FUNC_OVERLOAD_2 = """# -*- coding: utf-8 -*-
+import warp as wp
+
+@wp.func
+def fn():
+    wp.print(17)
+
+@wp.func
+def fn(value: int):
+    wp.print(value)
+"""
+
+# should be different hash than FUNC_OVERLOAD_1 (first overload is different)
+FUNC_OVERLOAD_3 = """# -*- coding: utf-8 -*-
+import warp as wp
+
+@wp.func
+def fn():
+    wp.print(42)
+
+@wp.func
+def fn(value: int):
+    wp.print(value)
+"""
+
+# should be different hash than FUNC_OVERLOAD_1 (second overload is different)
+FUNC_OVERLOAD_4 = """# -*- coding: utf-8 -*-
+import warp as wp
+
+@wp.func
+def fn():
+    wp.print(17)
+
+@wp.func
+def fn(value: int):
+    wp.print(value + 1)
+"""
+
+
+def load_code_as_module(code, name):
+    file, file_path = tempfile.mkstemp(suffix=".py")
+
+    try:
+        with os.fdopen(file, "w") as f:
+            f.write(code)
+
+        spec = util.spec_from_file_location(name, file_path)
+        module = util.module_from_spec(spec)
+        spec.loader.exec_module(module)
+    finally:
+        os.remove(file_path)
+
+    return wp.get_module(module.__name__)
+
+
+def test_function_overload_hashing(test, device):
+    m1 = load_code_as_module(FUNC_OVERLOAD_1, "func_overload_1")
+    m2 = load_code_as_module(FUNC_OVERLOAD_2, "func_overload_2")
+    m3 = load_code_as_module(FUNC_OVERLOAD_3, "func_overload_3")
+    m4 = load_code_as_module(FUNC_OVERLOAD_4, "func_overload_4")
+
+    hash1 = m1.hash_module()
+    hash2 = m2.hash_module()
+    hash3 = m3.hash_module()
+    hash4 = m4.hash_module()
+
+    test.assertEqual(hash2, hash1)
+    test.assertNotEqual(hash3, hash1)
+    test.assertNotEqual(hash4, hash1)
+
+
+class TestModuleHashing(unittest.TestCase):
+    pass
+
+
+add_function_test(TestModuleHashing, "test_function_overload_hashing", test_function_overload_hashing)
+
+
+if __name__ == "__main__":
+    wp.build.clear_kernel_cache()
+    unittest.main(verbosity=2)

warp/tests/test_modules_lite.py

@@ -1,39 +1,36 @@
-# Copyright (c) 2023 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 unittest
-
-import warp as wp
-from warp.tests.unittest_utils import *
-
-wp.init()
-
-
-devices = get_test_devices()
-
-
-class TestModuleLite(unittest.TestCase):
-    def test_module_lite_load(self):
-        # Load current module
-        wp.load_module()
-
-        # Load named module
-        wp.load_module(wp.config)
-
-        # Load named module (string)
-        wp.load_module(wp.config, recursive=True)
-
-    def test_module_lite_options(self):
-        wp.set_module_options({"max_unroll": 8})
-        module_options = wp.get_module_options()
-        self.assertIsInstance(module_options, dict)
-        self.assertEqual(module_options["max_unroll"], 8)
-
-
-if __name__ == "__main__":
-    wp.build.clear_kernel_cache()
-    unittest.main(verbosity=2)
+# Copyright (c) 2023 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 unittest
+
+import warp as wp
+from warp.tests.unittest_utils import *
+
+devices = get_test_devices()
+
+
+class TestModuleLite(unittest.TestCase):
+    def test_module_lite_load(self):
+        # Load current module
+        wp.load_module()
+
+        # Load named module
+        wp.load_module(wp.config)
+
+        # Load named module (string)
+        wp.load_module(wp.config, recursive=True)
+
+    def test_module_lite_options(self):
+        wp.set_module_options({"max_unroll": 8})
+        module_options = wp.get_module_options()
+        self.assertIsInstance(module_options, dict)
+        self.assertEqual(module_options["max_unroll"], 8)
+
+
+if __name__ == "__main__":
+    wp.build.clear_kernel_cache()
+    unittest.main(verbosity=2)