Skip to content

Commit efdd7d5

Browse files
mcabbottdevmotion
andauthored
revert clever axes trick now that Size is available
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
1 parent 96b91ee commit efdd7d5

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
77

88
[compat]
99
StaticArrays = "1.5.7"
10-
StaticArraysCore = "1.3.0"
10+
StaticArraysCore = "1.4.0"
1111
julia = "1.6"
1212

1313
[extras]

src/DiffResults.jl

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module DiffResults
22

3-
using StaticArraysCore: StaticArray, similar_type #, Size # Size is not yet in Core package
3+
using StaticArraysCore: StaticArray, similar_type, Size
44

55
#########
66
# Types #
@@ -76,8 +76,7 @@ shape information. If you want to allocate storage yourself, use the `DiffResult
7676
constructor instead.
7777
"""
7878
JacobianResult(x::AbstractArray) = DiffResult(similar(x), similar(x, length(x), length(x)))
79-
# JacobianResult(x::StaticArray) = DiffResult(x, zeros(similar_type(typeof(x), Size(length(x),length(x)))))
80-
JacobianResult(x::StaticArray) = DiffResult(x, zeros(similar_type(typeof(x), (axes(vec(x))..., axes(vec(x))...))))
79+
JacobianResult(x::StaticArray) = DiffResult(x, zeros(similar_type(typeof(x), Size(length(x),length(x)))))
8180

8281
"""
8382
JacobianResult(y::AbstractArray, x::AbstractArray)
@@ -90,8 +89,7 @@ Like the single argument version, `y` and `x` are only used for type and
9089
shape information and are not stored in the returned `DiffResult`.
9190
"""
9291
JacobianResult(y::AbstractArray, x::AbstractArray) = DiffResult(similar(y), similar(y, length(y), length(x)))
93-
# JacobianResult(y::StaticArray, x::StaticArray) = DiffResult(y, zeros(similar_type(typeof(x), Size(length(y),length(x)))))
94-
JacobianResult(y::StaticArray, x::StaticArray) = DiffResult(y, zeros(similar_type(typeof(x), (axes(vec(y))..., axes(vec(x))...))))
92+
JacobianResult(y::StaticArray, x::StaticArray) = DiffResult(y, zeros(similar_type(typeof(x), Size(length(y),length(x)))))
9593

9694
"""
9795
HessianResult(x::AbstractArray)
@@ -104,8 +102,7 @@ shape information. If you want to allocate storage yourself, use the `DiffResult
104102
constructor instead.
105103
"""
106104
HessianResult(x::AbstractArray) = DiffResult(first(x), zeros(eltype(x), size(x)), similar(x, length(x), length(x)))
107-
# HessianResult(x::StaticArray) = DiffResult(first(x), x, zeros(similar_type(typeof(x), Size(length(x),length(x)))))
108-
HessianResult(x::StaticArray) = DiffResult(first(x), x, zeros(similar_type(typeof(x), (axes(vec(x))..., axes(vec(x))...))))
105+
HessianResult(x::StaticArray) = DiffResult(first(x), x, zeros(similar_type(typeof(x), Size(length(x),length(x)))))
109106

110107
#############
111108
# Interface #

0 commit comments

Comments
 (0)