hvpextras preparation with random v

SciML · Jul 19, 2024 · 35bd067 · 35bd067
1 parent 27cd0d4
commit 35bd067
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 32 deletions.
diff --git a/src/OptimizationDIExt.jl b/src/OptimizationDIExt.jl
@@ -43,11 +43,8 @@ function OptimizationBase.instantiate_function(
     end
 
     if f.hv === nothing
-        extras_hvp = nothing
+        extras_hvp = prepare_hvp(_f, soadtype, x, rand(size(x)))
         hv = function (H, θ, v, args...)
-            if extras_hvp === nothing
-                global extras_hvp = prepare_hvp(_f, soadtype, x, v)
-            end
             hvp!(_f, H, soadtype, θ, v, extras_hvp)
         end
     else
@@ -142,11 +139,8 @@ function OptimizationBase.instantiate_function(
     end
 
     if f.hv === nothing
-        extras_hvp = nothing
+        extras_hvp = prepare_hvp(_f, soadtype, x, rand(size(x)))
         hv = function (H, θ, v, args...)
-            if extras_hvp === nothing
-                global extras_hvp = prepare_hvp(_f, soadtype, x, v)
-            end
             hvp!(_f, H, soadtype, θ, v, extras_hvp)
         end
     else
@@ -239,11 +233,8 @@ function OptimizationBase.instantiate_function(
     end
 
     if f.hv === nothing
-        extras_hvp = nothing
+        extras_hvp = prepare_hvp(_f, soadtype, x, rand(size(x)))
         hv = function (θ, v, args...)
-            if extras_hvp === nothing
-                global extras_hvp = prepare_hvp(_f, soadtype, x, v)
-            end
             hvp(_f, soadtype, θ, v, extras_hvp)
         end
     else
@@ -340,11 +331,8 @@ function OptimizationBase.instantiate_function(
     end
 
     if f.hv === nothing
-        extras_hvp = nothing
+        extras_hvp = prepare_hvp(_f, soadtype, x, rand(size(x)))
         hv = function (θ, v, args...)
-            if extras_hvp === nothing
-                global extras_hvp = prepare_hvp(_f, soadtype, x, v)
-            end
             hvp(_f, soadtype, θ, v, extras_hvp)
         end
     else

diff --git a/src/OptimizationDISparseExt.jl b/src/OptimizationDISparseExt.jl
@@ -108,11 +108,8 @@ function OptimizationBase.instantiate_function(
     end
 
     if f.hv === nothing
-        extras_hvp = nothing
+        extras_hvp = prepare_hvp(_f, soadtype, x, rand(size(x)))
         hv = function (H, θ, v, args...)
-            if extras_hvp === nothing
-                global extras_hvp = prepare_hvp(_f, soadtype, x, v)
-            end
             hvp!(_f, H, soadtype, θ, v, extras_hvp)
         end
     else
@@ -201,11 +198,8 @@ function OptimizationBase.instantiate_function(
     end
 
     if f.hv === nothing
-        extras_hvp = nothing
+        extras_hvp = prepare_hvp(_f, soadtype, x, rand(size(x)))
         hv = function (H, θ, v, args...)
-            if extras_hvp === nothing
-                global extras_hvp = prepare_hvp(_f, soadtype, x, v)
-            end
             hvp!(_f, H, soadtype, θ, v, extras_hvp)
         end
     else
@@ -292,11 +286,8 @@ function OptimizationBase.instantiate_function(
     end
 
     if f.hv === nothing
-        extras_hvp = nothing
+        extras_hvp = prepare_hvp(_f, soadtype, x, rand(size(x)))
         hv = function (θ, v, args...)
-            if extras_hvp === nothing
-                global extras_hvp = prepare_hvp(_f, soadtype, x, v)
-            end
             hvp(_f, soadtype, θ, v, extras_hvp)
         end
     else
@@ -387,11 +378,8 @@ function OptimizationBase.instantiate_function(
     end
 
     if f.hv === nothing
-        extras_hvp = nothing
+        extras_hvp = prepare_hvp(_f, soadtype, x, rand(size(x)))
         hv = function (θ, v, args...)
-            if extras_hvp === nothing
-                global extras_hvp = prepare_hvp(_f, soadtype, x, v)
-            end
             hvp(_f, soadtype, θ, v, extras_hvp)
         end
     else