Fix GPU usage and add downstream testing

Author: ChrisRackauckas

.travis.yml

@@ -10,6 +10,9 @@ os:
 julia:
   - 1
 #  - nightly
+env:
+  - GROUP=Core
+  - GROUP=Downstream
 notifications:
   email: false
 jobs:

src/function.jl

@@ -37,7 +37,7 @@ function instantiate_function(f, x, ::AbstractADType, p, num_cons = 0)
                          cons_j,cons_h)
 end
 
-function instantiate_function(f, x, ::AutoForwardDiff{_chunksize}, p, num_cons = 0) where _chunksize
+function instantiate_function(f::OptimizationFunction{true}, x, ::AutoForwardDiff{_chunksize}, p, num_cons = 0) where _chunksize
 
     chunksize = _chunksize === nothing ? default_chunk_size(length(x)) : _chunksize
 

src/solve.jl

@@ -12,6 +12,7 @@ function DiffEqBase.solve(prob::OptimizationProblem, opt, args...;kwargs...)
 	__solve(prob, opt, args...; kwargs...)
 end
 
+#=
 function update!(x::AbstractArray, x̄::AbstractArray{<:ForwardDiff.Dual})
   x .-= x̄
 end
@@ -31,6 +32,7 @@ end
 function update!(opt, xs::Flux.Zygote.Params, gs)
 	update!(opt, xs[1], gs)
 end
+=#
 
 maybe_with_logger(f, logger) = logger === nothing ? f() : Logging.with_logger(f, logger)
 
@@ -62,7 +64,10 @@ macro withprogress(progress, exprs...)
 	end |> esc
   end
 
-function __solve(prob::OptimizationProblem, opt, data = DEFAULT_DATA;cb = (args...) -> (false), maxiters::Number = 1000, progress = true, save_best = true, kwargs...)
+function __solve(prob::OptimizationProblem, opt, data = DEFAULT_DATA;
+				 cb = (args...) -> (false), maxiters::Number = 1000,
+				 progress = true, save_best = true, kwargs...)
+
 	if maxiters <= 0.0
 		error("The number of maxiters has to be a non-negative and non-zero number.")
 	else
@@ -76,7 +81,7 @@ function __solve(prob::OptimizationProblem, opt, data = DEFAULT_DATA;cb = (args.
 
 	if data != DEFAULT_DATA
 		maxiters = length(data)
-	else 
+	else
 		data = take(data, maxiters)
 	end
 
@@ -90,8 +95,10 @@ function __solve(prob::OptimizationProblem, opt, data = DEFAULT_DATA;cb = (args.
 
 	@withprogress progress name="Training" begin
 	  for (i,d) in enumerate(data)
-		gs = prob.f.adtype isa AutoFiniteDiff ? Array{Number}(undef,length(θ)) : DiffResults.GradientResult(θ)
-		f.grad(gs, θ, d...) 
+	    gs = Flux.Zygote.gradient(ps) do
+  		  x = prob.f(θ,prob.p)
+  		  first(x)
+  		end
 		x = f.f(θ, prob.p, d...)
 		cb_call = cb(θ, x...)
 		if !(typeof(cb_call) <: Bool)
@@ -101,7 +108,7 @@ function __solve(prob::OptimizationProblem, opt, data = DEFAULT_DATA;cb = (args.
 		end
 		msg = @sprintf("loss: %.3g", x[1])
 		progress && ProgressLogging.@logprogress msg i/maxiters
-		update!(opt, ps, prob.f.adtype isa AutoFiniteDiff ? gs : DiffResults.gradient(gs))
+		Flux.update!(opt, ps, gs)
 
 		if save_best
 		  if first(x) < first(min_err)  #found a better solution
@@ -215,7 +222,7 @@ function __solve(prob::OptimizationProblem, opt::Union{Optim.Fminbox,Optim.SAMIN
 	  	if !(typeof(cb_call) <: Bool)
 			error("The callback should return a boolean `halt` for whether to stop the optimization process.")
 		end
-		cur, state = iterate(data, state)  
+		cur, state = iterate(data, state)
 	  	cb_call
 	end
 

test/downstream/Project.toml

@@ -0,0 +1,2 @@
+[deps]
+DiffEqFlux = "aae7a2af-3d4f-5e19-a356-7da93b79d9d0"

test/runtests.jl

@@ -1,10 +1,25 @@
-using SafeTestsets
-
-println("Rosenbrock Tests")
-@safetestset "Rosenbrock" begin include("rosenbrock.jl") end
-println("AD Tests")
-@safetestset "AD Tests" begin include("ADtests.jl") end
-println("Mini batching Tests")
-@safetestset "Mini batching" begin include("minibatch.jl") end
-println("DiffEqFlux Tests")
-@safetestset "DiffEqFlux" begin include("diffeqfluxtests.jl") end
+using SafeTestsets, Pkg
+
+const GROUP = get(ENV, "GROUP", "All")
+const is_APPVEYOR = Sys.iswindows() && haskey(ENV,"APPVEYOR")
+const is_TRAVIS = haskey(ENV,"TRAVIS")
+
+function activate_downstream_env()
+    Pkg.activate("downstream")
+    Pkg.develop(PackageSpec(path=dirname(@__DIR__)))
+    Pkg.instantiate()
+end
+
+@time begin
+if GROUP == "All" || GROUP == "Core"
+    @safetestset "Rosenbrock" begin include("rosenbrock.jl") end
+    @safetestset "AD Tests" begin include("ADtests.jl") end
+    @safetestset "Mini batching" begin include("minibatch.jl") end
+    @safetestset "DiffEqFlux" begin include("diffeqfluxtests.jl") end
+end
+
+if !is_APPVEYOR && GROUP == "Downstream"
+    activate_downstream_env()
+    Pkg.test("DiffEqFlux")
+end
+end