Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ArrayLayouts"
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
authors = ["Sheehan Olver <solver@mac.com>"]
version = "1.12.2"
authors = ["Sheehan Olver <solver@mac.com>"]

[deps]
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
Expand All @@ -20,6 +20,7 @@ FillArrays = "1.2.1"
Infinities = "0.1"
JLArrays = "0.2"
LinearAlgebra = "1"
ParallelTestRunner = "2"
Quaternions = "0.7"
Random = "1"
SparseArrays = "1"
Expand All @@ -32,11 +33,12 @@ julia = "1.10"
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Infinities = "e1ba4f0e-776d-440f-acd9-e1d2e9742647"
JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb"
ParallelTestRunner = "d3525ed8-44d0-4b2c-a655-542cee43accc"
Quaternions = "94ee1d12-ae83-5a48-8b1c-48b8ff168ae0"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Aqua", "Infinities", "JLArrays", "Quaternions", "Random", "StableRNGs", "SparseArrays", "Test"]
test = ["Aqua", "Infinities", "JLArrays", "ParallelTestRunner", "Quaternions", "Random", "StableRNGs", "SparseArrays", "Test"]
39 changes: 20 additions & 19 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
module ArrayLayoutsTests

import ArrayLayouts
import Aqua
import Random
using Test

downstream_test = "--downstream_integration_test" in ARGS
@testset "Project quality" begin
Aqua.test_all(ArrayLayouts,
ambiguities = false,
piracies = (; broken=true),
stale_deps = !downstream_test,
)
using ParallelTestRunner

const init_code = quote
import Random
Random.seed!(0)
end

# Start with autodiscovered tests
testsuite = find_tests(pwd())

if "--downstream_integration_test" in ARGS
delete!(testsuite, "test_aqua")
end

Random.seed!(0)
filtered_args = filter(!=("--downstream_integration_test"), ARGS)
# Parse arguments
args = parse_args(filtered_args)

if filter_tests!(testsuite, args)
delete!(testsuite, "infinitearrays")
end

include("infinitearrays.jl")
include("test_utils.jl")
include("test_layouts.jl")
include("test_muladd.jl")
include("test_ldiv.jl")
include("test_layoutarray.jl")
include("test_cumsum.jl")
runtests(ArrayLayouts, args; testsuite, init_code)

end
14 changes: 14 additions & 0 deletions test/test_aqua.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module AquaTests

import Aqua
import ArrayLayouts
using Test

@testset "Project quality" begin
Aqua.test_all(ArrayLayouts,
ambiguities = false,
piracies = (; broken=true),
)
end

end
4 changes: 3 additions & 1 deletion test/test_cumsum.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
module TestCumsum

using ArrayLayouts, Test, Infinities
using ..InfiniteArrays

include("infinitearrays.jl")
using .InfiniteArrays

cmpop(p) = isinteger(real(first(p))) && isinteger(real(step(p))) ? (==) : (≈)

Expand Down
6 changes: 3 additions & 3 deletions test/test_layoutarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import ArrayLayouts: triangulardata, MemoryLayout
import LinearAlgebra: Diagonal, Bidiagonal, Tridiagonal, SymTridiagonal
import Base.Broadcast: BroadcastStyle, AbstractArrayStyle

include("infinitearrays.jl")
using .InfiniteArrays

struct MyMatrix{T,M<:AbstractMatrix{T}} <: LayoutMatrix{T}
A::M
end
Expand Down Expand Up @@ -706,9 +709,6 @@ triangulardata(A::MyUpperTriangular) = triangulardata(A.A)
VERSION >= v"1.9" && @test U / MyMatrix(A) ≈ U / A
end

# Tests needed for InfiniteRandomArrays.jl (see https://github.com/DanielVandH/InfiniteRandomArrays.jl/issues/5)
using ..InfiniteArrays

@testset "* for infinite layouts" begin
tup = InfSymTridiagonal(), InfTridiagonal(), InfBidiagonal('U'),
InfBidiagonal('L'),
Expand Down
Loading