Skip to content

Commit 899b469

Browse files
authored
Merge branch 'master' into permutedims
2 parents 7ce8f5b + 6f61dc3 commit 899b469

File tree

15 files changed

+1272
-174
lines changed

15 files changed

+1272
-174
lines changed

.github/workflows/CompatHelper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
run: which julia
1616
continue-on-error: true
1717
- name: Install Julia, but only if it is not already available in the PATH
18-
uses: julia-actions/setup-julia@v1
18+
uses: julia-actions/setup-julia@v2
1919
with:
2020
version: '1'
2121
arch: ${{ runner.arch }}

.github/workflows/Invalidations.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Invalidations
22

33
on:
44
pull_request:
5+
paths-ignore:
6+
- 'LICENSE'
7+
- 'README.md'
8+
- '.github/workflows/TagBot.yml'
59

610
concurrency:
711
# Skip intermediate builds: always.
@@ -16,7 +20,7 @@ jobs:
1620
if: github.base_ref == github.event.repository.default_branch
1721
runs-on: ubuntu-latest
1822
steps:
19-
- uses: julia-actions/setup-julia@v1
23+
- uses: julia-actions/setup-julia@v2
2024
with:
2125
version: '1'
2226
- uses: actions/checkout@v4

.github/workflows/ci.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,17 @@ on:
33
push:
44
branches:
55
- master
6+
tags: [v*]
7+
paths-ignore:
8+
- 'LICENSE'
9+
- 'README.md'
10+
- '.github/workflows/TagBot.yml'
611
pull_request:
12+
paths-ignore:
13+
- 'LICENSE'
14+
- 'README.md'
15+
- '.github/workflows/TagBot.yml'
16+
717

818
concurrency:
919
group: build-${{ github.event.pull_request.number || github.ref }}-${{ github.workflow }}
@@ -28,9 +38,9 @@ jobs:
2838
fail-fast: false
2939
matrix:
3040
version:
31-
- '1.6'
41+
- 'lts'
3242
- '1'
33-
- '~1.10.0-0'
43+
- 'pre'
3444
os:
3545
- ubuntu-latest
3646
- macOS-latest
@@ -39,14 +49,15 @@ jobs:
3949
- x64
4050
steps:
4151
- uses: actions/checkout@v4
42-
- uses: julia-actions/setup-julia@v1
52+
- uses: julia-actions/setup-julia@v2.2
4353
with:
4454
version: ${{ matrix.version }}
4555
arch: ${{ matrix.arch }}
46-
- uses: julia-actions/cache@v1
56+
- uses: julia-actions/cache@v2
4757
- uses: julia-actions/julia-buildpkg@v1
4858
- uses: julia-actions/julia-runtest@v1
4959
- uses: julia-actions/julia-processcoverage@v1
50-
- uses: codecov/codecov-action@v3
60+
- uses: codecov/codecov-action@v4
5161
with:
62+
token: ${{ secrets.CODECOV_TOKEN }}
5263
file: lcov.info

.github/workflows/docs.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,19 @@ name: Documentation
22

33
on:
44
pull_request:
5+
paths-ignore:
6+
- 'LICENSE'
7+
- 'README.md'
8+
- '.github/workflows/TagBot.yml'
59
push:
610
branches:
711
- 'master'
812
- 'release-'
913
tags: '*'
14+
paths-ignore:
15+
- 'LICENSE'
16+
- 'README.md'
17+
- '.github/workflows/TagBot.yml'
1018
release:
1119
types: [published]
1220

@@ -23,7 +31,7 @@ jobs:
2331
with:
2432
version: ${{ matrix.julia-version }}
2533
- name: Cache artifacts
26-
uses: actions/cache@v3
34+
uses: actions/cache@v4
2735
env:
2836
cache-name: cache-artifacts
2937
with:

.github/workflows/downstream.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ on:
33
push:
44
branches: [master]
55
tags: [v*]
6+
paths-ignore:
7+
- 'LICENSE'
8+
- 'README.md'
9+
- '.github/workflows/TagBot.yml'
610
pull_request:
711
paths-ignore:
812
- 'LICENSE'
@@ -29,14 +33,15 @@ jobs:
2933
name: ${{ matrix.package.group }}/${{ matrix.package.repo }}/${{ matrix.julia-version }}
3034
runs-on: ${{ matrix.os }}
3135
strategy:
32-
fail-fast: true
36+
fail-fast: false
3337
matrix:
3438
julia-version: ['1']
3539
os: [ubuntu-latest]
3640
package:
3741
- {repo: Distributions.jl, group: JuliaStats}
3842
- {repo: BlockArrays.jl, group: JuliaArrays}
3943
- {repo: LazyArrays.jl, group: JuliaArrays}
44+
- {repo: InfiniteArrays.jl, group: JuliaArrays}
4045
- {repo: ArrayLayouts.jl, group: JuliaLinearAlgebra}
4146
- {repo: LazyBandedMatrices.jl, group: JuliaLinearAlgebra}
4247
- {repo: BandedMatrices.jl, group: JuliaLinearAlgebra}
@@ -46,7 +51,7 @@ jobs:
4651

