From 55bc03ff9ba8f5806bd5a5332baf30f178faaaa7 Mon Sep 17 00:00:00 2001 From: Pietro Vertechi Date: Wed, 24 Jun 2020 21:18:07 +0100 Subject: [PATCH] Remove GPUArray test dep and bump Adapt (#133) * CompatHelper: bump compat for "Adapt" to "2.0" * remove GPUArrays test dep * format * simpler adapt overload Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- Project.toml | 5 ++--- test/runtests.jl | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Project.toml b/Project.toml index c0938c32..2a0aad2b 100644 --- a/Project.toml +++ b/Project.toml @@ -8,17 +8,16 @@ DataAPI = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" [compat] -Adapt = "1" +Adapt = "1, 2" DataAPI = "1" Tables = "1" julia = "1" [extras] -GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" PooledArrays = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" WeakRefStrings = "ea10d353-3f73-51f8-a26c-33c1cb351aa5" [targets] -test = ["Test", "GPUArrays", "OffsetArrays", "PooledArrays", "WeakRefStrings"] +test = ["Test", "OffsetArrays", "PooledArrays", "WeakRefStrings"] diff --git a/test/runtests.jl b/test/runtests.jl index 76454608..756a63cc 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -3,8 +3,7 @@ using StructArrays: staticschema, iscompatible, _promote_typejoin, append!! using OffsetArrays: OffsetArray import Tables, PooledArrays, WeakRefStrings using DataAPI: refarray, refvalue -using Adapt: adapt -import GPUArrays +using Adapt: adapt, Adapt using Test @testset "index" begin @@ -702,9 +701,13 @@ end end end +struct ArrayConverter end + +Adapt.adapt_storage(::ArrayConverter, xs::AbstractArray) = convert(Array, xs) + @testset "adapt" begin s = StructArray(a = 1:10, b = StructArray(c = 1:10, d = 1:10)) - t = adapt(Array, s) + t = adapt(ArrayConverter(), s) @test propertynames(t) == (:a, :b) @test s == t @test t.a isa Array