Skip to content

Commit 78b3c33

Browse files
authored
Merge branch 'master' into djv/vcatca
2 parents e99b03f + dc97ca8 commit 78b3c33

File tree

5 files changed

+13
-2
lines changed

5 files changed

+13
-2
lines changed

.github/workflows/downstream.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
- {repo: ContinuumArrays.jl, group: JuliaApproximation}
3838
- {repo: ClassicalOrthogonalPolynomials.jl, group: JuliaApproximation}
3939
- {repo: SemiclassicalOrthogonalPolynomials.jl, group: JuliaApproximation}
40+
- {repo: SingularIntegrals.jl, group: JuliaApproximation}
4041

4142
steps:
4243
- uses: actions/checkout@v6

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "LazyArrays"
22
uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02"
3-
version = "2.9.3"
3+
version = "2.9.4"
44

55
[deps]
66
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/lazybroadcasting.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,3 +466,4 @@ permutedims(A::BroadcastArray{T}) where T = BroadcastArray{T}(A.f, map(_permuted
466466
_adjortrans(A::SubArray{<:Any,2, <:Any, <:Tuple{Slice,Any}}) = view(_adjortrans(parent(A)), parentindices(A)[2])
467467
_adjortrans(A::Adjoint) = A'
468468
_adjortrans(A::Transpose) = transpose(A)
469+
_adjortrans(A::BroadcastArray{T}) where T = BroadcastArray{T}(A.f, map(_adjortrans, A.args)...)

test/broadcasttests.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,12 @@ using Infinities
394394
a = BroadcastArray(real, ((1:5) .+ im)')
395395
@test a[:,1:3] == (1:3)'
396396
@test a[:,1:3] isa Adjoint{Int,Vector{Int}}
397+
@test a[1,1:3] == 1:3
397398

398399
a = BroadcastArray(real, transpose((1:5) .+ im))
399400
@test a[:,1:3] == (1:3)'
400401
@test a[:,1:3] isa Adjoint{Int,Vector{Int}}
402+
@test a[1,1:3] == 1:3
401403
end
402404

403405
@testset "broadcast with adjtrans/triangular/hermsym" begin

test/cachetests.jl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ using Infinities
539539
@testset "DualLayout{<:AbstractCachedLayout}" begin
540540
arg1 = view((1:100)', :, 1:10)
541541
arg2 = view(AccumulateAbstractVector(*, 1:100)', :, 1:10)
542-
bc = Base.Broadcast.Broadcasted(CachedArrayStyle{2}(), *, (arg1, arg2))
542+
bc = Base.Broadcast.Broadcasted(CachedArrayStyle{2}(), *, (arg1, arg2));
543543
rsz_bc = LazyArrays.resize_bcargs!(bc);
544544
@test rsz_bc.args[2] == view(arg2.parent.parent.data', :, 1:10)
545545
end
@@ -735,6 +735,13 @@ using Infinities
735735
@test cacheddata(x) == BroadcastVector(*, 1:4, 11:14)
736736
@test Base.Broadcast.BroadcastStyle(typeof(cacheddata(x))) == LazyArrays.LazyArrayStyle{1}()
737737
end
738+
739+
@testset "resizedata! for AdjTrans array" begin
740+
x = LazyArrays.CachedArray(rand(1, 10))';
741+
@test parent(x).datasize == (0, 0)
742+
LazyArrays.resizedata!(x, 4, 1)
743+
@test parent(x).datasize == (1, 4)
744+
end
738745
end
739746

740747
end # module

0 commit comments

Comments
 (0)