From 51ee029a290dc4786f4dd1735a8cdb14f2cc80ea Mon Sep 17 00:00:00 2001 From: Chris Elrod Date: Tue, 30 Apr 2024 20:10:24 -0400 Subject: [PATCH] remove LVUsers test --- .github/workflows/ci.yml | 1 + test/Project.toml | 2 -- test/grouptests.jl | 16 +++------ test/precompile/LVUser/.JuliaFormatter.toml | 1 - test/precompile/LVUser/Project.toml | 9 ----- test/precompile/LVUser/src/LVUser.jl | 37 --------------------- test/precompile/precompile.jl | 18 ---------- test/runtests.jl | 2 +- 8 files changed, 6 insertions(+), 80 deletions(-) delete mode 100644 test/precompile/LVUser/.JuliaFormatter.toml delete mode 100644 test/precompile/LVUser/Project.toml delete mode 100644 test/precompile/LVUser/src/LVUser.jl delete mode 100644 test/precompile/precompile.jl diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea2098d10..558c8172f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: version: - '1.6' - '1' # automatically expands to the latest stable 1.x release of Julia. + - '1.11.0-beta1' os: - ubuntu-latest - macOS-latest diff --git a/test/Project.toml b/test/Project.toml index 7ce298f8f..be7d2d8d2 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -11,8 +11,6 @@ NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -SnoopCompileCore = "e2b509da-e806-4183-be48-004708413034" -SnoopPrecompile = "66db9d55-30c0-4569-8b51-7e840670fc0c" SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" StrideArraysCore = "7792a7ef-975c-4747-a70f-980b88e8d1da" diff --git a/test/grouptests.jl b/test/grouptests.jl index 878b2da03..7b9ed4416 100644 --- a/test/grouptests.jl +++ b/test/grouptests.jl @@ -1,5 +1,4 @@ const START_TIME = time() - @show LoopVectorization.register_count() @show RUN_SLOW_TESTS @@ -100,6 +99,8 @@ const START_TIME = time() end @time include("offsetarrays.jl") + + @time include("forwarddiffext.jl") end @time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part5" @@ -110,17 +111,8 @@ const START_TIME = time() @time include("inner_reductions.jl") end - @time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part6" - cproj = Base.active_project() - precompiledir = joinpath(@__DIR__, "precompile") - Pkg.activate(joinpath(precompiledir, "LVUser")) - @time include(joinpath(precompiledir, "precompile.jl")) - Pkg.activate(cproj) - @time include("forwarddiffext.jl") - end - end const ELAPSED_MINUTES = (time() - START_TIME) / 60 -# @test ELAPSED_MINUTES < 180 -@test ELAPSED_MINUTES < 300 +@test ELAPSED_MINUTES < 180 +# @test ELAPSED_MINUTES < 300 diff --git a/test/precompile/LVUser/.JuliaFormatter.toml b/test/precompile/LVUser/.JuliaFormatter.toml deleted file mode 100644 index 5c2cf2f06..000000000 --- a/test/precompile/LVUser/.JuliaFormatter.toml +++ /dev/null @@ -1 +0,0 @@ -indent = 2 \ No newline at end of file diff --git a/test/precompile/LVUser/Project.toml b/test/precompile/LVUser/Project.toml deleted file mode 100644 index bde796652..000000000 --- a/test/precompile/LVUser/Project.toml +++ /dev/null @@ -1,9 +0,0 @@ -name = "LVUser" -uuid = "2e67e97b-0813-40fa-b5bd-ce70d7344834" -authors = ["Tim Holy "] -version = "0.1.0" - -[deps] -LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890" -SnoopCompileCore = "e2b509da-e806-4183-be48-004708413034" -SnoopPrecompile = "66db9d55-30c0-4569-8b51-7e840670fc0c" diff --git a/test/precompile/LVUser/src/LVUser.jl b/test/precompile/LVUser/src/LVUser.jl deleted file mode 100644 index 146817e58..000000000 --- a/test/precompile/LVUser/src/LVUser.jl +++ /dev/null @@ -1,37 +0,0 @@ -module LVUser - -export filter2davx - -using LoopVectorization -using SnoopPrecompile - -function filter2davx!(out::AbstractMatrix, A::AbstractMatrix, kern::AbstractMatrix) - @turbo for J in CartesianIndices(out) - tmp = zero(eltype(out)) - for I ∈ CartesianIndices(kern) - tmp += A[I+J-1] * kern[I] - end - out[J] = tmp - end - out -end - -function filter2davx(A::AbstractMatrix, kern::AbstractMatrix) - out = similar(A, size(A) .- size(kern) .+ 1) - return filter2davx!(out, A, kern) -end - -# precompilation -let - A = rand(Float64, 512, 512) - kern = [ - 0.1 0.3 0.1 - 0.3 0.5 0.3 - 0.1 0.3 0.1 - ] - @precompile_all_calls begin - filter2davx(A, kern) - end -end - -end # module LVUser diff --git a/test/precompile/precompile.jl b/test/precompile/precompile.jl deleted file mode 100644 index ce5b4c931..000000000 --- a/test/precompile/precompile.jl +++ /dev/null @@ -1,18 +0,0 @@ -using Test -using SnoopCompileCore - -@testset "Invalidation and precompilation" begin - invs = @snoopr using LVUser - m = only(methods(LVUser.filter2davx)) - specs = m.specializations - mi = isa(specs, Core.MethodInstance) ? specs : specs[1] - @test mi ∉ invs - A = rand(Float64, 512, 512) - kern = [ - 0.1 0.3 0.1 - 0.3 0.5 0.3 - 0.1 0.3 0.1 - ] - B = filter2davx(A, kern) - @test size(B) == size(A) .- size(kern) .+ 1 -end diff --git a/test/runtests.jl b/test/runtests.jl index 5809cb265..8c46e7412 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -7,7 +7,7 @@ InteractiveUtils.versioninfo(stdout; verbose = true) const LOOPVECTORIZATION_TEST = get(ENV, "LOOPVECTORIZATION_TEST", "all") if LOOPVECTORIZATION_TEST == "all" - NUMGROUPS = 6 + NUMGROUPS = 5 processes = Vector{Base.Process}(undef, NUMGROUPS) paths = Vector{String}(undef, NUMGROUPS) ios = Vector{IOStream}(undef, NUMGROUPS)