Fix broken merge

Fix broken merge

Author: jack-dunham

src/beliefpropagation/beliefpropagationproblem.jl

@@ -79,7 +79,7 @@ end
 function SimpleMessageUpdate(
         edge;
         normalize = true,
-        contraction_alg = "eager",
+        contraction_alg = "exact",
         compute_diff = false,
         kwargs...
     )
@@ -275,7 +275,7 @@ function select_algorithm(
     end
 
     extended_kwargs = extend_columns((; message_diff_function, kwargs...), maxiter)
-    edge_kwargs = rows(extended_kwargs, len = maxiter)
+    edge_kwargs = rows(extended_kwargs, maxiter)
 
     return BeliefPropagation(maxiter; stopping_criterion) do repnum
         return beliefpropagation_sweep(cache; edges, edge_kwargs[repnum]...)

src/contract_network.jl

@@ -1,11 +1,27 @@
 using BackendSelection: @Algorithm_str, Algorithm
 using Base.Broadcast: materialize
-using NamedDimsArrays: inds
-using ITensorNetworksNext.LazyNamedDimsArrays: LazyNamedDimsArrays, Mul, lazy, optimize_evaluation_order,
+using ITensorNetworksNext.LazyNamedDimsArrays: Mul, lazy, optimize_evaluation_order,
     substitute, symnameddims
 
-function contract_network(tn; alg = default_kwargs(contract_network, tn).alg)
-    return contract_network(alg, tn)
+# This is related to `MatrixAlgebraKit.select_algorithm`.
+# TODO: Define this in BackendSelection.jl.
+backend_value(::Algorithm{alg}) where {alg} = alg
+using BackendSelection: parameters
+function merge_parameters(alg::Algorithm; kwargs...)
+    return Algorithm(backend_value(alg); merge(parameters(alg), kwargs)...)
+end
+to_algorithm(alg::Algorithm; kwargs...) = merge_parameters(alg; kwargs...)
+to_algorithm(alg; kwargs...) = Algorithm(alg; kwargs...)
+
+# `contract_network`
+function contract_network(alg::Algorithm, tn)
+    return throw(ArgumentError("`contract_network` algorithm `$(alg)` not implemented."))
+end
+function default_kwargs(::typeof(contract_network), tn)
+    return (; alg = Algorithm"exact"(; order_alg = Algorithm"eager"()))
+end
+function contract_network(tn; alg = default_kwargs(contract_network, tn).alg, kwargs...)
+    return contract_network(to_algorithm(alg; kwargs...), tn)
 end
 
 # `contract_network(::Algorithm"exact", ...)`
@@ -34,36 +50,20 @@ end
 
 # `contraction_order`
 function contraction_order end
-default_kwargs(::typeof(contraction_order), tensors) = (; order = "eager")
-
-function contraction_expression(tensors; order = default_kwargs(contraction_order, tensors).order)
-    order = contraction_order(order, tensors)
-
-    # Contraction order may or may not have indices attached, canonicalize the format
-    # by attaching indices.
-    subs = Dict(symnameddims(i) => symnameddims(i, tensors[i]) for i in keys(tensors))
-
-    return substitute(order, subs)
-end
-
-contraction_order(order, tensors) = order
-function contraction_order(tensors; order = default_kwargs(contraction_order, tensors).order)
-    return contraction_order(Algorithm(order), tensors)
+default_kwargs(::typeof(contraction_order), tn) = (; alg = Algorithm"eager"())
+function contraction_order(tn; alg = default_kwargs(contraction_order, tn).alg, kwargs...)
+    return contraction_order(to_algorithm(alg; kwargs...), tn)
 end
 # Convert the tensor network to a flat symbolic multiplication expression.
-function contraction_order(::Algorithm"flat", tensors)
+function contraction_order(alg::Algorithm"flat", tn)
     # Same as: `reduce((a, b) -> *(a, b; flatten = true), syms)`.
     syms = vec([symnameddims(i, Tuple(axes(tn[i]))) for i in keys(tn)])
     return lazy(Mul(syms))
 end
 function contraction_order(alg::Algorithm"left_associative", tn)
     return prod(i -> symnameddims(i, Tuple(axes(tn[i]))), keys(tn))
 end
-
-function contraction_order(
-        order_algorithm::Algorithm,
-        tensors,
-    )
-    order = contraction_order(tensors; order = "flat")
-    return optimize_evaluation_order(order; alg = order_algorithm)
+function contraction_order(alg::Algorithm, tn)
+    s = contraction_order(Algorithm"flat"(), tn)
+    return optimize_evaluation_order(s; alg)
 end