Merge pull request #66 from willow-ahrens/fastfinch_fix

replace fastfinch with :fast
finch-tensor · May 13, 2024 · 95a36cb · 95a36cb
2 parents 00bb7a0 + 92c3625
commit 95a36cb
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 55 deletions.
diff --git a/spmv/spmv_finch.jl b/spmv/spmv_finch.jl
@@ -85,7 +85,7 @@ function spmv_finch(y, A, x)
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseList(Element(0.0))), A)
     _d = Tensor(Dense(Element(0.0)))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         _d .= 0
         for j = _, i = _
@@ -104,4 +104,4 @@ function spmv_finch(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = ssymv_finch_kernel($_y, $_A, $_x, $_d)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_band.jl b/spmv/spmv_finch_band.jl
@@ -73,7 +73,7 @@ function spmv_finch_band(y, A, x)
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseBand(Element(0.0))), A)
     _d = Tensor(Dense(Element(0.0)))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         _d .= 0
         for j = _, i = _
@@ -92,4 +92,4 @@ function spmv_finch_band(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = ssymv_finch_band_kernel($_y, $_A, $_x, $_d)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_band_unsym_row_maj.jl b/spmv/spmv_finch_band_unsym_row_maj.jl
@@ -57,7 +57,7 @@ end
 function spmv_finch_band_unsym_row_maj(y, A, x) 
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseBand(Element(0.0))))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         for j=_, i=_
             _A[i, j] = A[j, i]

diff --git a/spmv/spmv_finch_blocked.jl b/spmv/spmv_finch_blocked.jl
@@ -184,7 +184,7 @@ function spmv_finch_blocked(y, A, x)
     b = 10
     (n, m) = size(A)
     _block_A = Tensor(Dense(SparseHash{1}(Dense(Dense(Element(0.0))))), b, b, fld1(n, b), fld1(m, b))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _block_A .= 0
         for j = _
             for i = _
@@ -197,7 +197,7 @@ function spmv_finch_blocked(y, A, x)
     @info "blocked inflation" countstored(block_A) / countstored(_A)
 
     block_x = Tensor(Dense(Dense(Element(0.0))), b, fld1(n, b))
-    @finch mode=fastfinch begin 
+    @finch mode=:fast begin 
         block_x .= 0
         for j = _
             block_x[mod1(j, b), fld1(j, b)] = x[j]
@@ -208,7 +208,7 @@ function spmv_finch_blocked(y, A, x)
     block_y = Tensor(Dense(Dense(Element(0.0))), b, fld1(n, b))
     time = @belapsed spmv_finch_blocked_helper($block_y, $block_A, $block_x, $b)
     y = Tensor(Dense(Element(0.0)), n)
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         y .= 0
         for I = _, i = _
             let _i = (I - 1) * 10 + i
@@ -218,4 +218,4 @@ function spmv_finch_blocked(y, A, x)
     end
 
     return (;time = time, y = y)
-end
+end
diff --git a/spmv/spmv_finch_int8.jl b/spmv/spmv_finch_int8.jl
@@ -85,7 +85,7 @@ function spmv_finch_int8(y, A, x)
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseList(Element(Int8(0)))), A)
     _d = Tensor(Dense(Element(Int8(0))))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= Int8(0)
         _d .= Int8(0)
         for j = _, i = _
@@ -104,4 +104,4 @@ function spmv_finch_int8(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = ssymv_finch_int8_kernel($_y, $_A, $_x, $_d)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_pattern.jl b/spmv/spmv_finch_pattern.jl
@@ -77,7 +77,7 @@ function spmv_finch_pattern(y, A, x)
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseList(Element(0.0))))
     _d = Tensor(Dense(Element(0.0)))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         _d .= 0
         for j = _, i = _
@@ -99,4 +99,4 @@ function spmv_finch_pattern(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = ssymv_finch_pattern_kernel($_y, $A_pattern, $_x, $d_pattern)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_pattern_unsym_row_maj.jl b/spmv/spmv_finch_pattern_unsym_row_maj.jl
@@ -64,7 +64,7 @@ end
 function spmv_finch_pattern_unsym_row_maj(y, A, x) 
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseList(Element(0.0))))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         for j=_, i=_
             _A[i, j] = A[j, i]