4752
steps:
4853
- uses: actions/checkout@v4
49-
- uses: julia-actions/setup-julia@v1
54+
- uses: julia-actions/setup-julia@v2
5055
with:
5156
version: ${{ matrix.julia-version }}
5257
arch: x64
@@ -74,6 +79,7 @@ jobs:
7479
exit(0) # Exit immediately, as a success
7580
end
7681
- uses: julia-actions/julia-processcoverage@v1
77-
- uses: codecov/codecov-action@v3
82+
- uses: codecov/codecov-action@v4
7883
with:
84+
token: ${{ secrets.CODECOV_TOKEN }}
7985
files: lcov.info

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
deps/deps.jl
55
.DS_Store
66
Manifest.toml
7+
Manifest-v*.*.toml
78
docs/build

Project.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
name = "FillArrays"
22
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
3-
version = "1.10.0"
3+
version = "1.13.0"
44

55
[deps]
66
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
77
PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150"
8-
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
98
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
109
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1110

@@ -21,7 +20,6 @@ FillArraysStatisticsExt = "Statistics"
2120

2221
[compat]
2322
Aqua = "0.8"
24-
Base64 = "1.6"
2523
Documenter = "1"
2624
Infinities = "0.1"
2725
LinearAlgebra = "1.6"
@@ -37,16 +35,16 @@ julia = "1.6"
3735

3836
[extras]
3937
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
40-
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
4138
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
4239
Infinities = "e1ba4f0e-776d-440f-acd9-e1d2e9742647"
4340
PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150"
4441
Quaternions = "94ee1d12-ae83-5a48-8b1c-48b8ff168ae0"
42+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
4543
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
4644
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
4745
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
4846
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
4947
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5048

5149
[targets]
52-
test = ["Aqua", "Test", "Base64", "Infinities", "PDMats", "ReverseDiff", "SparseArrays", "StaticArrays", "Statistics", "Quaternions", "Documenter"]
50+
test = ["Aqua", "Test", "Infinities", "PDMats", "ReverseDiff", "SparseArrays", "StaticArrays", "Statistics", "Quaternions", "Documenter", "Random"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![codecov](https://codecov.io/gh/JuliaArrays/FillArrays.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaArrays/FillArrays.jl)
77
[![deps](https://juliahub.com/docs/FillArrays/deps.svg)](https://juliahub.com/ui/Packages/FillArrays/2Dg1l?t=2)
88
[![version](https://juliahub.com/docs/FillArrays/version.svg)](https://juliahub.com/ui/Packages/FillArrays/2Dg1l)
9-
[![pkgeval](https://juliahub.com/docs/FillArrays/pkgeval.svg)](https://juliahub.com/ui/Packages/FillArrays/2Dg1l)
9+
[![pkgeval](https://juliahub.com/docs/FillArrays/pkgeval.svg)](https://juliaci.github.io/NanosoldierReports/pkgeval_badges/report.html)
1010
[![Aqua](https://raw.githubusercontent.com/JuliaTesting/Aqua.jl/master/badge.svg)](https://github.com/JuliaTesting/Aqua.jl)
1111

1212
Julia package to lazily represent matrices filled with a single entry,

ext/FillArraysSparseArraysExt.jl

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

33
using SparseArrays
4+
using SparseArrays: SparseVectorUnion
45
import Base: convert, kron
56
using FillArrays
6-
using FillArrays: RectDiagonalFill, RectOrDiagonalFill, ZerosVector, ZerosMatrix, getindex_value
7-
using LinearAlgebra
7+
using FillArrays: RectDiagonalFill, RectOrDiagonalFill, ZerosVector, ZerosMatrix, getindex_value, AbstractFillVector, _fill_dot
8+
# Specifying the full namespace is necessary because of https://github.com/JuliaLang/julia/issues/48533
9+
# See https://github.com/JuliaStats/LogExpFunctions.jl/pull/63
10+
using FillArrays.LinearAlgebra
11+
import LinearAlgebra: dot, kron, I
812

913
##################
1014
## Sparse arrays
@@ -56,4 +60,12 @@ end
5660
# TODO: remove in v2.0
5761
@deprecate kron(E1::RectDiagonalFill, E2::RectDiagonalFill) kron(sparse(E1), sparse(E2))
5862

63+
# Ambiguity. see #178
64+
if VERSION >= v"1.8"
65+
dot(x::AbstractFillVector, y::SparseVectorUnion) = _fill_dot(x, y)
66+
else
67+
dot(x::AbstractFillVector{<:Number}, y::SparseVectorUnion{<:Number}) = _fill_dot(x, y)
68+
end
69+
70+
5971
end # module

0 commit comments

Comments
 (0)