tests pass

SciML · Oct 1, 2024 · c850508 · c850508
1 parent 043a01c
commit c850508
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/ext/OptimizationZygoteExt.jl b/ext/OptimizationZygoteExt.jl
@@ -101,11 +101,11 @@ function OptimizationBase.instantiate_function(
     if hv == true && f.hv === nothing
         prep_hvp = prepare_hvp(f.f, soadtype, x, (zeros(eltype(x), size(x)),), Constant(p))
         function hv!(H, θ, v)
-            hvp!(f.f, H, prep_hvp, soadtype, θ, (v,), Constant(p))
+            hvp!(f.f, (H,), prep_hvp, soadtype, θ, (v,), Constant(p))
         end
         if p !== SciMLBase.NullParameters() && p !== nothing
             function hv!(H, θ, v, p)
-                hvp!(f.f, H, prep_hvp, soadtype, θ, (v,), Constant(p))
+                hvp!(f.f, (H,), prep_hvp, soadtype, θ, (v,), Constant(p))
             end
         end
     elseif hv == true
@@ -141,9 +141,9 @@ function OptimizationBase.instantiate_function(
     cons_jac_prototype = f.cons_jac_prototype
     cons_jac_colorvec = f.cons_jac_colorvec
     if cons !== nothing && cons_j == true && f.cons_j === nothing
-        prep_jac = prepare_jacobian(cons_oop, adtype, x, Constant(p))
+        prep_jac = prepare_jacobian(cons_oop, adtype, x)
         function cons_j!(J, θ)
-            jacobian!(cons_oop, J, prep_jac, adtype, θ, Constant(p))
+            jacobian!(cons_oop, J, prep_jac, adtype, θ)
             if size(J, 1) == 1
                 J = vec(J)
             end

diff --git a/src/OptimizationDISparseExt.jl b/src/OptimizationDISparseExt.jl
@@ -210,9 +210,8 @@ function instantiate_function(
         end
 
         function cons_oop(x, i)
-            _res = zeros(eltype(x))
+            _res = zeros(eltype(x), num_cons)
             f.cons(_res, x, p)
-            @show _res
             return _res[i]
         end
 

diff --git a/test/adtests.jl b/test/adtests.jl
@@ -202,7 +202,7 @@ optprob.cons_h(H3, x0)
     optprob.cons(res, x0)
     @test res == [0.0]
     J = Array{Float64}(undef, 2)
-    @test optprob.cons_j(J, [5.0, 3.0])
+    optprob.cons_j(J, [5.0, 3.0])
     @test J == [10.0, 6.0]
     vJ = Array{Float64}(undef, 2)
     optprob.cons_vjp(vJ, [5.0, 3.0], [1.0])