Merge pull request #283 from JuliaGPU/tb/adapt_wrapper

Bump Adapt.
JuliaGPU · May 29, 2020 · fe31eae · fe31eae
2 parents ca04361 + 7b55b97
commit fe31eae
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ dist: trusty
 julia:
   - 1.3
   - 1.4
+  - 1.5
   - nightly
 
 matrix:
@@ -22,7 +23,7 @@ notifications:
 jobs:
   include:
     - stage: "Documentation"
-      julia: 1.3
+      julia: 1.4
       os: linux
       script:
         - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));

diff --git a/Manifest.toml b/Manifest.toml
@@ -8,9 +8,9 @@ version = "0.5.0"
 
 [[Adapt]]
 deps = ["LinearAlgebra"]
-git-tree-sha1 = "c88cfc7f9c1f9f8633cddf0b56e86302b70f64c5"
+git-tree-sha1 = "fd04049c7dd78cfef0b06cdc1f0f181467655712"
 uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
-version = "1.0.1"
+version = "1.1.0"
 
 [[Libdl]]
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

diff --git a/Project.toml b/Project.toml
@@ -12,7 +12,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 
 [compat]
 AbstractFFTs = "0.4, 0.5"
-Adapt = "0.4.1, 1.0"
+Adapt = "1.1"
 julia = "1.3"
 
 [extras]

diff --git a/src/host/abstractarray.jl b/src/host/abstractarray.jl
@@ -21,12 +21,6 @@ backend(::Type{<:AbstractGPUDevice}) = error("Not implemented") # COV_EXCL_LINE
 
 # convenience aliases for working with wrapped arrays
 
-# NOTE: these Unions are a hack. Ideally Base would have a Transpose <: WrappedArray <:
-# AbstractArray and we could define our methods in terms of Union{AbstractGPUArray,
-# WrappedArray{<:Any, <:AbstractGPUArray}}
-
-const WrappedArray{AT} = @eval Union{$([W for (W,ctor) in Adapt.wrappers]...)} where AT
-
 const WrappedGPUArray{T} = WrappedArray{<:AbstractGPUArray{T}}
 
 const AbstractOrWrappedGPUArray{T} = Union{AbstractGPUArray{T}, WrappedGPUArray{T}}