Skip to content

Commit 55362a9

Browse files
authored
Empty blockcol/rowsupport (#112)
* Add tezsts * Update CompatHelper.yml
1 parent ce65785 commit 55362a9

File tree

4 files changed

+30
-25
lines changed

4 files changed

+30
-25
lines changed

.github/workflows/CompatHelper.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
name: CompatHelper
2-
32
on:
43
schedule:
5-
- cron: '00 * * * *'
6-
4+
- cron: 0 0 * * *
5+
workflow_dispatch:
76
jobs:
8-
build:
9-
runs-on: ${{ matrix.os }}
10-
strategy:
11-
matrix:
12-
julia-version: [1.2.0]
13-
julia-arch: [x86]
14-
os: [ubuntu-latest]
7+
CompatHelper:
8+
runs-on: ubuntu-latest
159
steps:
16-
- uses: julia-actions/setup-julia@latest
17-
with:
18-
version: ${{ matrix.julia-version }}
19-
- name: Install dependencies
20-
run: julia -e 'using Pkg; Pkg.add(Pkg.PackageSpec(name = "CompatHelper", url = "https://github.com/bcbi/CompatHelper.jl.git"))'
21-
- name: CompatHelper.main
10+
- name: "Install CompatHelper"
11+
run: |
12+
import Pkg
13+
name = "CompatHelper"
14+
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
15+
version = "2"
16+
Pkg.add(; name, uuid, version)
17+
shell: julia --color=yes {0}
18+
- name: "Run CompatHelper"
19+
run: |
20+
import CompatHelper
21+
CompatHelper.main()
22+
shell: julia --color=yes {0}
2223
env:
2324
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24-
JULIA_DEBUG: CompatHelper
25-
run: julia -e 'using CompatHelper; CompatHelper.main()'
25+
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
26+
# COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "BlockBandedMatrices"
22
uuid = "ffab5731-97b5-5995-9138-79e8c1846df0"
3-
version = "0.10.5"
3+
version = "0.10.6"
44

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

src/AbstractBlockBandedMatrix.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ blockbanded_blockrowstop(A, i::BlockRange) = blockbanded_blockrowstop(A, maximum
8181

8282
const AllBlockBandedLayout{UPLO,UNIT} = Union{AbstractBlockBandedLayout,TriangularLayout{UPLO,UNIT,<:AbstractBlockBandedLayout}}
8383

84-
@inline blockcolsupport(::AllBlockBandedLayout, A, i) = blockbanded_blockcolstart(A,i):blockbanded_blockcolstop(A,i)
85-
@inline blockrowsupport(::AllBlockBandedLayout, A, i) = blockbanded_blockrowstart(A,i):blockbanded_blockrowstop(A,i)
84+
@inline blockcolsupport(::AllBlockBandedLayout, A, i) = isempty(i) ? (Block(1):Block(0)) : blockbanded_blockcolstart(A,i):blockbanded_blockcolstop(A,i)
85+
@inline blockrowsupport(::AllBlockBandedLayout, A, i) = isempty(i) ? (Block(1):Block(0)) : blockbanded_blockrowstart(A,i):blockbanded_blockrowstop(A,i)
8686

8787

8888
# length of i-the column/row

test/test_blockbanded.jl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,20 @@ import Base.Broadcast: materialize!
9797
A = BlockBandedMatrix{Int}(undef, rows,cols, (l,u))
9898
A.data .= 1:length(A.data)
9999

100-
@test blockrowsupport(A, 1) == Block.(1:3)
100+
@test @inferred(blockrowsupport(A, 1)) == Block.(1:3)
101101
@test blockrowsupport(A, 2) == Block.(1:4)
102102
@test blockrowsupport(A, 3) == Block.(2:4)
103-
@test blockrowsupport(A, Block.(3:4)) == Block.(2:4)
104103

105-
@test blockcolsupport(A, 1) == Block.(1:2)
104+
@test @inferred(blockcolsupport(A, 1)) == Block.(1:2)
106105
@test blockcolsupport(A, 2) == Block.(1:3)
107106
@test blockcolsupport(A, 3) == Block.(1:4)
108107
@test blockcolsupport(A, 4) == Block.(2:4)
109-
@test blockcolsupport(A, Block.(1:2)) == Block.(1:3)
108+
109+
@test @inferred(blockrowsupport(A, Block.(3:4))) == Block.(2:4)
110+
@test @inferred(blockcolsupport(A, Block.(1:2))) == Block.(1:3)
111+
112+
@test @inferred(blockcolsupport(A, Block.(1:0))) == Block.(1:0)
113+
@test @inferred(blockcolsupport(A, 1:0)) == Block.(1:0)
110114
end
111115

112116
@testset "block-banded matrix interface for blockranges" begin

0 commit comments

Comments
 (0)