@@ -78,4 +78,4 @@ function spmv_finch_pattern_unsym_row_maj(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = spmv_finch_pattern_kernel_row_maj($_y, $A_pattern, $_x)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_point_pattern_row_maj.jl b/spmv/spmv_finch_point_pattern_row_maj.jl
@@ -49,7 +49,7 @@ end
 function spmv_finch_point_pattern_row_maj(y, A, x) 
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparsePoint(Element(0.0))), A)
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         for j=_, i=_
             _A[i, j] = A[j, i]
@@ -61,4 +61,4 @@ function spmv_finch_point_pattern_row_maj(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = spmv_finch_point_pattern_kernel_row_maj($_y, $A_pattern, $_x)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_point_row_maj.jl b/spmv/spmv_finch_point_row_maj.jl
@@ -51,7 +51,7 @@ end
 function spmv_finch_point_row_maj(y, A, x) 
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparsePoint(Element(0.0))))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         for j=_, i=_
             _A[i, j] = A[j, i]

diff --git a/spmv/spmv_finch_unsym_row_maj.jl b/spmv/spmv_finch_unsym_row_maj.jl
@@ -67,7 +67,7 @@ end
 function spmv_finch_unsym_row_maj(y, A, x) 
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseList(Element(0.0))))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         for j=_, i=_
             _A[i, j] = A[j, i]
@@ -78,4 +78,4 @@ function spmv_finch_unsym_row_maj(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = spmv_finch_kernel_row_maj($_y, $_A, $_x)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_vbl.jl b/spmv/spmv_finch_vbl.jl
@@ -104,7 +104,7 @@ function spmv_finch_vbl(y, A, x)
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseVBLLevel(Element(0.0))), A)
     _d = Tensor(Dense(Element(0.0)))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         _d .= 0
         for j = _, i = _
@@ -123,4 +123,4 @@ function spmv_finch_vbl(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = ssymv_finch_vbl_kernel($_y, $_A, $_x, $_d)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_vbl_int8.jl b/spmv/spmv_finch_vbl_int8.jl
@@ -104,7 +104,7 @@ function spmv_finch_vbl_int8(y, A, x)
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseVBLLevel(Element(Int8(0)))), A)
     _d = Tensor(Dense(Element(Int8(0))))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= Int8(0)
         _d .= Int8(0)
         for j = _, i = _
@@ -123,4 +123,4 @@ function spmv_finch_vbl_int8(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = ssymv_finch_vbl_kernel($_y, $_A, $_x, $_d)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_vbl_pattern.jl b/spmv/spmv_finch_vbl_pattern.jl
@@ -95,7 +95,7 @@ function spmv_finch_vbl_pattern(y, A, x)
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseVBLLevel(Element(0.0))), A)
     _d = Tensor(Dense(Element(0.0)))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         _d .= 0
         for j = _, i = _
@@ -116,4 +116,4 @@ function spmv_finch_vbl_pattern(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = ssymv_finch_vbl_pattern_kernel($_y, $A_pattern, $_x, $d_pattern)
     return (;time = time, y = y[])
-end
+end
diff --git a/spmv/spmv_finch_vbl_unsym_row_maj.jl b/spmv/spmv_finch_vbl_unsym_row_maj.jl
@@ -86,7 +86,7 @@ end
 function spmv_finch_vbl_unsym_row_maj(y, A, x) 
     _y = Tensor(Dense(Element(0.0)), y)
     _A = Tensor(Dense(SparseVBLLevel(Element(0.0))))
-    @finch mode=fastfinch begin
+    @finch mode=:fast begin
         _A .= 0
         for j=_, i=_
             _A[i, j] = A[j, i]
@@ -97,4 +97,4 @@ function spmv_finch_vbl_unsym_row_maj(y, A, x)
     y = Ref{Any}()
     time = @belapsed $y[] = spmv_finch_vbl_kernel($_y, $_A, $_x)
     return (;time = time, y = y[])
-end
+end