From 468f641f667faaa0aef632855c272c27df34cf60 Mon Sep 17 00:00:00 2001 From: Mike J Innes Date: Mon, 8 Jan 2018 16:31:23 +0000 Subject: [PATCH] use Adapt --- REQUIRE | 1 + src/onehot.jl | 2 +- src/tracker/Tracker.jl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/REQUIRE b/REQUIRE index 7c084129..8e718a92 100644 --- a/REQUIRE +++ b/REQUIRE @@ -5,3 +5,4 @@ MacroTools 0.3.3 NNlib ForwardDiff 0.5.0 Requires +Adapt diff --git a/src/onehot.jl b/src/onehot.jl index 4f121958..b1a1a970 100644 --- a/src/onehot.jl +++ b/src/onehot.jl @@ -28,7 +28,7 @@ Base.hcat(x::OneHotVector, xs::OneHotVector...) = OneHotMatrix(length(x), [x, xs batch(xs::AbstractArray{<:OneHotVector}) = OneHotMatrix(length(first(xs)), xs) -import NNlib.adapt +import Adapt.adapt adapt(T, xs::OneHotMatrix) = OneHotMatrix(xs.height, adapt(T, xs.data)) diff --git a/src/tracker/Tracker.jl b/src/tracker/Tracker.jl index 376cc617..aa2bc6ea 100644 --- a/src/tracker/Tracker.jl +++ b/src/tracker/Tracker.jl @@ -93,7 +93,7 @@ include("back.jl") include("lib.jl") include("numeric.jl") -import NNlib.adapt +import Adapt.adapt adapt(T, xs::TrackedArray) = TrackedArray(xs.f, adapt(T, xs.data), adapt(T, xs.grad))