Merge branch 'master' into patch-2

Author: putianyi889

.github/workflows/ci.yml

@@ -10,22 +10,21 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.6'
+          - 'lts'
           - '1'
-          - '^1.11.0-0'          
         os:
           - ubuntu-latest
           - macOS-latest
           - windows-latest
         arch:
           - x64
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         env:
           cache-name: cache-artifacts
         with:
@@ -38,6 +37,7 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: lcov.info

.github/workflows/downstream.yml

@@ -0,0 +1,69 @@
+name: IntegrationTest
+on:
+  push:
+    branches: [master]
+    tags: [v*]
+  pull_request:
+    paths-ignore:
+      - 'LICENSE'
+      - 'README.md'
+      - '.github/workflows/TagBot.yml'
+
+jobs:
+  pre_job:
+    # continue-on-error: true # Uncomment once integration is finished
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+  test:
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
+    name: ${{ matrix.package.group }}/${{ matrix.package.repo }}/${{ matrix.julia-version }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        julia-version: ['1']
+        os: [ubuntu-latest]
+        package:
+          - {repo: ContinuumArrays.jl, group: JuliaApproximation}
+          - {repo: ClassicalOrthogonalPolynomials.jl, group: JuliaApproximation}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: ${{ matrix.julia-version }}
+          arch: x64
+      - uses: julia-actions/julia-buildpkg@latest
+      - name: Clone Downstream
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ matrix.package.group }}/${{ matrix.package.repo }}
+          path: downstream
+      - name: Load this and run the downstream tests
+        shell: julia --color=yes --project=downstream {0}
+        run: |
+          using Pkg
+          try
+            # force it to use this PR's version of the package
+            Pkg.develop(PackageSpec(path="."))  # resolver may fail with main deps
+            Pkg.update()
+            Pkg.test(; coverage = true)  # resolver may fail with test time deps
+          catch err
+            err isa Pkg.Resolve.ResolverError || rethrow()
+            # If we can't resolve that means this is incompatible by SemVer and this is fine
+            # It means we marked this as a breaking change, so we don't need to worry about
+            # Mistakenly introducing a breaking change, as we have intentionally made one
+            @info "Not compatible with this release. No problem." exception=err
+            exit(0)  # Exit immediately, as a success
+          end
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: lcov.info

Project.toml

@@ -1,7 +1,7 @@
 name = "QuasiArrays"
 uuid = "c4ea9172-b204-11e9-377d-29865faadc5c"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "0.11.7"
+version = "0.11.9"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/QuasiArrays.jl

@@ -6,7 +6,7 @@ import Base: getindex, size, axes, axes1, length, ==, isequal, iterate, Cartesia
                 isreal, iszero, isempty, empty, isapprox, fill!, getproperty, showarg
 import Base: @_inline_meta, DimOrInd, OneTo, @_propagate_inbounds_meta, @_noinline_meta,
                 DimsInteger, error_if_canonical_getindex, @propagate_inbounds, _return_type,
-                safe_tail, tail, _getindex, _maybe_reshape, index_ndims, _unsafe_getindex,
+                safe_tail, front, tail, _getindex, _maybe_reshape, index_ndims, _unsafe_getindex,
                 index_shape, to_shape, @nloops, @ncall, unalias, _unaliascopy,
                 to_index, to_indices, _to_subscript_indices, _splatmap, dataids,
                 compute_stride1, compute_offset1, fill_to_length
@@ -49,7 +49,9 @@ import LazyArrays: MemoryLayout, UnknownLayout, Mul, ApplyLayout, BroadcastLayou
                     LdivStyle, InvLayout, PInvLayout, sub_materialize, lazymaterialize,
                     _mul, rowsupport, DiagonalLayout, adjointlayout, transposelayout, conjlayout,
                     sublayout, call, LazyArrayStyle, layout_getindex, _broadcast2broadcastarray, _applyarray_summary, _broadcastarray_summary,
-                    _broadcasted_mul, simplifiable, simplify, _mul_colsupport, _mul_rowsupport
+                    _broadcasted_mul, simplifiable, simplify, _mul_colsupport, _mul_rowsupport,
+                    _adjoint, _transpose
+
 import EltypeExtensions: elconvert
 
 import Base.IteratorsMD

src/calculus.jl

@@ -33,7 +33,12 @@ end
 
 function sum_layout(LAY::ApplyLayout{typeof(*)}, V::AbstractQuasiVector, ::Colon)
     a = arguments(LAY, V)
-    first(apply(*, sum(a[1]; dims=1), tail(a)...))
+    only(*(sum(a[1]; dims=1), tail(a)...))
+end
+
+function sum_layout(LAY::ApplyLayout{typeof(*)}, V::AbstractQuasiMatrix, ::Colon)
+    a = arguments(LAY, V)
+    only(*(sum(a[1]; dims=1), front(tail(a))..., sum(a[end]; dims=2)))
 end
 
 sum_layout(::MemoryLayout, A, dims) = sum_size(size(A), A, dims)

