cont.

Author: michel2323

Project.toml

@@ -4,6 +4,7 @@ version = "0.8.7"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
+Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 NLPModels = "a4795742-8479-5a88-8948-cc11e1c8c1a6"

src/enzyme.jl

@@ -56,7 +56,7 @@ function hessian(::EnzymeReverseADHessian, f, x)
   return hess
 end
 
-struct EnzymeReverseADJprod <: InPlaceADBackend
+struct EnzymeReverseADJprod <: InPlaceADbackend
   x::Vector{Float64}
 end
 
@@ -76,7 +76,7 @@ function Jprod!(b::EnzymeReverseADJprod, Jv, c!, x, v, ::Val)
   return Jv
 end
 
-struct EnzymeReverseADJtprod <: InPlaceADBackend
+struct EnzymeReverseADJtprod <: InPlaceADbackend
   x::Vector{Float64}
 end
 
@@ -96,7 +96,7 @@ function Jtvprod!(b::EnzymeReverseADJtprod, Jtv, c!, x, v, ::Val)
   return Jtv
 end
 
-struct EnzymeReverseADHprod <: InPlaceADBackend
+struct EnzymeReverseADHvprod <: InPlaceADbackend
   grad::Vector{Float64}
 end
 
@@ -109,7 +109,7 @@ function EnzymeReverseADHvprod(
   kwargs...,
 ) where {T}
   grad = zeros(nvar)
-  return EnzymeReverseADHprod(grad)
+  return EnzymeReverseADHvprod(grad)
 end
 
 function Hvprod!(b::EnzymeReverseADHvprod, Hv, x, v, f, args...)
@@ -128,12 +128,12 @@ end
 function Hvprod!(
   b::EnzymeReverseADHvprod,
   Hv,
-  x::AbstractVector{T},
+  x,
   v,
   ℓ,
   ::Val{:lag},
   y,
-  obj_weight::Real = one(T),
+  obj_weight::Real = one(eltype(x)),
 )
   Enzyme.autodiff(
     Forward,
@@ -149,13 +149,13 @@ function Hvprod!(
 end
 
 function Hvprod!(
-  b::EnzymeReverseADHvprod{T, S, Tagf},
+  b::EnzymeReverseADHvprod,
   Hv,
   x,
   v,
   f,
   ::Val{:obj},
-  obj_weight::Real = one(T),
+  obj_weight::Real = one(eltype(x)),
 )
   Enzyme.autodiff(
     Forward,

test/enzyme.jl

@@ -3,8 +3,12 @@ using ADNLPModels, ManualNLPModels, NLPModels, NLPModelsModifiers, NLPModelsTest
 using ADNLPModels:
   gradient, gradient!, jacobian, hessian, Jprod!, Jtprod!, directional_second_derivative, Hvprod!
 
-# Automatically loads the code for Enzyme with Requires
-import Enzyme
+for problem in NLPModelsTest.nlp_problems ∪ ["GENROSE"]
+  include("nlp/problems/$(lowercase(problem)).jl")
+end
+for problem in NLPModelsTest.nls_problems
+  include("nls/problems/$(lowercase(problem)).jl")
+end
 
 #=
 ADNLPModels.EmptyADbackend(args...; kwargs...) = ADNLPModels.EmptyADbackend()