From ca1257401986b1fd6b5ec6cd104482afbdbf04e1 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 1 Aug 2021 03:05:45 -0400 Subject: [PATCH 1/8] Use TestFunctionRunner --- test/UnionArraysCUDATests/Project.toml | 15 ++ .../src/UnionArraysCUDATests.jl | 19 ++ .../src}/test_base.jl | 4 +- .../src}/test_doctest.jl | 4 +- .../src}/test_folds.jl | 4 +- .../src}/test_kernels.jl | 4 +- test/UnionArraysTests/Project.toml | 13 ++ test/UnionArraysTests/src/UnionArraysTests.jl | 15 ++ test/{ => UnionArraysTests/src}/test_aqua.jl | 6 +- .../{ => UnionArraysTests/src}/test_arrays.jl | 5 +- .../{ => UnionArraysTests/src}/test_padded.jl | 7 +- .../src}/test_transducers.jl | 9 +- .../src}/test_vectors.jl | 7 +- test/UnionArraysTests/src/utils.jl | 6 + test/cuda/test_foldscudatests.jl | 12 - test/environments/cuda-jl15/Manifest.toml | 99 ++++---- test/environments/cuda-jl15/Project.toml | 7 +- test/environments/cuda-jl16/Manifest.toml | 214 +++++++++++------- test/environments/cuda-jl16/Project.toml | 8 +- test/environments/main/Manifest.toml | 25 +- test/environments/main/Project.toml | 6 +- test/preamble.jl | 5 - test/runtests.jl | 63 +++--- 23 files changed, 343 insertions(+), 214 deletions(-) create mode 100644 test/UnionArraysCUDATests/Project.toml create mode 100644 test/UnionArraysCUDATests/src/UnionArraysCUDATests.jl rename test/{cuda => UnionArraysCUDATests/src}/test_base.jl (93%) rename test/{cuda => UnionArraysCUDATests/src}/test_doctest.jl (67%) rename test/{cuda => UnionArraysCUDATests/src}/test_folds.jl (95%) rename test/{cuda => UnionArraysCUDATests/src}/test_kernels.jl (95%) create mode 100644 test/UnionArraysTests/Project.toml create mode 100644 test/UnionArraysTests/src/UnionArraysTests.jl rename test/{ => UnionArraysTests/src}/test_aqua.jl (66%) rename test/{ => UnionArraysTests/src}/test_arrays.jl (87%) rename test/{ => UnionArraysTests/src}/test_padded.jl (89%) rename test/{ => UnionArraysTests/src}/test_transducers.jl (69%) rename test/{ => UnionArraysTests/src}/test_vectors.jl (79%) create mode 100644 test/UnionArraysTests/src/utils.jl delete mode 100644 test/cuda/test_foldscudatests.jl delete mode 100644 test/preamble.jl diff --git a/test/UnionArraysCUDATests/Project.toml b/test/UnionArraysCUDATests/Project.toml new file mode 100644 index 0000000..1577ea5 --- /dev/null +++ b/test/UnionArraysCUDATests/Project.toml @@ -0,0 +1,15 @@ +name = "UnionArraysCUDATests" +uuid = "8106f4ae-0388-4bd1-9e3f-399fe7ea23bc" +authors = ["Takafumi Arakaki and contributors"] +version = "0.0.1" + +[deps] +CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" +Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" +Folds = "41a02a25-b8f0-4f67-bc48-60067656b558" +FoldsCUDA = "6cd66ae4-5932-4b96-926d-e73e578e42cc" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +UnionArrays = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" + +[compat] +julia = "1" diff --git a/test/UnionArraysCUDATests/src/UnionArraysCUDATests.jl b/test/UnionArraysCUDATests/src/UnionArraysCUDATests.jl new file mode 100644 index 0000000..31ce6eb --- /dev/null +++ b/test/UnionArraysCUDATests/src/UnionArraysCUDATests.jl @@ -0,0 +1,19 @@ +module UnionArraysCUDATests + +import CUDA + +function include_tests(m = @__MODULE__, dir = @__DIR__) + for file in readdir(dir) + if match(r"^test_.*\.jl$", file) !== nothing + Base.include(m, joinpath(dir, file)) + end + end +end + +include_tests() + +function __init__() + CUDA.allowscalar(false) +end + +end # module UnionArraysCUDATests diff --git a/test/cuda/test_base.jl b/test/UnionArraysCUDATests/src/test_base.jl similarity index 93% rename from test/cuda/test_base.jl rename to test/UnionArraysCUDATests/src/test_base.jl index abfef17..871f83c 100644 --- a/test/cuda/test_base.jl +++ b/test/UnionArraysCUDATests/src/test_base.jl @@ -7,7 +7,7 @@ using UnionArrays: unionof const ==′ = isequal -@testset "UnionVector" begin +function test_unionvector() xs = UnionVector(undef, CuVector, unionof(Float32, Missing), 3) fill!(xs, 1) CUDA.@allowscalar xs[2] = missing @@ -17,7 +17,7 @@ const ==′ = isequal @test collect(xs) ==′ [1.0f0, missing, 1.0f0] end -@testset "UnionMatrix" begin +function test_unionmatrix() A = UnionArray(undef, CuVector, unionof(Float32, Missing), (3, 2)) fill!(A, 1) CUDA.@allowscalar A[2, 2] = missing diff --git a/test/cuda/test_doctest.jl b/test/UnionArraysCUDATests/src/test_doctest.jl similarity index 67% rename from test/cuda/test_doctest.jl rename to test/UnionArraysCUDATests/src/test_doctest.jl index 2da4c99..5434688 100644 --- a/test/cuda/test_doctest.jl +++ b/test/UnionArraysCUDATests/src/test_doctest.jl @@ -4,8 +4,10 @@ using UnionArrays using Documenter: doctest using Test -@testset begin +function test() doctest(UnionArrays) end +should_test_module() = VERSION >= v"1.6-" + end # module diff --git a/test/cuda/test_folds.jl b/test/UnionArraysCUDATests/src/test_folds.jl similarity index 95% rename from test/cuda/test_folds.jl rename to test/UnionArraysCUDATests/src/test_folds.jl index 98d7666..d8dc02c 100644 --- a/test/cuda/test_folds.jl +++ b/test/UnionArraysCUDATests/src/test_folds.jl @@ -8,7 +8,7 @@ using UnionArrays const ==′ = isequal -@testset "UnionVector" begin +function test_unionvector() xs = UnionVector(undef, CuVector, Union{Float32, Missing}, 3) fill!(xs, 1) CUDA.@allowscalar xs[2] = missing @@ -25,7 +25,7 @@ const ==′ = isequal end end -@testset "UnionMatrix" begin +function test_unionmatrix() A = UnionArray(undef, CuVector, Union{Float32, Missing}, (3, 2)) fill!(A, 1) CUDA.@allowscalar A[2, 2] = missing diff --git a/test/cuda/test_kernels.jl b/test/UnionArraysCUDATests/src/test_kernels.jl similarity index 95% rename from test/cuda/test_kernels.jl rename to test/UnionArraysCUDATests/src/test_kernels.jl index f969ff7..27fe9b3 100644 --- a/test/cuda/test_kernels.jl +++ b/test/UnionArraysCUDATests/src/test_kernels.jl @@ -36,7 +36,7 @@ function host_test_shmem() return ys end -@testset "shmem" begin +function test_shmem() xs = collect(Union{Nothing,Float32}, 1:8 * 3) xs[2:2:end] .= nothing for block in Iterators.partition(eachindex(xs), 8) @@ -45,4 +45,6 @@ end @test collect(host_test_shmem()) == xs end +should_test_module() = VERSION >= v"1.6-" + end # module diff --git a/test/UnionArraysTests/Project.toml b/test/UnionArraysTests/Project.toml new file mode 100644 index 0000000..5a700b3 --- /dev/null +++ b/test/UnionArraysTests/Project.toml @@ -0,0 +1,13 @@ +name = "UnionArraysTests" +uuid = "a66ddc63-82b4-4fd3-8fb7-6a8ed6db2f9a" +authors = ["Takafumi Arakaki and contributors"] +version = "0.0.1" + +[deps] +Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +Transducers = "28d57a85-8fef-5791-bfe6-a80928e7c999" +UnionArrays = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" + +[compat] +julia = "1" diff --git a/test/UnionArraysTests/src/UnionArraysTests.jl b/test/UnionArraysTests/src/UnionArraysTests.jl new file mode 100644 index 0000000..4a092fe --- /dev/null +++ b/test/UnionArraysTests/src/UnionArraysTests.jl @@ -0,0 +1,15 @@ +module UnionArraysTests + +include("utils.jl") + +function include_tests(m = @__MODULE__, dir = @__DIR__) + for file in readdir(dir) + if match(r"^test_.*\.jl$", file) !== nothing + Base.include(m, joinpath(dir, file)) + end + end +end + +include_tests() + +end # module UnionArraysTests diff --git a/test/test_aqua.jl b/test/UnionArraysTests/src/test_aqua.jl similarity index 66% rename from test/test_aqua.jl rename to test/UnionArraysTests/src/test_aqua.jl index 432c3da..c7d5d89 100644 --- a/test/test_aqua.jl +++ b/test/UnionArraysTests/src/test_aqua.jl @@ -6,9 +6,11 @@ using Test # Default `Aqua.test_all(UnionArrays)` does not work due to ambiguities # in upstream packages. -Aqua.test_all(UnionArrays; ambiguities = false) +function test_aqua() + Aqua.test_all(UnionArrays; ambiguities = false) +end -@testset "Method ambiguity" begin +function test_method_ambiguity() Aqua.test_ambiguities(UnionArrays) end diff --git a/test/test_arrays.jl b/test/UnionArraysTests/src/test_arrays.jl similarity index 87% rename from test/test_arrays.jl rename to test/UnionArraysTests/src/test_arrays.jl index 7d4e461..5014c56 100644 --- a/test/test_arrays.jl +++ b/test/UnionArraysTests/src/test_arrays.jl @@ -1,8 +1,9 @@ module TestArrays -include("preamble.jl") +using UnionArrays +using Test -@testset begin +function test() A = reshape(UnionVector(Any[1, 2.0]), 1, :) @test A isa UnionArray @test A[1] === 1 diff --git a/test/test_padded.jl b/test/UnionArraysTests/src/test_padded.jl similarity index 89% rename from test/test_padded.jl rename to test/UnionArraysTests/src/test_padded.jl index cd2c629..d342524 100644 --- a/test/test_padded.jl +++ b/test/UnionArraysTests/src/test_padded.jl @@ -1,9 +1,10 @@ module TestPadded -include("preamble.jl") +using UnionArrays using UnionArrays.Impl: ofsamesize, unpad, Padded +using Test -@testset "ofsamesize" begin +function test_ofsamesize() @testset "bigger = $bigger" for (bigger, value) in [ (Float64, UInt8(0)), (NTuple{7, UInt8}, UInt8(0)), @@ -16,7 +17,7 @@ using UnionArrays.Impl: ofsamesize, unpad, Padded end end -@testset "convert" begin +function test_convert() xs = ofsamesize.(Float64, UInt8.(1:10)) :: Vector @test eltype(xs) <: Padded @test unpad(xs[1]) === UInt8(1) diff --git a/test/test_transducers.jl b/test/UnionArraysTests/src/test_transducers.jl similarity index 69% rename from test/test_transducers.jl rename to test/UnionArraysTests/src/test_transducers.jl index c82f382..e4491f1 100644 --- a/test/test_transducers.jl +++ b/test/UnionArraysTests/src/test_transducers.jl @@ -1,14 +1,17 @@ module TestTransducers -include("preamble.jl") +using Test using Transducers +using UnionArrays -@testset begin +using ..Utils: compile_enabled + +function test() xs = UnionVector(Any[1, 2.0]) @test foldl(+, Map(x -> 2x), xs) == 6 ys = eduction(Map(x -> 2x), xs) - if COMPILE_ENABLED + if compile_enabled() @test (@inferred foldl(+, ys, init=0.0)) == 6 end end diff --git a/test/test_vectors.jl b/test/UnionArraysTests/src/test_vectors.jl similarity index 79% rename from test/test_vectors.jl rename to test/UnionArraysTests/src/test_vectors.jl index aeeeaab..41f0b5b 100644 --- a/test/test_vectors.jl +++ b/test/UnionArraysTests/src/test_vectors.jl @@ -1,8 +1,9 @@ module TestVectors -include("preamble.jl") +using UnionArrays +using Test -@testset "homogeneous size" begin +function test_homogeneous_size() xs = UnionVector(Any[1, 2.0]) @test xs[1] === 1 @test xs[2] === 2.0 @@ -10,7 +11,7 @@ include("preamble.jl") @test xs[1] === 3.0 end -@testset "heterogeneous size" begin +function test_heterogeneous_size() xs = UnionVector(Any[UInt8(1), 2.0, (a=1, b=2)]) @test xs[1] === UInt8(1) @test xs[2] === 2.0 diff --git a/test/UnionArraysTests/src/utils.jl b/test/UnionArraysTests/src/utils.jl new file mode 100644 index 0000000..4d2bb15 --- /dev/null +++ b/test/UnionArraysTests/src/utils.jl @@ -0,0 +1,6 @@ +module Utils + +compile_enabled() = Base.JLOptions().compile_enabled == 1 +# allow `== 2` (`--compile=all`) as well? + +end # module diff --git a/test/cuda/test_foldscudatests.jl b/test/cuda/test_foldscudatests.jl deleted file mode 100644 index 6fe54d5..0000000 --- a/test/cuda/test_foldscudatests.jl +++ /dev/null @@ -1,12 +0,0 @@ -module TestFoldsCUDATests -const HAS_FOLDSCUDATESTS = try - using FoldsCUDATests - true -catch err - @info "Failed to import `FoldsCUDATests`" exception = (err, catch_backtrace()) - false -end -if HAS_FOLDSCUDATESTS - FoldsCUDATests.runtests_unionarrays() -end -end # module diff --git a/test/environments/cuda-jl15/Manifest.toml b/test/environments/cuda-jl15/Manifest.toml index c331886..ef78393 100644 --- a/test/environments/cuda-jl15/Manifest.toml +++ b/test/environments/cuda-jl15/Manifest.toml @@ -1,5 +1,10 @@ # This file is machine-generated - editing it directly is not advised +[[ANSIColoredPrinters]] +git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c" +uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9" +version = "0.0.1" + [[AbstractFFTs]] deps = ["LinearAlgebra"] git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716" @@ -7,10 +12,10 @@ uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" version = "0.5.0" [[Accessors]] -deps = ["Compat", "CompositionsBase", "ConstructionBase", "Future", "MacroTools", "Requires", "Test"] -git-tree-sha1 = "6061581e28cf6fbbb6af983022c2589cbc801007" +deps = ["Compat", "CompositionsBase", "ConstructionBase", "Future", "LinearAlgebra", "MacroTools", "Requires", "Test"] +git-tree-sha1 = "ba270110280297b36d566cb19c948e6c724432c0" uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" -version = "0.1.1" +version = "0.1.4" [[Adapt]] deps = ["LinearAlgebra"] @@ -37,9 +42,9 @@ version = "0.1.0" [[BangBang]] deps = ["Compat", "ConstructionBase", "Future", "InitialValues", "LinearAlgebra", "Requires", "Setfield", "Tables", "ZygoteRules"] -git-tree-sha1 = "d53b1eaefd48e233545d21f5b764c8ee54df4a09" +git-tree-sha1 = "e239020994123f08905052b9603b4ca14f8c5807" uuid = "198e06fe-97b7-11e9-32a5-e1d131e6ad66" -version = "0.3.30" +version = "0.3.31" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -79,20 +84,20 @@ uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" version = "0.3.4+0" [[CompositionsBase]] -git-tree-sha1 = "f3955eb38944e5dd0fabf8ca1e267d94941d34a5" +git-tree-sha1 = "455419f7e328a1a2493cabc6428d79e951349769" uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b" -version = "0.1.0" +version = "0.1.1" [[ConstructionBase]] deps = ["LinearAlgebra"] -git-tree-sha1 = "48920211c95a6da1914a06c44ec94be70e84ffff" +git-tree-sha1 = "f74e9d5388b8620b4cee35d4c5a618dd4dc547f4" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.1.0" +version = "1.3.0" [[DataAPI]] -git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" +git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.6.0" +version = "1.7.0" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -123,16 +128,16 @@ deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "9d4f64f79012636741cf01133158a54b24924c32" +deps = ["LibGit2"] +git-tree-sha1 = "a32185f5428d3986f47c2ab78b1f216d5e6cc96f" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.4" +version = "0.8.5" [[Documenter]] -deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "3ebb967819b284dc1e3c0422229b58a40a255649" +deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] +git-tree-sha1 = "350dced36c11f794c6c4da5dc6493ec894e50c16" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.26.3" +version = "0.27.5" [[ExprTools]] git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" @@ -140,18 +145,16 @@ uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" version = "0.1.3" [[Folds]] -deps = ["Accessors", "BangBang", "Baselet", "DefineSingletons", "Distributed", "InitialValues", "MicroCollections", "Referenceables", "Test", "Transducers"] -git-tree-sha1 = "6e38bb8e071fef3b29e9ab212c973d0fe5452b62" +deps = ["Accessors", "BangBang", "Baselet", "DefineSingletons", "Distributed", "InitialValues", "MicroCollections", "Referenceables", "Requires", "Test", "Transducers"] +git-tree-sha1 = "e4be2abc0c95da9e24c5f77634b3350baa10d3bc" uuid = "41a02a25-b8f0-4f67-bc48-60067656b558" -version = "0.2.2" +version = "0.2.5" [[FoldsCUDA]] -deps = ["CUDA", "GPUArrays", "InitialValues", "SplittablesBase", "Transducers"] -git-tree-sha1 = "46ccc4cc50fb1f2e5e8bfa38edf01184c8869974" -repo-rev = "master" -repo-url = "https://github.com/JuliaFolds/FoldsCUDA.jl.git" +deps = ["CUDA", "InitialValues", "Transducers", "UnionArrays"] +git-tree-sha1 = "f043232db4b406ac348482687f76e70bbe5d9d8c" uuid = "6cd66ae4-5932-4b96-926d-e73e578e42cc" -version = "0.1.5-DEV" +version = "0.1.6" [[Future]] deps = ["Random"] @@ -170,10 +173,10 @@ uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" version = "0.8.3" [[IOCapture]] -deps = ["Logging"] -git-tree-sha1 = "377252859f740c217b936cebcd918a44f9b53b59" +deps = ["Logging", "Random"] +git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a" uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" -version = "0.1.1" +version = "0.2.2" [[InitialValues]] git-tree-sha1 = "26c8832afd63ac558b98a823265856670d898b6c" @@ -217,6 +220,12 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +[[LoadAllPackages]] +deps = ["Pkg"] +git-tree-sha1 = "de9eababca8fdc9b6b207ed05f99693faa608230" +uuid = "b37bcd2d-1570-475d-a8c6-9b4fae6d0ba9" +version = "0.1.0" + [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -252,9 +261,9 @@ version = "1.4.0" [[Parsers]] deps = ["Dates"] -git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" +git-tree-sha1 = "94bf17e83a0e4b20c8d77f6af8ffe8cc3b386c0a" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.1.0" +version = "1.1.1" [[Pkg]] deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] @@ -330,20 +339,28 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[TableTraits]] deps = ["IteratorInterfaceExtensions"] -git-tree-sha1 = "b1ad568ba658d8cbb3b892ed5380a6f3e781a81e" +git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39" uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" -version = "1.0.0" +version = "1.0.1" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "a9ff3dfec713c6677af435d6a6d65f9744feef67" +git-tree-sha1 = "d0c690d37c73aeb5ca063056283fde5585a41710" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.4.1" +version = "1.5.0" [[Test]] deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +[[TestFunctionRunner]] +deps = ["Distributed", "LoadAllPackages", "Pkg", "Test"] +git-tree-sha1 = "78a77e769b8e10276da5b68eff22232449de8766" +repo-rev = "master" +repo-url = "https://github.com/tkf/TestFunctionRunner.jl" +uuid = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" +version = "0.1.0" + [[TimerOutputs]] deps = ["Printf"] git-tree-sha1 = "32cdbe6cd2d214c25a0b88f985c9e0092877c236" @@ -351,10 +368,10 @@ uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" version = "0.5.8" [[Transducers]] -deps = ["ArgCheck", "BangBang", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] -git-tree-sha1 = "721dc0b917a43e6d191f07a6ea095ced164f08ce" +deps = ["Adapt", "ArgCheck", "BangBang", "Baselet", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] +git-tree-sha1 = "34f27ac221cb53317ab6df196f9ed145077231ff" uuid = "28d57a85-8fef-5791-bfe6-a80928e7c999" -version = "0.4.62" +version = "0.4.65" [[UUIDs]] deps = ["Random", "SHA"] @@ -367,7 +384,13 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" deps = ["Adapt", "Setfield", "Transducers"] path = "../../.." uuid = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" -version = "0.1.0" +version = "0.1.3-DEV" + +[[UnionArraysCUDATests]] +deps = ["CUDA", "Documenter", "Folds", "FoldsCUDA", "Test", "UnionArrays"] +path = "../../UnionArraysCUDATests" +uuid = "8106f4ae-0388-4bd1-9e3f-399fe7ea23bc" +version = "0.0.1" [[ZygoteRules]] deps = ["MacroTools"] diff --git a/test/environments/cuda-jl15/Project.toml b/test/environments/cuda-jl15/Project.toml index 5adf136..538b835 100644 --- a/test/environments/cuda-jl15/Project.toml +++ b/test/environments/cuda-jl15/Project.toml @@ -1,8 +1,5 @@ [deps] CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" -Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -Folds = "41a02a25-b8f0-4f67-bc48-60067656b558" -FoldsCUDA = "6cd66ae4-5932-4b96-926d-e73e578e42cc" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -Transducers = "28d57a85-8fef-5791-bfe6-a80928e7c999" +TestFunctionRunner = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" UnionArrays = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" +UnionArraysCUDATests = "8106f4ae-0388-4bd1-9e3f-399fe7ea23bc" diff --git a/test/environments/cuda-jl16/Manifest.toml b/test/environments/cuda-jl16/Manifest.toml index 665c864..d074b86 100644 --- a/test/environments/cuda-jl16/Manifest.toml +++ b/test/environments/cuda-jl16/Manifest.toml @@ -1,5 +1,10 @@ # This file is machine-generated - editing it directly is not advised +[[ANSIColoredPrinters]] +git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c" +uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9" +version = "0.0.1" + [[AbstractFFTs]] deps = ["LinearAlgebra"] git-tree-sha1 = "485ee0867925449198280d4af84bdb46a2a404d0" @@ -7,16 +12,16 @@ uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" version = "1.0.1" [[Accessors]] -deps = ["Compat", "CompositionsBase", "ConstructionBase", "Future", "MacroTools", "Requires", "Test"] -git-tree-sha1 = "4f55fed2d5b8a8823b2a2ccbf42a576eb502dec9" +deps = ["Compat", "CompositionsBase", "ConstructionBase", "Future", "LinearAlgebra", "MacroTools", "Requires", "Test"] +git-tree-sha1 = "ba270110280297b36d566cb19c948e6c724432c0" uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" -version = "0.1.2" +version = "0.1.4" [[Adapt]] deps = ["LinearAlgebra"] -git-tree-sha1 = "f1b523983a58802c4695851926203b36e28f09db" +git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.3.0" +version = "3.3.1" [[Aqua]] deps = ["Pkg", "Test"] @@ -43,9 +48,9 @@ version = "0.1.0" [[BangBang]] deps = ["Compat", "ConstructionBase", "Future", "InitialValues", "LinearAlgebra", "Requires", "Setfield", "Tables", "ZygoteRules"] -git-tree-sha1 = "d53b1eaefd48e233545d21f5b764c8ee54df4a09" +git-tree-sha1 = "e239020994123f08905052b9603b4ca14f8c5807" uuid = "198e06fe-97b7-11e9-32a5-e1d131e6ad66" -version = "0.3.30" +version = "0.3.31" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -55,43 +60,49 @@ git-tree-sha1 = "aebf55e6d7795e02ca500a689d326ac979aaf89e" uuid = "9718e550-a3fa-408a-8086-8db961cd8217" version = "0.1.1" +[[BenchmarkTools]] +deps = ["JSON", "Logging", "Printf", "Statistics", "UUIDs"] +git-tree-sha1 = "c31ebabde28d102b602bada60ce8922c266d205b" +uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" +version = "1.1.1" + [[CEnum]] git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9" uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" version = "0.4.1" [[CUDA]] -deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "MacroTools", "Memoize", "Printf", "Random", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "SpecialFunctions", "Statistics", "TimerOutputs"] -git-tree-sha1 = "a6ce96dcf22fc4f1bfdfac02d54f0b77ecf2a4cc" +deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "SpecialFunctions", "TimerOutputs"] +git-tree-sha1 = "5e696e37e51b01ae07bd9f700afe6cbd55250bce" uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" -version = "3.0.3" +version = "3.3.4" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "44e9f638aa9ed1ad58885defc568c133010140aa" +git-tree-sha1 = "ad613c934ec3a3aa0ff19b91f15a16d56ed404b5" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.37" +version = "1.0.2" [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "ac4132ad78082518ec2037ae5770b6e796f7f956" +git-tree-sha1 = "344f143fa0ec67e47917848795ab19c6a455f32c" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.27.0" +version = "3.32.0" [[CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" [[CompositionsBase]] -git-tree-sha1 = "f3955eb38944e5dd0fabf8ca1e267d94941d34a5" +git-tree-sha1 = "455419f7e328a1a2493cabc6428d79e951349769" uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b" -version = "0.1.0" +version = "0.1.1" [[ConstructionBase]] deps = ["LinearAlgebra"] -git-tree-sha1 = "48920211c95a6da1914a06c44ec94be70e84ffff" +git-tree-sha1 = "f74e9d5388b8620b4cee35d4c5a618dd4dc547f4" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.1.0" +version = "1.3.0" [[ContextVariablesX]] deps = ["Compat", "Logging", "UUIDs"] @@ -100,9 +111,9 @@ uuid = "6add18c4-b38d-439d-96f6-d6bc489c04c5" version = "0.1.1" [[DataAPI]] -git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" +git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.6.0" +version = "1.7.0" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -133,25 +144,25 @@ deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "9d4f64f79012636741cf01133158a54b24924c32" +deps = ["LibGit2"] +git-tree-sha1 = "a32185f5428d3986f47c2ab78b1f216d5e6cc96f" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.4" +version = "0.8.5" [[Documenter]] -deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "3ebb967819b284dc1e3c0422229b58a40a255649" +deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] +git-tree-sha1 = "350dced36c11f794c6c4da5dc6493ec894e50c16" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.26.3" +version = "0.27.5" [[Downloads]] deps = ["ArgTools", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" [[ExprTools]] -git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" +git-tree-sha1 = "b7e3d17636b348f005f11040025ae8c6f645fe92" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" -version = "0.1.3" +version = "0.1.6" [[FLoops]] deps = ["Compat", "FLoopsBase", "JuliaVariables", "MLStyle", "Serialization", "Setfield", "Transducers"] @@ -166,23 +177,32 @@ uuid = "b9860ae5-e623-471e-878b-f6a53c775ea6" version = "0.1.0" [[Folds]] -deps = ["Accessors", "BangBang", "Baselet", "DefineSingletons", "Distributed", "InitialValues", "MicroCollections", "Referenceables", "Test", "Transducers"] -git-tree-sha1 = "06b91e95befe35cbdeba35eba436e93db5276d8e" +deps = ["Accessors", "BangBang", "Baselet", "DefineSingletons", "Distributed", "InitialValues", "MicroCollections", "Referenceables", "Requires", "Test", "Transducers"] +git-tree-sha1 = "e4be2abc0c95da9e24c5f77634b3350baa10d3bc" uuid = "41a02a25-b8f0-4f67-bc48-60067656b558" -version = "0.2.3" +version = "0.2.5" [[FoldsCUDA]] -deps = ["CUDA", "GPUArrays", "InitialValues", "Transducers", "UnionArrays"] -git-tree-sha1 = "1531a8276a8b8a150830ea3ac1df7a7203ddef88" +deps = ["CUDA", "InitialValues", "Transducers", "UnionArrays"] +git-tree-sha1 = "7b129e92a99b4252674efc6d78845f13b28f476c" repo-rev = "master" repo-url = "https://github.com/JuliaFolds/FoldsCUDA.jl.git" uuid = "6cd66ae4-5932-4b96-926d-e73e578e42cc" -version = "0.1.6-DEV" +version = "0.1.7-DEV" -[[FoldsCUDATests]] -deps = ["Adapt", "Aqua", "CUDA", "Documenter", "FLoops", "Folds", "FoldsCUDA", "GPUArrays", "InitialValues", "LiterateTest", "Random", "Random123", "Referenceables", "Setfield", "SplittablesBase", "Test", "Transducers"] -git-tree-sha1 = "92f78983c24f9261b5d4ac8b49e9d935660d82ca" +[[FoldsCUDABenchmarks]] +deps = ["BenchmarkTools", "CUDA", "Folds", "FoldsCUDA"] +git-tree-sha1 = "e37efa0acef75add8437832c8e30ac483c6ab9be" repo-rev = "master" +repo-subdir = "benchmark/FoldsCUDABenchmarks" +repo-url = "https://github.com/JuliaFolds/FoldsCUDA.jl.git" +uuid = "1457febb-a09b-4652-98c9-46b8ccd8ff53" +version = "0.1.0" + +[[FoldsCUDATests]] +deps = ["Adapt", "Aqua", "CUDA", "Documenter", "FLoops", "Folds", "FoldsCUDA", "FoldsCUDABenchmarks", "GPUArrays", "InitialValues", "LiterateTest", "Random", "Random123", "Referenceables", "Setfield", "SplittablesBase", "Test", "TestFunctionRunner", "Transducers"] +git-tree-sha1 = "a28710684fe6d2e6752f118e777e854935dc35d8" +repo-rev = "TestFunctionRunner" repo-subdir = "test/FoldsCUDATests" repo-url = "https://github.com/JuliaFolds/FoldsCUDA.jl.git" uuid = "d11caea5-3c98-4cd5-8a56-9589fe6662ee" @@ -193,22 +213,22 @@ deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[GPUArrays]] -deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"] -git-tree-sha1 = "9c95b2fd5c16bc7f97371e9f92f0fef77e0f5957" +deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization", "Statistics"] +git-tree-sha1 = "ececbf05f8904c92814bdbd0aafd5540b0bf2e9a" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "6.2.2" +version = "7.0.1" [[GPUCompiler]] -deps = ["DataStructures", "ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "Serialization", "TimerOutputs", "UUIDs"] -git-tree-sha1 = "6eadd2321dc3ac0fc9d530ab01c2caa7fe5d74c6" +deps = ["DataStructures", "ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "TimerOutputs", "UUIDs"] +git-tree-sha1 = "0da0f52fc521ff23b8291e7fda54c61907609f12" uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" -version = "0.11.4" +version = "0.12.6" [[IOCapture]] -deps = ["Logging"] -git-tree-sha1 = "377252859f740c217b936cebcd918a44f9b53b59" +deps = ["Logging", "Random"] +git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a" uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" -version = "0.1.1" +version = "0.2.2" [[InitialValues]] git-tree-sha1 = "26c8832afd63ac558b98a823265856670d898b6c" @@ -243,10 +263,16 @@ uuid = "b14d175d-62b4-44ba-8fb7-3064adc8c3ec" version = "0.2.4" [[LLVM]] -deps = ["CEnum", "Libdl", "Printf", "Unicode"] -git-tree-sha1 = "b616937c31337576360cb9fb872ec7633af7b194" +deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"] +git-tree-sha1 = "733abcbdc67337bb6aaf873c6bebbe1e6440a5df" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "3.6.0" +version = "4.1.1" + +[[LLVMExtra_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "b36c0677a0549c7d1dc8719899a4133abbfacf7d" +uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab" +version = "0.0.6+0" [[LazyArtifacts]] deps = ["Artifacts", "Pkg"] @@ -281,13 +307,25 @@ git-tree-sha1 = "f10e6f4d46da26a33e9cea7a5aed3476b592bbfb" uuid = "d77d25b0-90d3-4a16-b10a-412a9d48f625" version = "0.1.4" +[[LoadAllPackages]] +deps = ["Pkg"] +git-tree-sha1 = "de9eababca8fdc9b6b207ed05f99693faa608230" +uuid = "b37bcd2d-1570-475d-a8c6-9b4fae6d0ba9" +version = "0.1.0" + +[[LogExpFunctions]] +deps = ["DocStringExtensions", "LinearAlgebra"] +git-tree-sha1 = "7bd5f6565d80b6bf753738d2bc40a5dfea072070" +uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" +version = "0.2.5" + [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" [[MLStyle]] -git-tree-sha1 = "a667f58636b36ba10145d46a4afe70492850af8c" +git-tree-sha1 = "594e189325f66e23a8818e5beb11c43bb0141bcd" uuid = "d8e11817-5142-5d16-987a-aa16d5891078" -version = "0.4.9" +version = "0.4.10" [[MacroTools]] deps = ["Markdown", "Random"] @@ -303,12 +341,6 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -[[Memoize]] -deps = ["MacroTools"] -git-tree-sha1 = "2b1dfcba103de714d31c033b5dacc2e4a12c7caa" -uuid = "c03570c3-d221-55d1-a50c-7939bbd78826" -version = "0.4.4" - [[MicroCollections]] deps = ["BangBang", "Setfield"] git-tree-sha1 = "e991b6a9d38091c4a0d7cd051fcb57c05f98ac03" @@ -332,20 +364,20 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" [[OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3" +git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.3+4" +version = "0.5.5+0" [[OrderedCollections]] -git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" +git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.4.0" +version = "1.4.1" [[Parsers]] deps = ["Dates"] -git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" +git-tree-sha1 = "94bf17e83a0e4b20c8d77f6af8ffe8cc3b386c0a" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.1.0" +version = "1.1.1" [[Pkg]] deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] @@ -353,9 +385,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Preferences]] deps = ["TOML"] -git-tree-sha1 = "ea79e4c9077208cd3bc5d29631a26bc0cff78902" +git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.1" +version = "1.2.2" [[PrettyPrint]] git-tree-sha1 = "632eb4abab3449ab30c5e1afaa874f0b98b586e4" @@ -382,14 +414,14 @@ version = "1.3.1" [[RandomNumbers]] deps = ["Random", "Requires"] -git-tree-sha1 = "441e6fc35597524ada7f85e13df1f4e10137d16f" +git-tree-sha1 = "56ead4aaafc41d83694e17b0dd89d3e929d01a14" uuid = "e6cf234a-135c-5ec9-84dd-332b85af5143" -version = "1.4.0" +version = "1.5.0" [[Reexport]] -git-tree-sha1 = "57d8440b0c7d98fc4f889e478e80f268d534c9d5" +git-tree-sha1 = "5f6c21241f0f655da3952fd60aa18477cf96c220" uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "1.0.0" +version = "1.1.0" [[Referenceables]] deps = ["Adapt"] @@ -406,12 +438,6 @@ version = "1.1.3" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" -[[Scratch]] -deps = ["Dates"] -git-tree-sha1 = "ad4b278adb62d185bbcb6864dc24959ab0627bf6" -uuid = "6c6a2e73-6563-6170-7368-637461726353" -version = "1.0.3" - [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -433,10 +459,10 @@ deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] -deps = ["ChainRulesCore", "OpenSpecFun_jll"] -git-tree-sha1 = "5919936c0e92cff40e57d0ddf0ceb667d42e5902" +deps = ["ChainRulesCore", "LogExpFunctions", "OpenSpecFun_jll"] +git-tree-sha1 = "508822dca004bf62e210609148511ad03ce8f1d8" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.3.0" +version = "1.6.0" [[SplittablesBase]] deps = ["Setfield", "Test"] @@ -460,9 +486,9 @@ version = "1.0.1" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "c9d2d262e9a327be1f35844df25fe4561d258dc9" +git-tree-sha1 = "d0c690d37c73aeb5ca063056283fde5585a41710" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.4.2" +version = "1.5.0" [[Tar]] deps = ["ArgTools", "SHA"] @@ -472,17 +498,25 @@ uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +[[TestFunctionRunner]] +deps = ["Distributed", "LoadAllPackages", "Pkg", "Test"] +git-tree-sha1 = "78a77e769b8e10276da5b68eff22232449de8766" +repo-rev = "master" +repo-url = "https://github.com/tkf/TestFunctionRunner.jl" +uuid = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" +version = "0.1.0" + [[TimerOutputs]] -deps = ["Printf"] -git-tree-sha1 = "32cdbe6cd2d214c25a0b88f985c9e0092877c236" +deps = ["ExprTools", "Printf"] +git-tree-sha1 = "209a8326c4f955e2442c07b56029e88bb48299c7" uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" -version = "0.5.8" +version = "0.5.12" [[Transducers]] -deps = ["ArgCheck", "BangBang", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] -git-tree-sha1 = "721dc0b917a43e6d191f07a6ea095ced164f08ce" +deps = ["Adapt", "ArgCheck", "BangBang", "Baselet", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] +git-tree-sha1 = "34f27ac221cb53317ab6df196f9ed145077231ff" uuid = "28d57a85-8fef-5791-bfe6-a80928e7c999" -version = "0.4.62" +version = "0.4.65" [[UUIDs]] deps = ["Random", "SHA"] @@ -495,7 +529,13 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" deps = ["Adapt", "Setfield", "Transducers"] path = "../../.." uuid = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" -version = "0.1.0" +version = "0.1.3-DEV" + +[[UnionArraysCUDATests]] +deps = ["CUDA", "Documenter", "Folds", "FoldsCUDA", "Test", "UnionArrays"] +path = "../../UnionArraysCUDATests" +uuid = "8106f4ae-0388-4bd1-9e3f-399fe7ea23bc" +version = "0.0.1" [[Zlib_jll]] deps = ["Libdl"] diff --git a/test/environments/cuda-jl16/Project.toml b/test/environments/cuda-jl16/Project.toml index 3d6fa42..69c26bd 100644 --- a/test/environments/cuda-jl16/Project.toml +++ b/test/environments/cuda-jl16/Project.toml @@ -1,9 +1,7 @@ [deps] -CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" -Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -Folds = "41a02a25-b8f0-4f67-bc48-60067656b558" FoldsCUDA = "6cd66ae4-5932-4b96-926d-e73e578e42cc" +FoldsCUDABenchmarks = "1457febb-a09b-4652-98c9-46b8ccd8ff53" FoldsCUDATests = "d11caea5-3c98-4cd5-8a56-9589fe6662ee" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -Transducers = "28d57a85-8fef-5791-bfe6-a80928e7c999" +TestFunctionRunner = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" UnionArrays = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" +UnionArraysCUDATests = "8106f4ae-0388-4bd1-9e3f-399fe7ea23bc" diff --git a/test/environments/main/Manifest.toml b/test/environments/main/Manifest.toml index 3c475ce..79311cb 100644 --- a/test/environments/main/Manifest.toml +++ b/test/environments/main/Manifest.toml @@ -89,6 +89,7 @@ uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" [[LibGit2]] +deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[Libdl]] @@ -98,6 +99,12 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +[[LoadAllPackages]] +deps = ["Pkg"] +git-tree-sha1 = "de9eababca8fdc9b6b207ed05f99693faa608230" +uuid = "b37bcd2d-1570-475d-a8c6-9b4fae6d0ba9" +version = "0.1.0" + [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -121,7 +128,7 @@ version = "0.1.0" uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[Pkg]] -deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Printf]] @@ -191,6 +198,14 @@ version = "1.3.2" deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +[[TestFunctionRunner]] +deps = ["Distributed", "LoadAllPackages", "Pkg", "Test"] +git-tree-sha1 = "78a77e769b8e10276da5b68eff22232449de8766" +repo-rev = "master" +repo-url = "https://github.com/tkf/TestFunctionRunner.jl" +uuid = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" +version = "0.1.0" + [[Transducers]] deps = ["ArgCheck", "BangBang", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] git-tree-sha1 = "721dc0b917a43e6d191f07a6ea095ced164f08ce" @@ -208,7 +223,13 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" deps = ["Adapt", "Setfield", "Transducers"] path = "../../.." uuid = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" -version = "0.1.0" +version = "0.1.3-DEV" + +[[UnionArraysTests]] +deps = ["Aqua", "Test", "Transducers", "UnionArrays"] +path = "../../UnionArraysTests" +uuid = "a66ddc63-82b4-4fd3-8fb7-6a8ed6db2f9a" +version = "0.0.1" [[ZygoteRules]] deps = ["MacroTools"] diff --git a/test/environments/main/Project.toml b/test/environments/main/Project.toml index 88f22ed..7953621 100644 --- a/test/environments/main/Project.toml +++ b/test/environments/main/Project.toml @@ -1,5 +1,3 @@ [deps] -Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -Transducers = "28d57a85-8fef-5791-bfe6-a80928e7c999" -UnionArrays = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" +TestFunctionRunner = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" +UnionArraysTests = "a66ddc63-82b4-4fd3-8fb7-6a8ed6db2f9a" diff --git a/test/preamble.jl b/test/preamble.jl deleted file mode 100644 index 3ff6360..0000000 --- a/test/preamble.jl +++ /dev/null @@ -1,5 +0,0 @@ -using UnionArrays -using Test - -const COMPILE_ENABLED = Base.JLOptions().compile_enabled == 1 -# allow `== 2` (`--compile=all`) as well? diff --git a/test/runtests.jl b/test/runtests.jl index 43d54f9..48ac647 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,41 +1,30 @@ -module TestUnionArrays -using Test - -env_test_cuda = lowercase(get(ENV, "UNIONARRAYS_JL_TEST_CUDA", "auto")) - -const TEST_CUDA = if env_test_cuda == "true" - import CUDA - true -elseif env_test_cuda == "auto" - try - import CUDA - CUDA.has_cuda_gpu() - catch - false +using TestFunctionRunner + +let env_test_cuda = lowercase(get(ENV, "UNIONARRAYS_JL_TEST_CUDA", "auto")), + test_cuda = if env_test_cuda == "auto" + try + import CUDA + true + catch + false + end + else + env_test_cuda == "true" end -else - false -end - -const TEST_GPU = TEST_CUDA - -TEST_CUDA && CUDA.allowscalar(false) -find_test(subdir = "") = sort([ - joinpath(subdir, file) for file in readdir(joinpath(@__DIR__, subdir)) if - match(r"^test_.*\.jl$", file) !== nothing -]) - -@testset "$file" for file in find_test() - TEST_GPU || include(file) -end - -@testset "$file" for file in find_test("cuda") - if VERSION < v"1.6-" - basename(file) == "test_kernels.jl" && continue - basename(file) == "test_doctest.jl" && continue + if test_cuda + TestFunctionRunner.@run(packages = ["UnionArraysCUDATests"]) + + try + using FoldsCUDATests + true + catch err + @info "Failed to import `FoldsCUDATests`" exception = (err, catch_backtrace()) + false + end && begin + FoldsCUDATests.runtests_unionarrays() + end + else + TestFunctionRunner.@run(packages = ["UnionArraysTests"]) end - TEST_CUDA && include(file) end - -end # module From 7f57d2e7716afedaef5b6e2f51205efd93282382 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 1 Aug 2021 22:09:06 -0400 Subject: [PATCH 2/8] Setup test/environments/jl10 --- test/environments/jl10/Manifest.toml | 58 +++++++++++++++++++--------- test/environments/jl10/Project.toml | 5 +-- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/test/environments/jl10/Manifest.toml b/test/environments/jl10/Manifest.toml index 932e67f..d42ed15 100644 --- a/test/environments/jl10/Manifest.toml +++ b/test/environments/jl10/Manifest.toml @@ -17,34 +17,34 @@ version = "2.1.0" [[BangBang]] deps = ["Compat", "ConstructionBase", "Future", "InitialValues", "LinearAlgebra", "Requires", "Setfield", "Tables", "ZygoteRules"] -git-tree-sha1 = "d53b1eaefd48e233545d21f5b764c8ee54df4a09" +git-tree-sha1 = "e239020994123f08905052b9603b4ca14f8c5807" uuid = "198e06fe-97b7-11e9-32a5-e1d131e6ad66" -version = "0.3.30" +version = "0.3.31" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b" +git-tree-sha1 = "344f143fa0ec67e47917848795ab19c6a455f32c" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.25.0" +version = "3.32.0" [[CompositionsBase]] -git-tree-sha1 = "f3955eb38944e5dd0fabf8ca1e267d94941d34a5" +git-tree-sha1 = "455419f7e328a1a2493cabc6428d79e951349769" uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b" -version = "0.1.0" +version = "0.1.1" [[ConstructionBase]] deps = ["LinearAlgebra"] -git-tree-sha1 = "48920211c95a6da1914a06c44ec94be70e84ffff" +git-tree-sha1 = "f74e9d5388b8620b4cee35d4c5a618dd4dc547f4" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.1.0" +version = "1.3.0" [[DataAPI]] -git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" +git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.6.0" +version = "1.7.0" [[DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -96,6 +96,12 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +[[LoadAllPackages]] +deps = ["Pkg"] +git-tree-sha1 = "de9eababca8fdc9b6b207ed05f99693faa608230" +uuid = "b37bcd2d-1570-475d-a8c6-9b4fae6d0ba9" +version = "0.1.0" + [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -136,9 +142,9 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[Requires]] deps = ["UUIDs"] -git-tree-sha1 = "cfbac6c1ed70c002ec6361e7fd334f02820d6419" +git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621" uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "1.1.2" +version = "1.1.3" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -148,9 +154,9 @@ uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" [[Setfield]] deps = ["ConstructionBase", "Future", "MacroTools", "Requires"] -git-tree-sha1 = "d5640fc570fb1b6c54512f0bd3853866bd298b3e" +git-tree-sha1 = "fca29e68c5062722b5b4435594c3d1ba557072a3" uuid = "efcf1570-3423-57d1-acb7-fd33fddbac46" -version = "0.7.0" +version = "0.7.1" [[SharedArrays]] deps = ["Distributed", "Mmap", "Random", "Serialization"] @@ -175,20 +181,28 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[TableTraits]] deps = ["IteratorInterfaceExtensions"] -git-tree-sha1 = "b1ad568ba658d8cbb3b892ed5380a6f3e781a81e" +git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39" uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" -version = "1.0.0" +version = "1.0.1" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "a716dde43d57fa537a19058d044b495301ba6565" +git-tree-sha1 = "d0c690d37c73aeb5ca063056283fde5585a41710" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.3.2" +version = "1.5.0" [[Test]] deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +[[TestFunctionRunner]] +deps = ["Distributed", "LoadAllPackages", "Pkg", "Test"] +git-tree-sha1 = "78a77e769b8e10276da5b68eff22232449de8766" +repo-rev = "master" +repo-url = "https://github.com/tkf/TestFunctionRunner.jl" +uuid = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" +version = "0.1.0" + [[Transducers]] deps = ["ArgCheck", "BangBang", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] git-tree-sha1 = "721dc0b917a43e6d191f07a6ea095ced164f08ce" @@ -206,7 +220,13 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" deps = ["Adapt", "Setfield", "Transducers"] path = "../../.." uuid = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" -version = "0.1.0" +version = "0.1.3-DEV" + +[[UnionArraysTests]] +deps = ["Aqua", "Test", "Transducers", "UnionArrays"] +path = "../../UnionArraysTests" +uuid = "a66ddc63-82b4-4fd3-8fb7-6a8ed6db2f9a" +version = "0.0.1" [[ZygoteRules]] deps = ["MacroTools"] diff --git a/test/environments/jl10/Project.toml b/test/environments/jl10/Project.toml index 88f22ed..a06fca9 100644 --- a/test/environments/jl10/Project.toml +++ b/test/environments/jl10/Project.toml @@ -1,5 +1,4 @@ [deps] -Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -Transducers = "28d57a85-8fef-5791-bfe6-a80928e7c999" +TestFunctionRunner = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" UnionArrays = "d6dd79e4-993b-11e9-1366-0de1c9fe1122" +UnionArraysTests = "a66ddc63-82b4-4fd3-8fb7-6a8ed6db2f9a" From 03248758fea8a6e7a69b23ab5278881e17efe9a0 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 1 Aug 2021 22:39:11 -0400 Subject: [PATCH 3/8] Simplify test/runtests.jl --- test/runtests.jl | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 48ac647..d106ba6 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -15,15 +15,8 @@ let env_test_cuda = lowercase(get(ENV, "UNIONARRAYS_JL_TEST_CUDA", "auto")), if test_cuda TestFunctionRunner.@run(packages = ["UnionArraysCUDATests"]) - try - using FoldsCUDATests - true - catch err - @info "Failed to import `FoldsCUDATests`" exception = (err, catch_backtrace()) - false - end && begin - FoldsCUDATests.runtests_unionarrays() - end + using FoldsCUDATests + FoldsCUDATests.runtests_unionarrays() else TestFunctionRunner.@run(packages = ["UnionArraysTests"]) end From 4e51131faf30d668e6c11ed3388ca39ab286b6c7 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 1 Aug 2021 22:42:15 -0400 Subject: [PATCH 4/8] Rollback test/environments/cuda-jl16/Manifest.toml --- test/environments/cuda-jl16/Manifest.toml | 163 +++++++++++----------- 1 file changed, 79 insertions(+), 84 deletions(-) diff --git a/test/environments/cuda-jl16/Manifest.toml b/test/environments/cuda-jl16/Manifest.toml index d074b86..30c7e11 100644 --- a/test/environments/cuda-jl16/Manifest.toml +++ b/test/environments/cuda-jl16/Manifest.toml @@ -1,10 +1,5 @@ # This file is machine-generated - editing it directly is not advised -[[ANSIColoredPrinters]] -git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c" -uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9" -version = "0.0.1" - [[AbstractFFTs]] deps = ["LinearAlgebra"] git-tree-sha1 = "485ee0867925449198280d4af84bdb46a2a404d0" @@ -12,16 +7,16 @@ uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" version = "1.0.1" [[Accessors]] -deps = ["Compat", "CompositionsBase", "ConstructionBase", "Future", "LinearAlgebra", "MacroTools", "Requires", "Test"] -git-tree-sha1 = "ba270110280297b36d566cb19c948e6c724432c0" +deps = ["Compat", "CompositionsBase", "ConstructionBase", "Future", "MacroTools", "Requires", "Test"] +git-tree-sha1 = "4f55fed2d5b8a8823b2a2ccbf42a576eb502dec9" uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" -version = "0.1.4" +version = "0.1.2" [[Adapt]] deps = ["LinearAlgebra"] -git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7" +git-tree-sha1 = "f1b523983a58802c4695851926203b36e28f09db" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.3.1" +version = "3.3.0" [[Aqua]] deps = ["Pkg", "Test"] @@ -48,9 +43,9 @@ version = "0.1.0" [[BangBang]] deps = ["Compat", "ConstructionBase", "Future", "InitialValues", "LinearAlgebra", "Requires", "Setfield", "Tables", "ZygoteRules"] -git-tree-sha1 = "e239020994123f08905052b9603b4ca14f8c5807" +git-tree-sha1 = "d53b1eaefd48e233545d21f5b764c8ee54df4a09" uuid = "198e06fe-97b7-11e9-32a5-e1d131e6ad66" -version = "0.3.31" +version = "0.3.30" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -72,37 +67,37 @@ uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" version = "0.4.1" [[CUDA]] -deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "SpecialFunctions", "TimerOutputs"] -git-tree-sha1 = "5e696e37e51b01ae07bd9f700afe6cbd55250bce" +deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "MacroTools", "Memoize", "Printf", "Random", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "SpecialFunctions", "Statistics", "TimerOutputs"] +git-tree-sha1 = "a6ce96dcf22fc4f1bfdfac02d54f0b77ecf2a4cc" uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" -version = "3.3.4" +version = "3.0.3" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "ad613c934ec3a3aa0ff19b91f15a16d56ed404b5" +git-tree-sha1 = "44e9f638aa9ed1ad58885defc568c133010140aa" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.0.2" +version = "0.9.37" [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "344f143fa0ec67e47917848795ab19c6a455f32c" +git-tree-sha1 = "ac4132ad78082518ec2037ae5770b6e796f7f956" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.32.0" +version = "3.27.0" [[CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" [[CompositionsBase]] -git-tree-sha1 = "455419f7e328a1a2493cabc6428d79e951349769" +git-tree-sha1 = "f3955eb38944e5dd0fabf8ca1e267d94941d34a5" uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b" -version = "0.1.1" +version = "0.1.0" [[ConstructionBase]] deps = ["LinearAlgebra"] -git-tree-sha1 = "f74e9d5388b8620b4cee35d4c5a618dd4dc547f4" +git-tree-sha1 = "48920211c95a6da1914a06c44ec94be70e84ffff" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.3.0" +version = "1.1.0" [[ContextVariablesX]] deps = ["Compat", "Logging", "UUIDs"] @@ -111,9 +106,9 @@ uuid = "6add18c4-b38d-439d-96f6-d6bc489c04c5" version = "0.1.1" [[DataAPI]] -git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385" +git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.7.0" +version = "1.6.0" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -144,25 +139,25 @@ deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[DocStringExtensions]] -deps = ["LibGit2"] -git-tree-sha1 = "a32185f5428d3986f47c2ab78b1f216d5e6cc96f" +deps = ["LibGit2", "Markdown", "Pkg", "Test"] +git-tree-sha1 = "9d4f64f79012636741cf01133158a54b24924c32" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.5" +version = "0.8.4" [[Documenter]] -deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "350dced36c11f794c6c4da5dc6493ec894e50c16" +deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] +git-tree-sha1 = "3ebb967819b284dc1e3c0422229b58a40a255649" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.27.5" +version = "0.26.3" [[Downloads]] deps = ["ArgTools", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" [[ExprTools]] -git-tree-sha1 = "b7e3d17636b348f005f11040025ae8c6f645fe92" +git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" -version = "0.1.6" +version = "0.1.3" [[FLoops]] deps = ["Compat", "FLoopsBase", "JuliaVariables", "MLStyle", "Serialization", "Setfield", "Transducers"] @@ -177,10 +172,10 @@ uuid = "b9860ae5-e623-471e-878b-f6a53c775ea6" version = "0.1.0" [[Folds]] -deps = ["Accessors", "BangBang", "Baselet", "DefineSingletons", "Distributed", "InitialValues", "MicroCollections", "Referenceables", "Requires", "Test", "Transducers"] -git-tree-sha1 = "e4be2abc0c95da9e24c5f77634b3350baa10d3bc" +deps = ["Accessors", "BangBang", "Baselet", "DefineSingletons", "Distributed", "InitialValues", "MicroCollections", "Referenceables", "Test", "Transducers"] +git-tree-sha1 = "06b91e95befe35cbdeba35eba436e93db5276d8e" uuid = "41a02a25-b8f0-4f67-bc48-60067656b558" -version = "0.2.5" +version = "0.2.3" [[FoldsCUDA]] deps = ["CUDA", "InitialValues", "Transducers", "UnionArrays"] @@ -213,22 +208,22 @@ deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[GPUArrays]] -deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization", "Statistics"] -git-tree-sha1 = "ececbf05f8904c92814bdbd0aafd5540b0bf2e9a" +deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"] +git-tree-sha1 = "9c95b2fd5c16bc7f97371e9f92f0fef77e0f5957" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "7.0.1" +version = "6.2.2" [[GPUCompiler]] -deps = ["DataStructures", "ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "TimerOutputs", "UUIDs"] -git-tree-sha1 = "0da0f52fc521ff23b8291e7fda54c61907609f12" +deps = ["DataStructures", "ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "Serialization", "TimerOutputs", "UUIDs"] +git-tree-sha1 = "6eadd2321dc3ac0fc9d530ab01c2caa7fe5d74c6" uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" -version = "0.12.6" +version = "0.11.4" [[IOCapture]] -deps = ["Logging", "Random"] -git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a" +deps = ["Logging"] +git-tree-sha1 = "377252859f740c217b936cebcd918a44f9b53b59" uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" -version = "0.2.2" +version = "0.1.1" [[InitialValues]] git-tree-sha1 = "26c8832afd63ac558b98a823265856670d898b6c" @@ -263,16 +258,10 @@ uuid = "b14d175d-62b4-44ba-8fb7-3064adc8c3ec" version = "0.2.4" [[LLVM]] -deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"] -git-tree-sha1 = "733abcbdc67337bb6aaf873c6bebbe1e6440a5df" +deps = ["CEnum", "Libdl", "Printf", "Unicode"] +git-tree-sha1 = "b616937c31337576360cb9fb872ec7633af7b194" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "4.1.1" - -[[LLVMExtra_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "b36c0677a0549c7d1dc8719899a4133abbfacf7d" -uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab" -version = "0.0.6+0" +version = "3.6.0" [[LazyArtifacts]] deps = ["Artifacts", "Pkg"] @@ -313,19 +302,13 @@ git-tree-sha1 = "de9eababca8fdc9b6b207ed05f99693faa608230" uuid = "b37bcd2d-1570-475d-a8c6-9b4fae6d0ba9" version = "0.1.0" -[[LogExpFunctions]] -deps = ["DocStringExtensions", "LinearAlgebra"] -git-tree-sha1 = "7bd5f6565d80b6bf753738d2bc40a5dfea072070" -uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" -version = "0.2.5" - [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" [[MLStyle]] -git-tree-sha1 = "594e189325f66e23a8818e5beb11c43bb0141bcd" +git-tree-sha1 = "a667f58636b36ba10145d46a4afe70492850af8c" uuid = "d8e11817-5142-5d16-987a-aa16d5891078" -version = "0.4.10" +version = "0.4.9" [[MacroTools]] deps = ["Markdown", "Random"] @@ -341,6 +324,12 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" +[[Memoize]] +deps = ["MacroTools"] +git-tree-sha1 = "2b1dfcba103de714d31c033b5dacc2e4a12c7caa" +uuid = "c03570c3-d221-55d1-a50c-7939bbd78826" +version = "0.4.4" + [[MicroCollections]] deps = ["BangBang", "Setfield"] git-tree-sha1 = "e991b6a9d38091c4a0d7cd051fcb57c05f98ac03" @@ -364,20 +353,20 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" [[OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" +git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.5+0" +version = "0.5.3+4" [[OrderedCollections]] -git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" +git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.4.1" +version = "1.4.0" [[Parsers]] deps = ["Dates"] -git-tree-sha1 = "94bf17e83a0e4b20c8d77f6af8ffe8cc3b386c0a" +git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.1.1" +version = "1.1.0" [[Pkg]] deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] @@ -385,9 +374,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Preferences]] deps = ["TOML"] -git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" +git-tree-sha1 = "ea79e4c9077208cd3bc5d29631a26bc0cff78902" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.2" +version = "1.2.1" [[PrettyPrint]] git-tree-sha1 = "632eb4abab3449ab30c5e1afaa874f0b98b586e4" @@ -414,14 +403,14 @@ version = "1.3.1" [[RandomNumbers]] deps = ["Random", "Requires"] -git-tree-sha1 = "56ead4aaafc41d83694e17b0dd89d3e929d01a14" +git-tree-sha1 = "441e6fc35597524ada7f85e13df1f4e10137d16f" uuid = "e6cf234a-135c-5ec9-84dd-332b85af5143" -version = "1.5.0" +version = "1.4.0" [[Reexport]] -git-tree-sha1 = "5f6c21241f0f655da3952fd60aa18477cf96c220" +git-tree-sha1 = "57d8440b0c7d98fc4f889e478e80f268d534c9d5" uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "1.1.0" +version = "1.0.0" [[Referenceables]] deps = ["Adapt"] @@ -438,6 +427,12 @@ version = "1.1.3" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" +[[Scratch]] +deps = ["Dates"] +git-tree-sha1 = "ad4b278adb62d185bbcb6864dc24959ab0627bf6" +uuid = "6c6a2e73-6563-6170-7368-637461726353" +version = "1.0.3" + [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -459,10 +454,10 @@ deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] -deps = ["ChainRulesCore", "LogExpFunctions", "OpenSpecFun_jll"] -git-tree-sha1 = "508822dca004bf62e210609148511ad03ce8f1d8" +deps = ["ChainRulesCore", "OpenSpecFun_jll"] +git-tree-sha1 = "5919936c0e92cff40e57d0ddf0ceb667d42e5902" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.6.0" +version = "1.3.0" [[SplittablesBase]] deps = ["Setfield", "Test"] @@ -486,9 +481,9 @@ version = "1.0.1" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "d0c690d37c73aeb5ca063056283fde5585a41710" +git-tree-sha1 = "c9d2d262e9a327be1f35844df25fe4561d258dc9" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.5.0" +version = "1.4.2" [[Tar]] deps = ["ArgTools", "SHA"] @@ -507,16 +502,16 @@ uuid = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" version = "0.1.0" [[TimerOutputs]] -deps = ["ExprTools", "Printf"] -git-tree-sha1 = "209a8326c4f955e2442c07b56029e88bb48299c7" +deps = ["Printf"] +git-tree-sha1 = "32cdbe6cd2d214c25a0b88f985c9e0092877c236" uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" -version = "0.5.12" +version = "0.5.8" [[Transducers]] deps = ["Adapt", "ArgCheck", "BangBang", "Baselet", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] -git-tree-sha1 = "34f27ac221cb53317ab6df196f9ed145077231ff" +git-tree-sha1 = "c277f1190f76f108cfdb89b9d5da87d9602e5593" uuid = "28d57a85-8fef-5791-bfe6-a80928e7c999" -version = "0.4.65" +version = "0.4.64" [[UUIDs]] deps = ["Random", "SHA"] From 66e3aa8f22c6d01571663aaa72100ca2d17cfe31 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 1 Aug 2021 22:52:08 -0400 Subject: [PATCH 5/8] Update FoldsCUDATests --- test/environments/cuda-jl16/Manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/environments/cuda-jl16/Manifest.toml b/test/environments/cuda-jl16/Manifest.toml index 30c7e11..4c70b21 100644 --- a/test/environments/cuda-jl16/Manifest.toml +++ b/test/environments/cuda-jl16/Manifest.toml @@ -196,7 +196,7 @@ version = "0.1.0" [[FoldsCUDATests]] deps = ["Adapt", "Aqua", "CUDA", "Documenter", "FLoops", "Folds", "FoldsCUDA", "FoldsCUDABenchmarks", "GPUArrays", "InitialValues", "LiterateTest", "Random", "Random123", "Referenceables", "Setfield", "SplittablesBase", "Test", "TestFunctionRunner", "Transducers"] -git-tree-sha1 = "a28710684fe6d2e6752f118e777e854935dc35d8" +git-tree-sha1 = "099b24b043e683b121609325d8d6e77ceb7bd2ff" repo-rev = "TestFunctionRunner" repo-subdir = "test/FoldsCUDATests" repo-url = "https://github.com/JuliaFolds/FoldsCUDA.jl.git" From 75198706540de157a030000b303ab1b135482282 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 1 Aug 2021 23:33:44 -0400 Subject: [PATCH 6/8] Print CUDA.versioninfo --- test/environments/cuda-jl16/Project.toml | 1 + test/runtests.jl | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/test/environments/cuda-jl16/Project.toml b/test/environments/cuda-jl16/Project.toml index 69c26bd..4c91694 100644 --- a/test/environments/cuda-jl16/Project.toml +++ b/test/environments/cuda-jl16/Project.toml @@ -1,4 +1,5 @@ [deps] +CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" FoldsCUDA = "6cd66ae4-5932-4b96-926d-e73e578e42cc" FoldsCUDABenchmarks = "1457febb-a09b-4652-98c9-46b8ccd8ff53" FoldsCUDATests = "d11caea5-3c98-4cd5-8a56-9589fe6662ee" diff --git a/test/runtests.jl b/test/runtests.jl index d106ba6..8d6725e 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -13,6 +13,12 @@ let env_test_cuda = lowercase(get(ENV, "UNIONARRAYS_JL_TEST_CUDA", "auto")), end if test_cuda + if lowercase(get(ENV, "CI", "false")) == "true" + import CUDA + CUDA.versioninfo() + println() + end + TestFunctionRunner.@run(packages = ["UnionArraysCUDATests"]) using FoldsCUDATests From 7be3ae39efdc65994ef689a0c073da1cf6206b6f Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Mon, 2 Aug 2021 01:44:44 -0400 Subject: [PATCH 7/8] Print CUDA.versioninfo via before_test_module hook --- test/UnionArraysCUDATests/src/UnionArraysCUDATests.jl | 7 ++++++- test/environments/cuda-jl16/Manifest.toml | 2 +- test/runtests.jl | 6 ------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/test/UnionArraysCUDATests/src/UnionArraysCUDATests.jl b/test/UnionArraysCUDATests/src/UnionArraysCUDATests.jl index 31ce6eb..20075df 100644 --- a/test/UnionArraysCUDATests/src/UnionArraysCUDATests.jl +++ b/test/UnionArraysCUDATests/src/UnionArraysCUDATests.jl @@ -12,8 +12,13 @@ end include_tests() -function __init__() +function before_test_module() CUDA.allowscalar(false) + + if lowercase(get(ENV, "CI", "false")) == "true" + CUDA.versioninfo() + println() + end end end # module UnionArraysCUDATests diff --git a/test/environments/cuda-jl16/Manifest.toml b/test/environments/cuda-jl16/Manifest.toml index 54738af..4867470 100644 --- a/test/environments/cuda-jl16/Manifest.toml +++ b/test/environments/cuda-jl16/Manifest.toml @@ -500,7 +500,7 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[TestFunctionRunner]] deps = ["Distributed", "LoadAllPackages", "Pkg", "Test"] -git-tree-sha1 = "78a77e769b8e10276da5b68eff22232449de8766" +git-tree-sha1 = "960d1c79fdf61ce63826c161e87ccbb589e460b5" repo-rev = "master" repo-url = "https://github.com/tkf/TestFunctionRunner.jl" uuid = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" diff --git a/test/runtests.jl b/test/runtests.jl index 8d6725e..d106ba6 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -13,12 +13,6 @@ let env_test_cuda = lowercase(get(ENV, "UNIONARRAYS_JL_TEST_CUDA", "auto")), end if test_cuda - if lowercase(get(ENV, "CI", "false")) == "true" - import CUDA - CUDA.versioninfo() - println() - end - TestFunctionRunner.@run(packages = ["UnionArraysCUDATests"]) using FoldsCUDATests From 9f0c53d90270d8ab6c39dda2db624694242a28f7 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 30 Jan 2022 16:08:29 -0500 Subject: [PATCH 8/8] Fix Pkg.test --- Project.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 426b6ec..e719ab0 100644 --- a/Project.toml +++ b/Project.toml @@ -17,6 +17,7 @@ julia = "1" [extras] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +TestFunctionRunner = "792026f5-ac9a-4a19-adcb-47b0ce2deb5d" [targets] -test = ["Aqua", "Test"] +test = ["Aqua", "Test", "TestFunctionRunner"]