Merge remote-tracking branch 'origin/main' into wma/rm-links

finch-tensor · Nov 23, 2024 · c16ba6e · c16ba6e
2 parents 950e46b + ce1184a
commit c16ba6e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/test/reference32/interface/asmd_galley.txt b/test/reference32/interface/asmd_galley.txt
@@ -6,43 +6,43 @@ julia> A = Tensor(Dense(SparseList(Element(0.0))), [0.0 0.0 4.4; 1.1 0.0 0.0; 2.
  2.2  0.0  5.5
  3.3  0.0  0.0
 julia> A + 1
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{1.0, Float64, Int32, Vector{Float64}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{1.0, Float64, Int32, Vector{Float64}}}}}:
  1.0  1.0  5.4
  2.1  1.0  1.0
  3.2  1.0  6.5
  4.3  1.0  1.0
 julia> 1 + A
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{1.0, Float64, Int32, Vector{Float64}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{1.0, Float64, Int32, Vector{Float64}}}}}:
  1.0  1.0  5.4
  2.1  1.0  1.0
  3.2  1.0  6.5
  4.3  1.0  1.0
 julia> A + A
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
  0.0  0.0   8.8
  2.2  0.0   0.0
  4.4  0.0  11.0
  6.6  0.0   0.0
 julia> 2A
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
  0.0  0.0   8.8
  2.2  0.0   0.0
  4.4  0.0  11.0
  6.6  0.0   0.0
 julia> A * 3
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
  0.0  0.0  13.2
  3.3  0.0   0.0
  6.6  0.0  16.5
  9.9  0.0   0.0
 julia> A / 3
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
  0.0       0.0  1.46667
  0.366667  0.0  0.0
  0.733333  0.0  1.83333
  1.1       0.0  0.0
 julia> 3 / A
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{Inf, Float64, Int32, Vector{Float64}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{Inf, Float64, Int32, Vector{Float64}}}}}:
  Inf        Inf   0.681818
   2.72727   Inf  Inf
   1.36364   Inf   0.545455

diff --git a/test/reference32/interface/broadcast_galley.txt b/test/reference32/interface/broadcast_galley.txt
@@ -14,27 +14,27 @@ julia> B = [1, 2, 3, 4]
 julia> C = A .+ B
 
 julia> AsArray(C)
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
  1.0  1.0  5.4
  3.1  2.0  2.0
  5.2  3.0  8.5
  7.3  4.0  4.0
 julia> D = A .* B
 
 julia> AsArray(D)
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}}:
   0.0  0.0   4.4
   2.2  0.0   0.0
   6.6  0.0  16.5
  13.2  0.0   0.0
 julia> E = ifelse.(A .== 0, 1, 2)
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{1, Int32, Int32, Vector{Int32}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{1, Int32, Int32, Vector{Int32}}}}}:
  1  1  2
  2  1  1
  2  1  2
  2  1  1
 julia> AsArray(E)
-4×3 Tensor{DenseLevel{Int32, DenseLevel{Int32, ElementLevel{1, Int32, Int32, Vector{Int32}}}}}:
+4×3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{1, Int32, Int32, Vector{Int32}}}}}:
  1  1  2
  2  1  1
  2  1  2

diff --git a/test/reference32/interface/reduce_galley.txt b/test/reference32/interface/reduce_galley.txt
@@ -6,23 +6,23 @@ julia> A = Tensor(Dense(SparseList(Element(0.0))), [0.0 0.0 4.4; 1.1 0.0 0.0; 2.
  2.2  0.0  5.5
  3.3  0.0  0.0
 julia> reduce(+, A, dims = (1,))
-3 Tensor{DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}:
+3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}:
  6.6
  0.0
  9.9
 julia> reduce(+, A, dims = 1)
-3 Tensor{DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}:
+3 Tensor{SparseListLevel{Int32, Vector{Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}:
  6.6
  0.0
  9.9
 julia> reduce(+, A, dims = (2,))
-4 Tensor{DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}:
+4 Tensor{SparseDictLevel{Int32, Vector{Int32}, Vector{Int32}, Vector{Int32}, Dict{Tuple{Int32, Int32}, Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}:
  4.4
  1.1
  7.7
  3.3
 julia> reduce(+, A, dims = 2)
-4 Tensor{DenseLevel{Int32, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}:
+4 Tensor{SparseDictLevel{Int32, Vector{Int32}, Vector{Int32}, Vector{Int32}, Dict{Tuple{Int32, Int32}, Int32}, Vector{Int32}, ElementLevel{0.0, Float64, Int32, Vector{Float64}}}}:
  4.4
  1.1
  7.7