Revert "Fix ordering of the promotion [Take II]"

Author: ChrisRackauckas

ext/DiffEqBaseTrackerExt.jl

@@ -97,15 +97,9 @@ Tracker.@grad function DiffEqBase.solve_up(prob,
         },
         u0, p, args...;
         kwargs...)
-    sol, pb_f = DiffEqBase._solve_adjoint(
-        prob, sensealg, Tracker.data(u0), Tracker.data(p),
+    out = DiffEqBase._solve_adjoint(prob, sensealg, Tracker.data(u0), Tracker.data(p),
         SciMLBase.TrackerOriginator(), args...; kwargs...)
-
-    if sol isa AbstractArray
-        !hasfield(typeof(sol), :u) && return sol, pb_f # being safe here
-        return sol.u, pb_f # AbstractNoTimeSolution isa AbstractArray
-    end
-    return convert(AbstractArray, sol), pb_f
+    Array(out[1]), out[2]
 end
 
 end

src/solve.jl

@@ -1130,23 +1130,23 @@ function get_concrete_problem(prob::AbstractJumpProblem, isadapt; kwargs...)
 end
 
 function get_concrete_problem(prob::SteadyStateProblem, isadapt; kwargs...)
-    p = get_concrete_p(prob, kwargs)
     u0 = get_concrete_u0(prob, isadapt, Inf, kwargs)
-    u0 = promote_u0(u0, p, nothing)
+    u0 = promote_u0(u0, prob.p, nothing)
+    p = get_concrete_p(prob, kwargs)
     remake(prob; u0 = u0, p = p)
 end
 
 function get_concrete_problem(prob::NonlinearProblem, isadapt; kwargs...)
-    p = get_concrete_p(prob, kwargs)
     u0 = get_concrete_u0(prob, isadapt, nothing, kwargs)
-    u0 = promote_u0(u0, p, nothing)
+    u0 = promote_u0(u0, prob.p, nothing)
+    p = get_concrete_p(prob, kwargs)
     remake(prob; u0 = u0, p = p)
 end
 
 function get_concrete_problem(prob::NonlinearLeastSquaresProblem, isadapt; kwargs...)
-    p = get_concrete_p(prob, kwargs)
     u0 = get_concrete_u0(prob, isadapt, nothing, kwargs)
-    u0 = promote_u0(u0, p, nothing)
+    u0 = promote_u0(u0, prob.p, nothing)
+    p = get_concrete_p(prob, kwargs)
     remake(prob; u0 = u0, p = p)
 end