warp-lang 1.6.1__py3-none-macosx_10_13_universal2.whl → 1.7.0__py3-none-macosx_10_13_universal2.whl

warp/fem/geometry/tetmesh.py

@@ -1,3 +1,18 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from typing import Optional
 
 import warp as wp
@@ -41,7 +56,6 @@ class TetmeshSideArg:
     face_tet_indices: wp.array(dtype=wp.vec2i)
 
 
-_mat32 = wp.mat(shape=(3, 2), dtype=float)
 _NULL_BVH = wp.constant(wp.uint64(-1))
 
 
@@ -188,7 +202,7 @@ class Tetmesh(Geometry):
         p1 = args.positions[args.tet_vertex_indices[s.element_index, 1]]
         p2 = args.positions[args.tet_vertex_indices[s.element_index, 2]]
         p3 = args.positions[args.tet_vertex_indices[s.element_index, 3]]
-        return wp.mat33(p1 - p0, p2 - p0, p3 - p0)
+        return wp.matrix_from_cols(p1 - p0, p2 - p0, p3 - p0)
 
     @wp.func
     def cell_inverse_deformation_gradient(args: CellArg, s: Sample):
@@ -297,7 +311,7 @@ class Tetmesh(Geometry):
     @wp.func
     def side_deformation_gradient(args: SideArg, s: Sample):
         e1, e2 = Tetmesh._side_vecs(args, s.element_index)
-        return _mat32(e1, e2)
+        return wp.matrix_from_cols(e1, e2)
 
     @wp.func
     def side_inner_cell_index(arg: SideArg, side_index: ElementIndex):
@@ -374,7 +388,7 @@ class Tetmesh(Geometry):
         else:
             c2 = 1.0 - tet_coords[0] - tet_coords[1] - tet_coords[2]
 
-        return wp.select(c0 + c1 + c2 > 0.999, Coords(OUTSIDE), Coords(c0, c1, c2))
+        return wp.where(c0 + c1 + c2 > 0.999, Coords(c0, c1, c2), Coords(OUTSIDE))
 
     @wp.func
     def side_to_cell_arg(side_arg: SideArg):

warp/fem/geometry/trimesh.py

@@ -1,3 +1,18 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from typing import Any, Optional
 
 import warp as wp
@@ -310,9 +325,7 @@ class Trimesh(Geometry):
             elif edge_vidx[0] == v:
                 start = k
 
-        return wp.select(
-            tri_coords[start] + tri_coords[end] > 0.999, Coords(OUTSIDE), Coords(tri_coords[end], 0.0, 0.0)
-        )
+        return wp.where(tri_coords[start] + tri_coords[end] > 0.999, Coords(tri_coords[end], 0.0, 0.0), Coords(OUTSIDE))
 
     def _build_topology(self, temporary_store: TemporaryStore):
         from warp.fem.utils import compress_node_indices, host_read_at_index, masked_indices
@@ -561,7 +574,7 @@ class Trimesh2D(Trimesh):
         p0 = args.positions[tri_idx[0]]
         p1 = args.positions[tri_idx[1]]
         p2 = args.positions[tri_idx[2]]
-        return wp.mat22(p1 - p0, p2 - p0)
+        return wp.matrix_from_cols(p1 - p0, p2 - p0)
 
     @wp.func
     def cell_lookup(args: CellArg, pos: wp.vec2):
@@ -674,9 +687,6 @@ class Trimesh3DSideArg:
     positions: wp.array(dtype=wp.vec3)
 
 
-_mat32 = wp.mat(shape=(3, 2), dtype=float)
-
-
 class Trimesh3D(Trimesh):
     """3D Triangular mesh geometry"""
 
@@ -699,7 +709,7 @@ class Trimesh3D(Trimesh):
         p0 = args.positions[tri_idx[0]]
         p1 = args.positions[tri_idx[1]]
         p2 = args.positions[tri_idx[2]]
-        return _mat32(p1 - p0, p2 - p0)
+        return wp.matrix_from_cols(p1 - p0, p2 - p0)
 
     @wp.func
     def cell_lookup(args: CellArg, pos: wp.vec3):