Skip to content

Commit 5967b76

Browse files
authored
Allow LazyArray 2, and drop Julia 1.6 (#77)
* allow LazyArray 2, etc * Update ci.yml * fix an ambiguity * skip LV * diagview take II
1 parent 1819443 commit 5967b76

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,26 @@ jobs:
1111
test:
1212
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
1313
runs-on: ${{ matrix.os }}
14-
continue-on-error: ${{ matrix.version == 'nightly' }}
1514
strategy:
1615
fail-fast: false
1716
matrix:
1817
version:
19-
- '1.6'
20-
- '1' # '1' will automatically expand to the latest stable 1.x release of Julia.
18+
- '1'
2119
- 'nightly'
20+
- "1.10"
2221
os:
2322
- ubuntu-latest
2423
arch:
2524
- x64
2625
steps:
27-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v3
2827
- uses: julia-actions/setup-julia@v1
28+
continue-on-error: ${{ matrix.julia-version == 'nightly' }}
2929
with:
3030
version: ${{ matrix.version }}
3131
arch: ${{ matrix.arch }}
32-
- uses: actions/cache@v1
32+
- uses: actions/cache@v3
33+
continue-on-error: ${{ matrix.julia-version == 'nightly' }}
3334
env:
3435
cache-name: cache-artifacts
3536
with:
@@ -40,8 +41,14 @@ jobs:
4041
${{ runner.os }}-test-
4142
${{ runner.os }}-
4243
- uses: julia-actions/julia-buildpkg@v1
44+
continue-on-error: ${{ matrix.julia-version == 'nightly' }}
4345
- uses: julia-actions/julia-runtest@v1
46+
continue-on-error: ${{ matrix.julia-version == 'nightly' }}
4447
- uses: julia-actions/julia-processcoverage@v1
45-
- uses: codecov/codecov-action@v1
48+
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
49+
continue-on-error: ${{ matrix.julia-version == 'nightly' }}
50+
- uses: codecov/codecov-action@v3
51+
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
4652
with:
4753
file: lcov.info
54+
continue-on-error: ${{ matrix.julia-version == 'nightly' }}

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "TensorCast"
22
uuid = "02d47bb6-7ce6-556a-be16-bb1710789e2b"
33
authors = ["Michael Abbott"]
4-
version = "0.4.8"
4+
version = "0.4.9"
55

66
[deps]
77
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
@@ -16,13 +16,13 @@ TransmuteDims = "24ddb15e-299a-5cc3-8414-dbddc482d9ca"
1616
[compat]
1717
ChainRulesCore = "1.11"
1818
Compat = "3.46, 4.2" # for stack
19-
LazyArrays = "0.21, 0.22, 1"
19+
LazyArrays = "1, 2"
2020
LazyStack = "0.1.0"
2121
MacroTools = "0.5"
2222
StaticArrays = "1.3"
2323
Strided = "1.1, 2"
2424
TransmuteDims = "0.1.13"
25-
julia = "1.6"
25+
julia = "1.10"
2626

2727
[extras]
2828
Einsum = "b7d42ee7-0b51-5a75-98ca-779d3107e4c0"

src/view.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
if !isdefined(LinearAlgebra, :diagview) # trying to solve error on 1.12
22
"""
33
diagview(M) = view(M, diagind(M))
44
@@ -7,6 +7,7 @@ Like `diag(M)` but makes a view.
77
diagview(A::AbstractMatrix) = view(A, diagind(A))
88

99
diagview(A::LinearAlgebra.Diagonal) = A.diag
10+
end
1011

1112
"""
1213
rvec(x) = [x]
@@ -39,4 +40,4 @@ star(x,y,zs...) = star(star(x,y), zs...)
3940
4041
Used with arguments which are there just to set the shape of broadcasting.
4142
"""
42-
onlyfirst(x, ys...) = x
43+
onlyfirst(x, ys...) = x

test/two.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ end
243243
@test mat[1,2] != 99
244244

245245
end
246-
@testset "@avx" begin
246+
VERSION < v"1.12-" && @testset "@avx" begin
247247

248-
using LoopVectorization
248+
using LoopVectorization # supports 1.10 and maybe 1.11, likely to be broken on master
249249

250250
A = rand(4,5)
251251
@test exp.(A) @cast @avx B[i,j] := exp(A[i,j])

0 commit comments

Comments
 (0)