Merge branch 'main' into DualSector

ogauthe · ogauthe · commit 06aab1d49f8a · 2025-02-19T17:03:40.000-05:00
diff --git a/.github/workflows/IntegrationTest.yml b/.github/workflows/IntegrationTest.yml
@@ -0,0 +1,27 @@
+name: "IntegrationTest"
+
+on:
+  push:
+    branches:
+      - 'main'
+    tags: '*'
+    paths:
+      - 'Project.toml'
+  pull_request:
+    paths:
+      - 'Project.toml'
+
+jobs:
+  integration-test:
+    name: "IntegrationTest"
+    strategy:
+       matrix:
+         repo:
+           - 'ITensor/ITensorBase.jl'
+           - 'ITensor/NamedDimsArrays.jl'
+           - 'ITensor/QuantumOperatorDefinitions.jl'
+           - 'ITensor/TensorAlgebra.jl'
+    uses: "ITensor/ITensorActions/.github/workflows/IntegrationTest.yml@main"
+    with:
+      localregistry: "https://github.com/ITensor/ITensorRegistry.git"
+      repo: "${{ matrix.repo }}"
diff --git a/.github/workflows/IntegrationTestRequest.yml b/.github/workflows/IntegrationTestRequest.yml
@@ -0,0 +1,14 @@
+name: "Integration Test Request"
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  integrationrequest:
+    if: |
+      github.event.issue.pull_request &&
+      contains(fromJSON('["OWNER", "COLLABORATOR", "MEMBER"]'), github.event.comment.author_association)
+    uses: ITensor/ITensorActions/.github/workflows/IntegrationTestRequest.yml@main
+    with:
+      localregistry: https://github.com/ITensor/ITensorRegistry.git
diff --git a/.github/workflows/Register.yml b/.github/workflows/Register.yml
diff --git a/.github/workflows/Registrator.yml b/.github/workflows/Registrator.yml
@@ -0,0 +1,24 @@
+name: Register Package
+on:
+  workflow_dispatch:
+  pull_request:
+    types:
+      - closed
+    paths:
+      - 'Project.toml'
+    branches:
+      - 'master'
+      - 'main'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Register:
+    if: github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true
+    uses: "ITensor/ITensorActions/.github/workflows/Registrator.yml@main"
+    with:
+      localregistry: ITensor/ITensorRegistry
+    secrets:
+      REGISTRATOR_KEY: ${{ secrets.REGISTRATOR_KEY }}
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 ITensor developers
+Copyright (c) 2025 ITensor developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "BlockSparseArrays"
 uuid = "2c9a651f-6452-4ace-a6ac-809f4280fbb4"
 authors = ["ITensor developers <support@itensor.org> and contributors"]
-version = "0.2.18"
+version = "0.2.20"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
diff --git a/docs/make.jl b/docs/make.jl
@@ -22,7 +22,7 @@ makedocs(;
     edit_link="main",
     assets=String[],
   ),
