From 4f0c30fc83ae47ce76259d4e54da13931183c741 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Wed, 24 Mar 2021 20:55:30 -0700 Subject: [PATCH] More explicit CUDA test control; fix cuda-jl15 (#20) * More explicit CUDA test control * Update test/environments/cuda-jl15 --- .buildkite/pipeline.yml | 4 +++ test/environments/cuda-jl15/Manifest.toml | 38 +++++++++++------------ test/runtests.jl | 22 ++++++------- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 1b1fc24..bc8e922 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -16,6 +16,8 @@ steps: build.message !~ /^\[skip gpu\]/ && build.message !~ /^\[skip cuda\]/ timeout_in_minutes: 60 + env: + UNIONARRAYS_JL_TEST_CUDA: "true" - label: "Julia v1.6" plugins: @@ -34,6 +36,8 @@ steps: build.message !~ /^\[skip gpu\]/ && build.message !~ /^\[skip cuda\]/ timeout_in_minutes: 60 + env: + UNIONARRAYS_JL_TEST_CUDA: "true" env: SECRET_CODECOV_TOKEN: "jkXNrZ8pAwl83swOxp9//7S/qUvS89lSina47ZPqC4+Tl6LI9lZ0MBld2jAZ2h11nipYLNTFqOm7IExt9ajGZMd1/U/B3GohT1pMfSOUy3Fe+5NlV/Iul4cRnGmp33F6wdRg2gYbJpwc8UUxJwktF3NAm3n7U8FZHw7Tn3s3EHA9h3KHIJEDypYDMQy08VPI7S4uFuUuH6IG/uO+/fDQdQFc5D4EuaFg6PgwJTP3BmN6vLuFXk6iMJtlEAkcMu1eNbT9tb7uLd93yxUNGKpxNpVgMjdVv+fIikY8JxUQLdK+maNn4eGEJDKA7c4HlyNPkI9kIn5H/prvriBZ6gcEKw==;U2FsdGVkX1+1x0ORRaVh5R3iKW6Stg1DuKDZEfLA1Qbp/p28m6yQnbSMyYeSrzYoib6BjWjSfUFlBX2DZgsCWQ==" diff --git a/test/environments/cuda-jl15/Manifest.toml b/test/environments/cuda-jl15/Manifest.toml index c4eecd1..e34d853 100644 --- a/test/environments/cuda-jl15/Manifest.toml +++ b/test/environments/cuda-jl15/Manifest.toml @@ -2,9 +2,9 @@ [[AbstractFFTs]] deps = ["LinearAlgebra"] -git-tree-sha1 = "485ee0867925449198280d4af84bdb46a2a404d0" +git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716" uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "1.0.1" +version = "0.5.0" [[Accessors]] deps = ["Compat", "CompositionsBase", "ConstructionBase", "Future", "MacroTools", "Requires", "Test"] @@ -56,15 +56,15 @@ version = "0.4.1" [[CUDA]] deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "Libdl", "LinearAlgebra", "Logging", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "Requires", "SparseArrays", "Statistics", "TimerOutputs"] -git-tree-sha1 = "6ccc73b2d8b671f7a65c92b5f08f81422ebb7547" +git-tree-sha1 = "6eadca78b29780d94d34d4e7d89bb4eb45bce240" uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" -version = "2.4.1" +version = "2.4.2" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "de4f08843c332d355852721adb1592bce7924da3" +git-tree-sha1 = "a8a75576d509f1996fe3046ce62e5685b0a8bd3a" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.29" +version = "0.9.31" [[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"] @@ -124,9 +124,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[DocStringExtensions]] deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "50ddf44c53698f5e784bbebb3f4b21c5807401b1" +git-tree-sha1 = "9d4f64f79012636741cf01133158a54b24924c32" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.3" +version = "0.8.4" [[Documenter]] deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] @@ -147,11 +147,11 @@ version = "0.2.2" [[FoldsCUDA]] deps = ["CUDA", "GPUArrays", "InitialValues", "SplittablesBase", "Transducers"] -git-tree-sha1 = "2725608227cdb51d6e6ca2f0f09767a34205534e" +git-tree-sha1 = "46ccc4cc50fb1f2e5e8bfa38edf01184c8869974" repo-rev = "master" repo-url = "https://github.com/JuliaFolds/FoldsCUDA.jl.git" uuid = "6cd66ae4-5932-4b96-926d-e73e578e42cc" -version = "0.1.4-DEV" +version = "0.1.5-DEV" [[Future]] deps = ["Random"] @@ -241,9 +241,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[NNlib]] deps = ["ChainRulesCore", "Compat", "LinearAlgebra", "Pkg", "Requires", "Statistics"] -git-tree-sha1 = "df42d0816edfc24f5b82a728f46381613c4dff79" +git-tree-sha1 = "ab1d43fead2ecb9aa5ae460d3d547c2cf8d89461" uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.7.14" +version = "0.7.17" [[OrderedCollections]] git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" @@ -252,9 +252,9 @@ version = "1.4.0" [[Parsers]] deps = ["Dates"] -git-tree-sha1 = "223a825cccef2228f3fdbf2ecc7ca93363059073" +git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.16" +version = "1.1.0" [[Pkg]] deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] @@ -285,9 +285,9 @@ version = "0.1.2" [[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" @@ -336,9 +336,9 @@ version = "1.0.0" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "a716dde43d57fa537a19058d044b495301ba6565" +git-tree-sha1 = "a9ff3dfec713c6677af435d6a6d65f9744feef67" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.3.2" +version = "1.4.1" [[Test]] deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] @@ -352,7 +352,7 @@ version = "0.5.8" [[Transducers]] deps = ["ArgCheck", "BangBang", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] -git-tree-sha1 = "494c6effd1fef90b7fd86cae7dce529509966bf6" +git-tree-sha1 = "1f5ed218f428637d44b1c68ab9156d4435db5537" repo-rev = "master" repo-url = "https://github.com/JuliaFolds/Transducers.jl" uuid = "28d57a85-8fef-5791-bfe6-a80928e7c999" diff --git a/test/runtests.jl b/test/runtests.jl index 3b1c1a1..43d54f9 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,22 +1,22 @@ module TestUnionArrays using Test -if VERSION ≥ v"1.6-" +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 - pkgid = Base.PkgId(Base.UUID("052768ef-5323-5732-b1bb-66c8b64840ba"), "CUDA") - Base.require(pkgid) + import CUDA + CUDA.has_cuda_gpu() catch - @info "Failed to import CUDA. Trying again with `@stdlib`..." - push!(LOAD_PATH, "@stdlib") + false end -end - -const TEST_CUDA = try - import CUDA - CUDA.has_cuda_gpu() -catch +else false end + const TEST_GPU = TEST_CUDA TEST_CUDA && CUDA.allowscalar(false)