Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ITensorBase"
uuid = "4795dd04-0d67-49bb-8f44-b89c448a1dc7"
version = "0.11.5"
version = "0.12.0"
authors = ["ITensor developers <support@itensor.org> and contributors"]

[workspace]
Expand Down Expand Up @@ -29,14 +29,12 @@ Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6"
OMEinsumContractionOrders = "6f22d1fd-8eed-4bb7-9776-e7d684900715"
TensorKit = "07d1fe3e-3e46-537d-9eac-e9e13d0d4cec"
TensorOperations = "6aa20fa7-93e2-5fca-9bc0-fbd0db3c71a2"

[extensions]
ITensorBaseAdaptExt = "Adapt"
ITensorBaseMooncakeExt = "Mooncake"
ITensorBaseOMEinsumContractionOrdersExt = "OMEinsumContractionOrders"
ITensorBaseTensorKitExt = "TensorKit"
ITensorBaseTensorOperationsExt = "TensorOperations"

[compat]
AbstractTrees = "0.4.5"
Expand All @@ -48,13 +46,12 @@ ConstructionBase = "1.6"
LinearAlgebra = "1.10"
MatrixAlgebraKit = "0.2, 0.3, 0.4, 0.5, 0.6"
Mooncake = "0.4.202, 0.5"
OMEinsumContractionOrders = "1"
OMEinsumContractionOrders = "1.3"
OrderedCollections = "1.6"
Random = "1.10"
SimpleTraits = "0.9.4"
TensorAlgebra = "0.17.3"
TensorKit = "0.17"
TensorOperations = "5.3.1"
TermInterface = "2"
TupleTools = "1.6"
UUIDs = "1.10"
Expand Down
2 changes: 1 addition & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ path = ".."

[compat]
Documenter = "1"
ITensorBase = "0.11"
ITensorBase = "0.12"
ITensorFormatter = "0.2.27"
Literate = "2"
MatrixAlgebraKit = "0.2, 0.3, 0.4, 0.5, 0.6"
Expand Down
2 changes: 1 addition & 1 deletion examples/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ MatrixAlgebraKit = "6c742aac-3347-4629-af66-fc926824e5e4"
path = ".."

[compat]
ITensorBase = "0.11"
ITensorBase = "0.12"
MatrixAlgebraKit = "0.2, 0.3, 0.4, 0.5, 0.6"

This file was deleted.

3 changes: 0 additions & 3 deletions src/lazyitensors/evaluation_order.jl
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ end

abstract type EvaluationOrderAlgorithm end
struct Greedy <: EvaluationOrderAlgorithm end
# `Optimal` finds the cost-optimal contraction order. The method is provided by
# the TensorOperations extension.
struct Optimal <: EvaluationOrderAlgorithm end
default_optimize_evaluation_order_alg(a) = Greedy()

function optimize_contraction_order(alg, a)
Expand Down
6 changes: 2 additions & 4 deletions test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
TensorAlgebra = "68bd88dc-f39d-4e12-b2ca-f046b68fcc6a"
TensorKit = "07d1fe3e-3e46-537d-9eac-e9e13d0d4cec"
TensorOperations = "6aa20fa7-93e2-5fca-9bc0-fbd0db3c71a2"
TermInterface = "8ea1fca8-c5ef-4a55-8b96-4e9afe9c9a3c"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
Expand All @@ -31,20 +30,19 @@ AbstractTrees = "0.4.5"
Adapt = "4"
Aqua = "0.8.9"
Combinatorics = "1"
ITensorBase = "0.11"
ITensorBase = "0.12"
ITensorPkgSkeleton = "0.3.42"
JLArrays = "0.2, 0.3"
LinearAlgebra = "1.10"
MatrixAlgebraKit = "0.2, 0.3, 0.4, 0.5, 0.6"
Mooncake = "0.4, 0.5"
OMEinsumContractionOrders = "1"
OMEinsumContractionOrders = "1.3"
Random = "1.10"
SafeTestsets = "0.1"
StableRNGs = "1"
Suppressor = "0.2"
TensorAlgebra = "0.17"
TensorKit = "0.17"
TensorOperations = "5.3.1"
TermInterface = "2"
Test = "1.10"
UUIDs = "1.10"
Expand Down
12 changes: 6 additions & 6 deletions test/test_lazyitensors.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using AbstractTrees: AbstractTrees, print_tree, printnode
using Base.Broadcast: materialize
using ITensorBase: @names, Greedy, LazyNamedTensor, Mul, NamedTensor, Optimal,
SymbolicNamedTensor, dimnames, inds, ismul, lazy, nameddims, namedoneto,
optimize_evaluation_order, substitute, symnameddims
using OMEinsumContractionOrders: GreedyMethod, TreeSA
using TensorOperations: TensorOperations
using ITensorBase: @names, Greedy, LazyNamedTensor, Mul, NamedTensor, SymbolicNamedTensor,
dimnames, inds, ismul, lazy, nameddims, namedoneto, optimize_evaluation_order,
substitute, symnameddims
using OMEinsumContractionOrders: ExhaustiveSearch, GreedyMethod, TreeSA
using TermInterface: arguments, arity, children, head, iscall, isexpr, maketerm, operation,
sorted_arguments, sorted_children
using Test: @test, @test_broken, @test_throws, @testset
Expand Down Expand Up @@ -108,7 +107,7 @@ using WrappedUnions: unwrap
@test arguments(net) == [l[1], l[2] * l[3]]
end

@testset "optimize_evaluation_order ($alg)" for alg in (Greedy(), Optimal())
@testset "optimize_evaluation_order ($alg)" for alg in (Greedy(),)
i, j, k, l = namedoneto.((2, 3, 4, 5), (:i, :j, :k, :l))
s = [symnameddims(:a, (i, j)), symnameddims(:b, (j, k)), symnameddims(:c, (k, l))]
flat = lazy(Mul(s))
Expand All @@ -123,6 +122,7 @@ using WrappedUnions: unwrap

@testset "optimize_evaluation_order (OMEinsumContractionOrders $alg)" for alg in
(
ExhaustiveSearch(),
GreedyMethod(),
TreeSA(),
)
Expand Down
Loading