diff --git a/test/broadcasttests.jl b/test/broadcasttests.jl index 51c03ec..05a6340 100644 --- a/test/broadcasttests.jl +++ b/test/broadcasttests.jl @@ -4,8 +4,7 @@ using LazyArrays, ArrayLayouts, LinearAlgebra, FillArrays, StaticArrays, Tracker import LazyArrays: BroadcastLayout, arguments, LazyArrayStyle, sub_materialize import Base: broadcasted -include("infinitearrays.jl") -using .InfiniteArrays +using ..InfiniteArrays using Infinities @testset "Broadcasting" begin @@ -418,4 +417,4 @@ using Infinities end end -end #module \ No newline at end of file +end #module diff --git a/test/cachetests.jl b/test/cachetests.jl index 47d8234..4032c6d 100644 --- a/test/cachetests.jl +++ b/test/cachetests.jl @@ -6,8 +6,7 @@ import LazyArrays: CachedArray, CachedMatrix, CachedVector, PaddedLayout, Cached CachedAbstractArray, CachedAbstractVector, CachedAbstractMatrix, AbstractCachedArray, AbstractCachedMatrix, PaddedColumns -include("infinitearrays.jl") -using .InfiniteArrays +using ..InfiniteArrays using .InfiniteArrays: OneToInf using Infinities diff --git a/test/paddedtests.jl b/test/paddedtests.jl index 31e59f2..501c1ff 100644 --- a/test/paddedtests.jl +++ b/test/paddedtests.jl @@ -7,9 +7,6 @@ import ArrayLayouts: OnesLayout import Base: setindex using LinearAlgebra -include("infinitearrays.jl") -using .InfiniteArrays: OneToInf - # padded block arrays have padded data that is also padded. This is to test this struct PaddedPadded <: LayoutVector{Int} end diff --git a/test/runtests.jl b/test/runtests.jl index 9c253c3..3cb6b83 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -11,6 +11,10 @@ downstream_test = "--downstream_integration_test" in ARGS stale_deps=!downstream_test) end +# this should only be included once to avoid method overwritten warnings, as this commites type-piracy +# we include this at the top-level, so that other sub-modules may reuse the module instead of having to include the file +include("infinitearrays.jl") + @testset "Lazy MemoryLayout" begin @testset "ApplyArray" begin A = [1.0 2; 3 4]