replace matching_axes with checkaxes

Author: ogauthe

src/fusiontensor/base_interface.jl

@@ -11,7 +11,7 @@ Base.:*(ft::FusionTensor, x::Number) = set_data_matrix(ft, x * data_matrix(ft))
 
 # tensor contraction is a block data_matrix product.
 function Base.:*(left::FusionTensor, right::FusionTensor)
-  @assert matching_dual(domain_axes(left), codomain_axes(right))
+  checkaxes_dual(domain_axes(left), codomain_axes(right))
   new_data_matrix = data_matrix(left) * data_matrix(right)
   return fusiontensor(new_data_matrix, codomain_axes(left), domain_axes(right))
 end
@@ -20,14 +20,14 @@ Base.:+(ft::FusionTensor) = ft
 
 # tensor addition is a block data_matrix add.
 function Base.:+(left::FusionTensor, right::FusionTensor)
-  @assert matching_axes(axes(left), axes(right))
+  checkaxes(axes(left), axes(right))
   return set_data_matrix(left, data_matrix(left) + data_matrix(right))
 end
 
 Base.:-(ft::FusionTensor) = set_data_matrix(ft, -data_matrix(ft))
 
 function Base.:-(left::FusionTensor, right::FusionTensor)
-  @assert matching_axes(axes(left), axes(right))
+  checkaxes(axes(left), axes(right))
   return set_data_matrix(left, data_matrix(left) - data_matrix(right))
 end
 

src/fusiontensor/fusiontensor.jl

@@ -182,8 +182,11 @@ function initialize_allowed_sectors!(mat::AbstractMatrix)
   end
 end
 
-matching_dual(axes1::Tuple, axes2::Tuple) = matching_axes(axes1, dual.(axes2))
-matching_axes(axes1::Tuple, axes2::Tuple) = false
-function matching_axes(axes1::T, axes2::T) where {T<:Tuple}
-  return all(space_isequal.(axes1, axes2))
+checkaxes_dual(axes1, axes2) = checkaxes(axes1, dual.(axes2))
+function checkaxes(ax1, ax2)
+  return checkaxes(Bool, ax1, ax2) ||
+         throw(DimensionMismatch(lazy"$ax1 does not match $ax2"))
+end
+function checkaxes(::Type{Bool}, axes1, axes2)
+  return length(axes1) == length(axes2) && all(space_isequal.(axes1, axes2))
 end

src/fusiontensor/linear_algebra_interface.jl