-  pages=["Home" => "index.md", "Library" => "library.md"],
+  pages=["Home" => "index.md", "Reference" => "reference.md"],
 )
 
 deploydocs(;
diff --git a/docs/src/reference.md b/docs/src/reference.md
@@ -1,4 +1,4 @@
-# Library
+# Reference
 
 ```@autodocs
 Modules = [BlockSparseArrays]
diff --git a/ext/BlockSparseArraysGradedUnitRangesExt/BlockSparseArraysGradedUnitRangesExt.jl b/ext/BlockSparseArraysGradedUnitRangesExt/BlockSparseArraysGradedUnitRangesExt.jl
@@ -2,7 +2,7 @@ module BlockSparseArraysGradedUnitRangesExt
 
 using BlockSparseArrays: AnyAbstractBlockSparseArray, BlockSparseArray, blocktype
 using GradedUnitRanges: AbstractGradedUnitRange
-using TypeParameterAccessors: set_eltype, set_ndims, unwrap_array_type
+using TypeParameterAccessors: similartype, unwrap_array_type
 
 # A block spare array similar to the input (dense) array.
 # TODO: Make `BlockSparseArrays.blocksparse_similar` more general and use that,
@@ -15,9 +15,7 @@ function similar_blocksparse(
   # TODO: Probably need to unwrap the type of `a` in certain cases
   # to make a proper block type.
   return BlockSparseArray{
-    elt,
-    length(axes),
-    set_eltype(set_ndims(unwrap_array_type(blocktype(a)), length(axes)), elt),
+    elt,length(axes),similartype(unwrap_array_type(blocktype(a)), elt, axes)
   }(
     axes
   )
diff --git a/ext/BlockSparseArraysTensorAlgebraExt/BlockSparseArraysTensorAlgebraExt.jl b/ext/BlockSparseArraysTensorAlgebraExt/BlockSparseArraysTensorAlgebraExt.jl
@@ -94,13 +94,15 @@ function TensorAlgebra.splitdims(
     groupreducewhile(tensor_product, split_axes, ndims(a); init=OneToOne()) do i, axis
       return length(axis) ≤ length(axes(a, i))
     end
-  blockperms = invblockperm.(blocksortperm.(axes_prod))
+  blockperms = blocksortperm.(axes_prod)
+  sorted_axes = map((r, I) -> only(axes(r[I])), axes_prod, blockperms)
+
   # TODO: This is doing extra copies of the blocks,
   # use `@view a[axes_prod...]` instead.
   # That will require implementing some reindexing logic
   # for this combination of slicing.
-  a_unblocked = a[axes_prod...]
-  a_blockpermed = a_unblocked[blockperms...]
+  a_unblocked = a[sorted_axes...]
+  a_blockpermed = a_unblocked[invblockperm.(blockperms)...]
   return splitdims(BlockReshapeFusion(), a_blockpermed, split_axes...)
 end
 
diff --git a/test/test_gradedunitrangesext.jl b/test/test_gradedunitrangesext.jl
@@ -12,10 +12,12 @@ using SymmetrySectors: U1
 using TensorAlgebra: fusedims, splitdims
 using LinearAlgebra: adjoint
 using Random: randn!
-function blockdiagonal!(f, a::AbstractArray)
-  for i in 1:minimum(blocksize(a))
+function randn_blockdiagonal(elt::Type, axes::Tuple)
+  a = BlockSparseArray{elt}(axes)
+  blockdiaglength = minimum(blocksize(a))
+  for i in 1:blockdiaglength
     b = Block(ntuple(Returns(i), ndims(a)))
-    a[b] = f(a[b])
+    a[b] = randn!(a[b])
   end
   return a
 end
@@ -25,8 +27,7 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
   @testset "map" begin
     d1 = gradedrange([U1(0) => 2, U1(1) => 2])
     d2 = gradedrange([U1(0) => 2, U1(1) => 2])
-    a = BlockSparseArray{elt}(d1, d2, d1, d2)
-    blockdiagonal!(randn!, a)
+    a = randn_blockdiagonal(elt, (d1, d2, d1, d2))
     @test axes(a, 1) isa GradedOneTo
     @test axes(view(a, 1:4, 1:4, 1:4, 1:4), 1) isa GradedOneTo
 
@@ -82,8 +83,7 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
   @testset "fusedims" begin
     d1 = gradedrange([U1(0) => 1, U1(1) => 1])
     d2 = gradedrange([U1(0) => 1, U1(1) => 1])
-    a = BlockSparseArray{elt}(d1, d2, d1, d2)
-    blockdiagonal!(randn!, a)
+    a = randn_blockdiagonal(elt, (d1, d2, d1, d2))
     m = fusedims(a, (1, 2), (3, 4))
     for ax in axes(m)
       @test ax isa GradedOneTo
@@ -100,6 +100,11 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
     @test a[2, 2, 2, 2] == m[4, 4]
     @test blocksize(m) == (3, 3)
     @test a == splitdims(m, (d1, d2), (d1, d2))
+
+    # check block fusing and splitting
+    d = gradedrange([U1(0) => 2, U1(1) => 1])
+    a = randn_blockdiagonal(elt, (d, d, dual(d), dual(d)))
+    @test splitdims(fusedims(a, (1, 2), (3, 4)), axes(a)...) == a
   end
 
   @testset "dual axes" begin
@@ -343,6 +348,21 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
     @test b[Block(1)] == a1
     @test iszero(b[Block(2)])
     @test all(GradedUnitRanges.labelled_isequal.(axes(b), (r,)))
+
+    # Regression test for BitArray
+    r = gradedrange([U1(0) => 2, U1(1) => 3])
+    a1 = trues(2, 2)
+    a2 = trues(3, 3)
+    a = cat(a1, a2; dims=(1, 2))
+    b = a[r, dual(r)]
+    @test eltype(b) === Bool
+    @test b isa BlockSparseMatrix{Bool}
+    @test blockstoredlength(b) == 2
+    @test b[Block(1, 1)] == a1
+    @test iszero(b[Block(2, 1)])
+    @test iszero(b[Block(1, 2)])
+    @test b[Block(2, 2)] == a2
+    @test all(GradedUnitRanges.labelled_isequal.(axes(b), (r, dual(r))))
   end
 end
 end

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ makedocs(;`
`22`	`22`	`edit_link="main",`
`23`	`23`	`assets=String[],`
`24`	`24`	`),`
`25`		`- pages=["Home" => "index.md", "Library" => "library.md"],`
	`25`	`+ pages=["Home" => "index.md", "Reference" => "reference.md"],`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`deploydocs(;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Library`
	`1`	`+# Reference`
`2`	`2`
`3`	`3`	```@autodocs
`4`	`4`	`Modules = [BlockSparseArrays]`