src/quasiadjtrans.jl

@@ -237,6 +237,14 @@ BroadcastStyle(::Type{<:QuasiTranspose{<:Any,<:Inclusion}}) = LazyQuasiArrayStyl
 
 
 
+###
+# broadcast support
+###
+
+arguments(b::BroadcastLayout, A::QuasiAdjoint) = map(_adjoint, arguments(b, parent(A)))
+arguments(b::BroadcastLayout, A::QuasiTranspose) = map(_transpose, arguments(b, parent(A)))
+
+
 ###
 # adjoint concat support
 ###

src/quasifill.jl

@@ -198,28 +198,31 @@ show(io::IO, F::AbstractQuasiFill) = summary(io, F)
 
 function summary(io::IO, F::QuasiOnes)
     print(io, "ones(")
-    summary(io, F.axes[1])
-    for a in tail(F.axes)
-        print(io, ", ")
-        summary(io, a)
+    if !isempty(F.axes)
+        summary(io, F.axes[1])
+        for a in tail(F.axes)
+            print(io, ", ")
+            summary(io, a)
+        end
     end
     print(io, ")")
 end
 
 function summary(io::IO, F::QuasiZeros)
     print(io, "zeros(")
-    summary(io, F.axes[1])
-    for a in tail(F.axes)
-        print(io, ", ")
-        summary(io, a)
+    if !isempty(F.axes)
+        summary(io, F.axes[1])
+        for a in tail(F.axes)
+            print(io, ", ")
+            summary(io, a)
+        end
     end
     print(io, ")")
 end
 
 function summary(io::IO, F::QuasiFill)
-    print(io, "fill($(F.value), ")
-    summary(io, F.axes[1])
-    for a in tail(F.axes)
+    print(io, "fill($(F.value)")
+    for a in F.axes
         print(io, ", ")
         summary(io, a)
     end

test/test_calculus.jl

@@ -17,6 +17,7 @@ using QuasiArrays, IntervalSets, Test
         @test sum(ApplyQuasiArray(*, A, B)) ≈ sum(A*B)
         @test sum(ApplyQuasiArray(*, A, B); dims=1) ≈ sum(A*B; dims=1)
         @test sum(ApplyQuasiArray(*, A, B); dims=2) ≈ sum(A*B; dims=2)
+        @test sum(ApplyQuasiArray(*, A, B)) ≈ sum(A*B)
 
         @test sum(b) ≈ last(cumsum(b)) ≈ cumsum(b)[2]
         @test cumsum(B)[2:2,:] ≈ cumsum(B; dims=1)[2:2,:] ≈ sum(B; dims=1)

test/test_quasibroadcast.jl

@@ -299,4 +299,12 @@ import QuasiArrays: QuasiCartesianIndex, QuasiCartesianIndices, DefaultQuasiArra
         A[ones(Int)] .+= 1
         @test A == [2,1,1,1]
     end
+
+    @testset "adjoint arguments" begin
+        a = QuasiVector(randn(6), 0:0.5:2.5)
+        @test LazyArrays.MemoryLayout(BroadcastQuasiArray(*, 2, a)') isa LazyArrays.BroadcastLayout
+        @test LazyArrays.MemoryLayout(transpose(BroadcastQuasiArray(*, 2, a))) isa LazyArrays.BroadcastLayout
+        @test LazyArrays.arguments(BroadcastQuasiArray(*, 2, a)') == (2, a')
+        @test LazyArrays.arguments(transpose(BroadcastQuasiArray(*, 2, a))) == (2, transpose(a))
+    end
 end

test/test_quasifill.jl

@@ -706,9 +706,17 @@ import QuasiArrays: AbstractQuasiFill
     end
 
     @testset "show" begin
+        @test stringmime("text/plain",ones(Inclusion([1,2,3]), Inclusion([1,2,4]))) == "ones(Inclusion([1, 2, 3]), Inclusion([1, 2, 4]))"
+        @test stringmime("text/plain",zeros(Inclusion([1,2,3]), Inclusion([1,2,4]))) == "zeros(Inclusion([1, 2, 3]), Inclusion([1, 2, 4]))"
+        @test stringmime("text/plain",fill(2,Inclusion([1,2,3]), Inclusion([1,2,4]))) == "fill(2, Inclusion([1, 2, 3]), Inclusion([1, 2, 4]))"
+
         @test stringmime("text/plain",ones(Inclusion([1,2,3]))) == "ones(Inclusion([1, 2, 3]))"
         @test stringmime("text/plain",zeros(Inclusion([1,2,3]))) == "zeros(Inclusion([1, 2, 3]))"
         @test stringmime("text/plain",fill(2,Inclusion([1,2,3]))) == "fill(2, Inclusion([1, 2, 3]))"
+
+        @test stringmime("text/plain",QuasiOnes()) == "ones()"
+        @test stringmime("text/plain",QuasiZeros()) == "zeros()"
+        @test stringmime("text/plain",QuasiFill(2)) == "fill(2)"
     end
 
     @testset "Mul" begin