Skip to content

Commit 2396ff1

Browse files
authored
Merge branch 'master' into mf/sub_materialize_invoke
2 parents 5f4db5b + 067e9c4 commit 2396ff1

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- macOS-latest
4545
- windows-latest
4646
steps:
47-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v5
4848
- uses: julia-actions/setup-julia@v2
4949
with:
5050
version: ${{ matrix.version }}

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: Documentation
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- uses: julia-actions/setup-julia@v2
2424
with:
2525
version: '1.10'

.github/workflows/downstream.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
- {repo: InfiniteLinearAlgebra.jl, group: JuliaLinearAlgebra}
4747

4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050
- uses: julia-actions/setup-julia@v2
5151
with:
5252
version: ${{ matrix.julia-version }}
5353
arch: x64
5454
- uses: julia-actions/julia-buildpkg@latest
5555
- name: Clone Downstream
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v5
5757
with:
5858
repository: ${{ matrix.package.group }}/${{ matrix.package.repo }}
5959
path: downstream

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ version = "1.12.0"
55

66
[deps]
77
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
8+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
89
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
910

1011
[weakdeps]
@@ -35,7 +36,6 @@ Quaternions = "94ee1d12-ae83-5a48-8b1c-48b8ff168ae0"
3536
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
3637
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
3738
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
38-
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
3939
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
4040

4141
[targets]

src/ArrayLayouts.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ using LinearAlgebra.BLAS: BlasComplex, BlasFloat, BlasReal
2424
const AdjointQtype{T} = isdefined(LinearAlgebra, :AdjointQ) ? LinearAlgebra.AdjointQ{T} : Adjoint{T,<:AbstractQ}
2525

2626
using FillArrays: AbstractFill, axes_print_matrix_row, getindex_value
27+
using StaticArrays
2728

2829
using Base: require_one_based_indexing
2930

@@ -306,6 +307,8 @@ function zero!(_, A::AbstractArray{<:AbstractArray})
306307
A
307308
end
308309

310+
zero!(_, A::AbstractArray{<:SArray}) = fill!(A,zero(eltype(A)))
311+
309312
_norm(_, A, p) = invoke(norm, Tuple{Any,Real}, A, p)
310313
LinearAlgebra.norm(A::LayoutArray, p::Real=2) = _norm(MemoryLayout(A), A, p)
311314
LinearAlgebra.norm(A::SubArray{<:Any,N,<:LayoutArray}, p::Real=2) where N = _norm(MemoryLayout(A), A, p)

test/test_muladd.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module TestMulAdd
22

3-
using ArrayLayouts, FillArrays, Random, StableRNGs, LinearAlgebra, Test, Quaternions
3+
using ArrayLayouts, FillArrays, Random, StableRNGs, LinearAlgebra, Test, Quaternions, StaticArrays
44
using ArrayLayouts: DenseColumnMajor, AbstractStridedLayout, AbstractColumnMajor, DiagonalLayout, mul, Mul, zero!
55

66
Random.seed!(0)
77
@testset "Multiplication" begin
88
@testset "zero!" begin
9-
for A in (randn(5,5), [randn(5,5),randn(4,4)])
9+
for A in (randn(5,5), [randn(5,5),randn(4,4)], [SVector(2,3), SVector(3,4)])
1010
zero!(A)
1111
@test iszero(A)
1212
end

0 commit comments

Comments
 (0)