Skip to content

Commit 96b1c5d

Browse files
authored
Include infinitearrays only once in tests (#254)
* Include infinitearrays only once in tests * Import `MemoryLayout` in `test_layoutarray.jl`
1 parent 0690818 commit 96b1c5d

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

test/infinitearrays.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://github.com/JuliaLang/julia/blob/master/test/testhelpers/InfiniteArrays.jl
33
module InfiniteArrays
44
using Infinities, LinearAlgebra, Random
5-
using ..ArrayLayouts: ArrayLayouts, LayoutVector, LayoutMatrix, Mul, DenseColumnMajor
5+
using ArrayLayouts: ArrayLayouts, LayoutVector, LayoutMatrix, Mul, DenseColumnMajor
66
export OneToInf,
77
InfSymTridiagonal,
88
InfTridiagonal,

test/runtests.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ end
1616

1717
Random.seed!(0)
1818

19+
include("infinitearrays.jl")
1920
include("test_utils.jl")
2021
include("test_layouts.jl")
2122
include("test_muladd.jl")

test/test_cumsum.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
module TestCumsum
22

33
using ArrayLayouts, Test, Infinities
4-
5-
include("infinitearrays.jl")
4+
using ..InfiniteArrays
65

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

test/test_layoutarray.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module TestLayoutArray
22

33
using ArrayLayouts, LinearAlgebra, FillArrays, Test, SparseArrays, Random
4-
using ArrayLayouts: sub_materialize, MemoryLayout, ColumnNorm, RowMaximum, CRowMaximum, @_layoutlmul, Mul
5-
import ArrayLayouts: triangulardata
4+
using ArrayLayouts: sub_materialize, ColumnNorm, RowMaximum, CRowMaximum, @_layoutlmul, Mul
5+
import ArrayLayouts: triangulardata, MemoryLayout
66
import LinearAlgebra: Diagonal, Bidiagonal, Tridiagonal, SymTridiagonal
77

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

645645
# Tests needed for InfiniteRandomArrays.jl (see https://github.com/DanielVandH/InfiniteRandomArrays.jl/issues/5)
646-
include("infinitearrays.jl")
647-
using .InfiniteArrays
646+
using ..InfiniteArrays
648647

649648
@testset "* for infinite layouts" begin
650649
tup = InfSymTridiagonal(), InfTridiagonal(), InfBidiagonal('U'),

0 commit comments

Comments
 (0)