[Lang] Use ti.linalg.SparseMatrixBuilder in code

taichi-dev · Oct 15, 2021 · 0b948d8 · 0b948d8
1 parent a651e27
commit 0b948d8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/examples/simulation/implicit_mass_spring.py b/examples/simulation/implicit_mass_spring.py
@@ -33,13 +33,13 @@ def __init__(self, N):
         self.gravity = ti.Vector([0.0, -2.0])
         self.init_pos()
         self.init_edges()
-        self.MassBuilder = ti.SparseMatrixBuilder(2 * self.NV,
+        self.MassBuilder = ti.linalg.SparseMatrixBuilder(2 * self.NV,
                                                   2 * self.NV,
                                                   max_num_triplets=10000)
-        self.DBuilder = ti.SparseMatrixBuilder(2 * self.NV,
+        self.DBuilder = ti.linalg.SparseMatrixBuilder(2 * self.NV,
                                                2 * self.NV,
                                                max_num_triplets=10000)
-        self.KBuilder = ti.SparseMatrixBuilder(2 * self.NV,
+        self.KBuilder = ti.linalg.SparseMatrixBuilder(2 * self.NV,
                                                2 * self.NV,
                                                max_num_triplets=10000)
         self.init_mass_sp(self.MassBuilder)

diff --git a/examples/simulation/stable_fluid.py b/examples/simulation/stable_fluid.py
@@ -88,7 +88,7 @@ def fill_laplacian_matrix(A: ti.sparse_matrix_builder()):
             A[row, row] += center
 
     N = res * res
-    K = ti.SparseMatrixBuilder(N, N, max_num_triplets=N * 6)
+    K = ti.linalg.SparseMatrixBuilder(N, N, max_num_triplets=N * 6)
     b = ti.field(ti.f32, shape=N)
 
     fill_laplacian_matrix(K)

diff --git a/misc/sparse_matrix.py b/misc/sparse_matrix.py
@@ -4,8 +4,8 @@
 
 n = 8
 
-K = ti.SparseMatrixBuilder(n, n, max_num_triplets=100)
-f = ti.SparseMatrixBuilder(n, 1, max_num_triplets=100)
+K = ti.linalg.SparseMatrixBuilder(n, n, max_num_triplets=100)
+f = ti.linalg.SparseMatrixBuilder(n, 1, max_num_triplets=100)
 
 
 @ti.kernel

diff --git a/tests/python/test_spmv.py b/tests/python/test_spmv.py
@@ -4,7 +4,7 @@
 @ti.test(arch=ti.cpu)
 def test_sparse_matrix_vector_multiplication1():
     n = 8
-    Abuilder = ti.SparseMatrixBuilder(n, n, max_num_triplets=100)
+    Abuilder = ti.linalg.SparseMatrixBuilder(n, n, max_num_triplets=100)
     b = ti.field(ti.f32, shape=n)
 
     @ti.kernel
@@ -25,7 +25,7 @@ def fill(Abuilder: ti.sparse_matrix_builder(), b: ti.template()):
 @ti.test(arch=ti.cpu)
 def test_sparse_matrix_vector_multiplication2():
     n = 8
-    Abuilder = ti.SparseMatrixBuilder(n, n, max_num_triplets=100)
+    Abuilder = ti.linalg.SparseMatrixBuilder(n, n, max_num_triplets=100)
     b = ti.field(ti.f32, shape=n)
 
     @ti.kernel
@@ -49,7 +49,7 @@ def fill(Abuilder: ti.sparse_matrix_builder(), b: ti.template()):
 @ti.test(arch=ti.cpu)
 def test_sparse_matrix_vector_multiplication3():
     n = 8
-    Abuilder = ti.SparseMatrixBuilder(n, n, max_num_triplets=100)
+    Abuilder = ti.linalg.SparseMatrixBuilder(n, n, max_num_triplets=100)
     b = ti.field(ti.f32, shape=n)
 
     @ti.kernel