Merge main

Author: mtfishman

Project.toml

@@ -27,14 +27,14 @@ KroneckerArraysTensorProductsExt = "TensorProducts"
 [compat]
 Adapt = "4.3"
 BlockArrays = "1.6"
-BlockSparseArrays = "0.9"
+BlockSparseArrays = "0.9, 0.10.3"
 DerivableInterfaces = "0.5.3"
 DiagonalArrays = "0.3.16"
 FillArrays = "1.13"
 GPUArraysCore = "0.2"
 LinearAlgebra = "1.10"
 MapBroadcast = "0.1.10"
-MatrixAlgebraKit = "0.2"
+MatrixAlgebraKit = "0.2, 0.3"
 TensorAlgebra = "0.3.10"
 TensorProducts = "0.1.7"
 julia = "1.10"

ext/KroneckerArraysBlockSparseArraysExt/KroneckerArraysBlockSparseArraysExt.jl

@@ -23,6 +23,17 @@ function BlockSparseArrays.blockrange(bs::Vector{<:CartesianProduct})
   return blockrange(map(cartesianrange, bs))
 end
 
+using BlockArrays: BlockArrays, mortar
+using BlockSparseArrays: blockrange
+using KroneckerArrays: CartesianProductUnitRange
+# Makes sure that `mortar` results in a `BlockVector` with the correct
+# axes, otherwise the axes would not preserve the Kronecker structure.
+# This is helpful when indexing `BlockUnitRange`, for example:
+# https://github.com/JuliaArrays/BlockArrays.jl/blob/v1.7.1/src/blockaxis.jl#L540-L547
+function BlockArrays.mortar(blocks::AbstractVector{<:CartesianProductUnitRange})
+  return mortar(blocks, (blockrange(map(Base.axes1, blocks)),))
+end
+
 using BlockArrays: AbstractBlockedUnitRange
 using BlockSparseArrays: Block, ZeroBlocks, eachblockaxis, mortar_axis
 using KroneckerArrays: KroneckerArrays, KroneckerArray, ⊗, arg1, arg2, _similar

test/Project.toml

@@ -23,15 +23,15 @@ TestExtras = "5ed8adda-3752-4e41-b88a-e8b09835ee3a"
 Adapt = "4"
 Aqua = "0.8"
 BlockArrays = "1.6"
-BlockSparseArrays = "0.9"
+BlockSparseArrays = "0.9, 0.10"
 DerivableInterfaces = "0.5"
 DiagonalArrays = "0.3.7"
 FillArrays = "1"
 GPUArraysCore = "0.2"
 JLArrays = "0.2"
 KroneckerArrays = "0.2"
 LinearAlgebra = "1.10"
-MatrixAlgebraKit = "0.2"
+MatrixAlgebraKit = "0.2, 0.3"
 SafeTestsets = "0.1"
 StableRNGs = "1.0"
 Suppressor = "0.2"