Skip to content

Include infinitearrays only once in tests #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 15, 2025
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
2 changes: 1 addition & 1 deletion test/infinitearrays.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/JuliaLang/julia/blob/master/test/testhelpers/InfiniteArrays.jl
module InfiniteArrays
using Infinities, LinearAlgebra, Random
using ..ArrayLayouts: ArrayLayouts, LayoutVector, LayoutMatrix, Mul, DenseColumnMajor
using ArrayLayouts: ArrayLayouts, LayoutVector, LayoutMatrix, Mul, DenseColumnMajor
export OneToInf,
InfSymTridiagonal,
InfTridiagonal,
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ end

Random.seed!(0)

include("infinitearrays.jl")
include("test_utils.jl")
include("test_layouts.jl")
include("test_muladd.jl")
Expand Down
3 changes: 1 addition & 2 deletions test/test_cumsum.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
module TestCumsum

using ArrayLayouts, Test, Infinities

include("infinitearrays.jl")
using ..InfiniteArrays

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

Expand Down
7 changes: 3 additions & 4 deletions test/test_layoutarray.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module TestLayoutArray

using ArrayLayouts, LinearAlgebra, FillArrays, Test, SparseArrays, Random
using ArrayLayouts: sub_materialize, MemoryLayout, ColumnNorm, RowMaximum, CRowMaximum, @_layoutlmul, Mul
import ArrayLayouts: triangulardata
using ArrayLayouts: sub_materialize, ColumnNorm, RowMaximum, CRowMaximum, @_layoutlmul, Mul
import ArrayLayouts: triangulardata, MemoryLayout
import LinearAlgebra: Diagonal, Bidiagonal, Tridiagonal, SymTridiagonal

struct MyMatrix{T,M<:AbstractMatrix{T}} <: LayoutMatrix{T}
Expand Down Expand Up @@ -643,8 +643,7 @@ triangulardata(A::MyUpperTriangular) = triangulardata(A.A)
end

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

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