diff --git a/Project.toml b/Project.toml index 1908d7b2..f85f1539 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "BlockSparseArrays" uuid = "2c9a651f-6452-4ace-a6ac-809f4280fbb4" authors = ["ITensor developers and contributors"] -version = "0.10.18" +version = "0.10.19" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" @@ -24,7 +24,7 @@ TypeParameterAccessors = "7e5a90cf-f82e-492e-a09b-e3e26432c138" TensorAlgebra = "68bd88dc-f39d-4e12-b2ca-f046b68fcc6a" [extensions] -BlockSparseArraysTensorAlgebraExt = "TensorAlgebra" +BlockSparseArraysTensorAlgebraExt = ["TensorAlgebra", "BlockArrays", "SparseArraysBase"] [compat] Adapt = "4.1.1" @@ -41,7 +41,7 @@ MapBroadcast = "0.1.5" MatrixAlgebraKit = "0.6" SparseArraysBase = "0.9" SplitApplyCombine = "1.2.3" -TensorAlgebra = "0.6.2" +TensorAlgebra = "0.6.2, 0.7" TypeParameterAccessors = "0.4.1" julia = "1.10" diff --git a/ext/BlockSparseArraysTensorAlgebraExt/BlockSparseArraysTensorAlgebraExt.jl b/ext/BlockSparseArraysTensorAlgebraExt/BlockSparseArraysTensorAlgebraExt.jl index 3a71e90e..b2e411aa 100644 --- a/ext/BlockSparseArraysTensorAlgebraExt/BlockSparseArraysTensorAlgebraExt.jl +++ b/ext/BlockSparseArraysTensorAlgebraExt/BlockSparseArraysTensorAlgebraExt.jl @@ -1,11 +1,13 @@ module BlockSparseArraysTensorAlgebraExt -using BlockArrays: Block, blocklength, blocks, eachblockaxes1 +using BlockArrays: AbstractBlockArray, Block, blocklength, blocks, eachblockaxes1 using BlockSparseArrays: AbstractBlockSparseArray, AbstractBlockSparseMatrix, BlockUnitRange, blockrange, blocksparse using SparseArraysBase: eachstoredindex -using TensorAlgebra: TensorAlgebra, BlockReshapeFusion, BlockedTuple, matricize, - matricize_axes, tensor_product_axis, unmatricize +using TensorAlgebra: TensorAlgebra, BlockedTuple, FusionStyle, matricize, matricize_axes, + tensor_product_axis, unmatricize + +const BlockReshapeFusion = typeof(FusionStyle(AbstractBlockArray)) function TensorAlgebra.tensor_product_axis( style::BlockReshapeFusion, side::Val{:codomain}, r1::BlockUnitRange, r2::BlockUnitRange diff --git a/test/Project.toml b/test/Project.toml index 7c002dae..33feb929 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -40,7 +40,7 @@ SafeTestsets = "0.1" SparseArraysBase = "0.9" StableRNGs = "1" Suppressor = "0.2" -TensorAlgebra = "0.6" +TensorAlgebra = "0.6, 0.7" Test = "1.10" TestExtras = "0.3" TypeParameterAccessors = "0.4"