@@ -28,15 +28,9 @@ function LinearAlgebra.mul!(
   end
 
   # input validation
-  if !matching_dual(domain_axes(A), codomain_axes(B))
-    throw(codomainError("Incompatible tensor axes for A and B"))
-  end
-  if !matching_axes(codomain_axes(C), codomain_axes(A))
-    throw(codomainError("Incompatible tensor axes for C and A"))
-  end
-  if !matching_axes(domain_axes(C), domain_axes(B))
-    throw(codomainError("Incompatible tensor axes for C and B"))
-  end
+  checkaxes_dual(domain_axes(A), codomain_axes(B))
+  checkaxes(codomain_axes(C), codomain_axes(A))
+  checkaxes(domain_axes(C), domain_axes(B))
   mul!(data_matrix(C), data_matrix(A), data_matrix(B), α, β)
   return C
 end

test/basics/setup.jl

@@ -6,8 +6,8 @@ using FusionTensors:
   codomain_axes,
   data_matrix,
   domain_axes,
-  matching_axes,
-  matching_dual,
+  checkaxes,
+  checkaxes_dual,
   matrix_column_axis,
   matrix_row_axis,
   ndims_codomain,
@@ -37,8 +37,8 @@ function check_sanity(ft::FusionTensor)
   @assert nda + nca == ndims(ft) "invalid ndims"
 
   @assert length(axes(ft)) == ndims(ft) "ndims does not match axes"
-  @assert matching_axes(axes(ft)[begin:nda], codomain_axes(ft)) "axes do not match codomain_axes"
-  @assert matching_axes(axes(ft)[(nda + 1):end], domain_axes(ft)) "axes do not match domain_axes"
+  checkaxes(axes(ft)[begin:nda], codomain_axes(ft))
+  checkaxes(axes(ft)[(nda + 1):end], domain_axes(ft))
 
   m = data_matrix(ft)
   @assert ndims(m) == 2 "invalid data_matrix ndims"

test/basics/test_basics.jl

@@ -7,8 +7,8 @@ using FusionTensors:
   data_matrix,
   domain_axes,
   fusiontensor,
-  matching_axes,
-  matching_dual,
+  checkaxes,
+  checkaxes_dual,
   matrix_column_axis,
   matrix_row_axis,
   matrix_size,
@@ -34,11 +34,11 @@ include("setup.jl")
 
   # getters
   @test data_matrix(ft1) == m
-  @test matching_axes(codomain_axes(ft1), (g1,))
-  @test matching_axes(domain_axes(ft1), (g2,))
+  @test checkaxes(codomain_axes(ft1), (g1,))
+  @test checkaxes(domain_axes(ft1), (g2,))
 
   # misc
-  @test matching_axes(axes(ft1), (g1, g2))
+  @test checkaxes(axes(ft1), (g1, g2))
   @test ndims_codomain(ft1) == 1
   @test ndims_domain(ft1) == 1
   @test matrix_size(ft1) == (6, 5)
@@ -60,36 +60,36 @@ include("setup.jl")
   @test ft2 !== ft1
   @test data_matrix(ft2) == data_matrix(ft1)
   @test data_matrix(ft2) !== data_matrix(ft1)
-  @test matching_axes(codomain_axes(ft2), codomain_axes(ft1))
-  @test matching_axes(domain_axes(ft2), domain_axes(ft1))
+  @test checkaxes(codomain_axes(ft2), codomain_axes(ft1))
+  @test checkaxes(domain_axes(ft2), domain_axes(ft1))
 
   ft2 = deepcopy(ft1)
   @test ft2 !== ft1
   @test data_matrix(ft2) == data_matrix(ft1)
   @test data_matrix(ft2) !== data_matrix(ft1)
-  @test matching_axes(codomain_axes(ft2), codomain_axes(ft1))
-  @test matching_axes(domain_axes(ft2), domain_axes(ft1))
+  @test checkaxes(codomain_axes(ft2), codomain_axes(ft1))
+  @test checkaxes(domain_axes(ft2), domain_axes(ft1))
 
   # similar
   ft2 = similar(ft1)
   @test isnothing(check_sanity(ft2))
   @test eltype(ft2) == Float64
-  @test matching_axes(codomain_axes(ft2), codomain_axes(ft1))
-  @test matching_axes(domain_axes(ft2), domain_axes(ft1))
+  @test checkaxes(codomain_axes(ft2), codomain_axes(ft1))
+  @test checkaxes(domain_axes(ft2), domain_axes(ft1))
 
   ft3 = similar(ft1, ComplexF64)
   @test isnothing(check_sanity(ft3))
   @test eltype(ft3) == ComplexF64
-  @test matching_axes(codomain_axes(ft3), codomain_axes(ft1))
-  @test matching_axes(domain_axes(ft3), domain_axes(ft1))
+  @test checkaxes(codomain_axes(ft3), codomain_axes(ft1))
+  @test checkaxes(domain_axes(ft3), domain_axes(ft1))
 
   @test_throws AssertionError similar(ft1, Int)
 
   ft5 = similar(ft1, ComplexF32, ((g1, g1), (g2,)))
   @test isnothing(check_sanity(ft5))
   @test eltype(ft5) == ComplexF64
-  @test matching_axes(codomain_axes(ft5), (g1, g1))
-  @test matching_axes(domain_axes(ft5), (g2,))
+  @test checkaxes(codomain_axes(ft5), (g1, g1))
+  @test checkaxes(domain_axes(ft5), (g2,))
 end
 
 @testset "More than 2 axes" begin
@@ -103,8 +103,8 @@ end
   ft = fusiontensor(m2, (g1, g2), (g3, g4))
 
   @test data_matrix(ft) == m2
-  @test matching_axes(codomain_axes(ft), (g1, g2))
-  @test matching_axes(domain_axes(ft), (g3, g4))
+  @test checkaxes(codomain_axes(ft), (g1, g2))
+  @test checkaxes(domain_axes(ft), (g3, g4))
 
   @test axes(ft) == (g1, g2, g3, g4)
   @test ndims_codomain(ft) == 2
@@ -232,6 +232,11 @@ end
   @test space_isequal(dual(g3), codomain_axes(ad)[1])
   @test space_isequal(dual(g4), codomain_axes(ad)[2])
   @test isnothing(check_sanity(ad))
+
+  ft7 = FusionTensor(Float64, (g1,), (g2, g3, g4))
+  @test_throws DimensionMismatch ft7 + ft3
+  @test_throws DimensionMismatch ft7 - ft3
+  @test_throws DimensionMismatch ft7 * ft3
 end
 
 @testset "mising SectorProduct" begin

test/basics/test_permutedims.jl

@@ -4,7 +4,7 @@ using Test: @test, @testset, @test_broken
 using FusionTensors:
   FusionTensor,
   data_matrix,
-  matching_axes,
+  checkaxes,
   matrix_column_axis,
   matrix_row_axis,
   naive_permutedims,
@@ -41,14 +41,14 @@ include("setup.jl")
       ft3 = permutedims(ft1, (4,), (1, 2, 3))
       @test ft3 !== ft1
       @test ft3 isa FusionTensor{elt,4}
-      @test matching_axes(axes(ft3), (dual(g4), g1, g2, dual(g3)))
+      @test checkaxes(axes(ft3), (dual(g4), g1, g2, dual(g3)))
       @test ndims_domain(ft3) == 3
       @test ndims_codomain(ft3) == 1
       @test ndims(ft3) == 4
       @test isnothing(check_sanity(ft3))
 
       ft4 = permutedims(ft3, (2, 3), (4, 1))
-      @test matching_axes(axes(ft1), axes(ft4))
+      @test checkaxes(axes(ft1), axes(ft4))
       @test space_isequal(matrix_column_axis(ft1), matrix_column_axis(ft4))
       @test space_isequal(matrix_row_axis(ft1), matrix_row_axis(ft4))
       @test ft4 ≈ ft1