Skip to content

Commit 61a995d

Browse files
Merge pull request #478 from SciML/arrayinterface
update to ArrayInterface v7
2 parents 5c93023 + f8fdf06 commit 61a995d

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

Project.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ uuid = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
33
version = "3.11.2"
44

55
[deps]
6-
ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
6+
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
77
ConsoleProgressMonitor = "88cd18e8-d9cc-4ea6-8889-5259c0d15c8b"
88
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
99
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -18,8 +18,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1818
TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
1919

2020
[compat]
21-
ArrayInterface = "6"
22-
ArrayInterfaceCore = "0.1.1"
21+
ArrayInterface = "6, 7"
2322
ConsoleProgressMonitor = "0.1"
2423
DocStringExtensions = "0.8, 0.9"
2524
LoggingExtras = "0.4, 0.5, 1"
@@ -28,7 +27,4 @@ Reexport = "0.2, 1.0"
2827
Requires = "1.0"
2928
SciMLBase = "1.79.0"
3029
TerminalLoggers = "0.1"
31-
julia = "1.6"
32-
33-
[extras]
34-
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
30+
julia = "1.6"

src/Optimization.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ using Reexport
88
@reexport using SciMLBase
99
using Requires
1010
using Logging, ProgressLogging, ConsoleProgressMonitor, TerminalLoggers, LoggingExtras
11-
using ArrayInterfaceCore, Base.Iterators, SparseArrays
11+
using ArrayInterface, Base.Iterators, SparseArrays
1212
using Pkg
1313

1414
import SciMLBase: OptimizationProblem, OptimizationFunction, AbstractADType, ObjSense,

src/function/finitediff.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function instantiate_function(f, x, adtype::AutoFiniteDiff, p, num_cons = 0)
7676

7777
if f.hv === nothing
7878
hv = function (H, θ, v, args...)
79-
res = ArrayInterfaceCore.zeromatrix(θ)
79+
res = ArrayInterface.zeromatrix(θ)
8080
hess(res, θ, args...)
8181
H .= res * v
8282
end

src/function/forwarddiff.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function instantiate_function(f::OptimizationFunction{true}, x,
6464

6565
if f.hv === nothing
6666
hv = function (H, θ, v, args...)
67-
res = ArrayInterfaceCore.zeromatrix(θ)
67+
res = ArrayInterface.zeromatrix(θ)
6868
hess(res, θ, args...)
6969
H .= res * v
7070
end

src/function/mtk.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function instantiate_function(f, x, adtype::AutoModelingToolkit, p, num_cons = 0
6161

6262
hv = function (H, θ, v, args...)
6363
res = adtype.obj_sparse ? (eltype(θ)).(f.hess_prototype) :
64-
ArrayInterfaceCore.zeromatrix(θ)
64+
ArrayInterface.zeromatrix(θ)
6565
hess(res, θ, args...)
6666
H .= res * v
6767
end

0 commit comments

Comments
 (0)