Skip to content

Commit 022913e

Browse files
MaxenceGollieramontoison
authored andcommitted
remove @. macro from lbfgs operations
1 parent fd68c7b commit 022913e

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

src/lbfgs.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ function InverseLBFGSOperator(T::Type, n::I; kwargs...) where {I <: Integer}
129129
if data.ys[k] != 0
130130
αk = dot(data.s[k], q) / data.ys[k]
131131
data.α[k] = αk
132-
@. q -= αk * data.y[k]
132+
q .-= αk .* data.y[k]
133133
end
134134
end
135135

@@ -140,7 +140,7 @@ function InverseLBFGSOperator(T::Type, n::I; kwargs...) where {I <: Integer}
140140
if data.ys[k] != 0
141141
αk = data.α[k]
142142
β = αk - dot(data.y[k], q) / data.ys[k]
143-
@. q += β * data.s[k]
143+
q .+= β .* data.s[k]
144144
end
145145
end
146146
if βm == zero(T2)
@@ -188,7 +188,7 @@ function LBFGSOperator(T::Type, n::I; kwargs...) where {I <: Integer}
188188
if data.ys[k] != 0
189189
ax = dot(data.a[k], x)
190190
bx = dot(data.b[k], x)
191-
@. q += bx .* data.b[k] - ax .* data.a[k]
191+
q .+= bx .* data.b[k] .- ax .* data.a[k]
192192
end
193193
end
194194
if β == zero(T2)
@@ -221,12 +221,12 @@ function push_common!(
221221

222222
# Update arrays a and b used in forward products.
223223
if !op.inverse
224-
@. data.b[insert] = y / sqrt(ys)
224+
data.b[insert] .= y ./ sqrt(ys)
225225

226226
@inbounds for i = 1:(data.mem)
227227
k = mod(insert + i - 1, data.mem) + 1
228228
if data.ys[k] != 0
229-
@. data.a[k] = data.s[k] / data.scaling_factor # B₀ = I / γ.
229+
data.a[k] .= data.s[k] ./ data.scaling_factor # B₀ = I / γ.
230230

231231
@inbounds for j = 1:(i - 1)
232232
l = mod(insert + j - 1, data.mem) + 1
@@ -303,7 +303,7 @@ function push!(
303303
damp = true
304304
end
305305
if damp
306-
@. y = θ * y + (1 - θ) * Bs # damped y
306+
y = θ .* y .+ (1 - θ) .* Bs # damped y
307307
ys = θ * ys + (1 - θ) * sBs
308308
end
309309

@@ -328,7 +328,7 @@ function push!(
328328
σ₃ = op.data.σ₃
329329

330330
# Powell's damped update strategy
331-
@. Bs = -α * g
331+
Bs .= -α .* g
332332
sBs = dot(s, Bs)
333333
damp = false
334334
if ys < (1 - σ₂) * sBs
@@ -339,7 +339,7 @@ function push!(
339339
damp = true
340340
end
341341
if damp
342-
@. y = θ * y + (1 - θ) * Bs # damped y
342+
y .= θ .* y .+ (1 - θ) .* Bs # damped y
343343
ys = θ * ys + (1 - θ) * sBs
344344
end
345345

@@ -378,7 +378,7 @@ function diag!(op::LBFGSOperator{T}, d) where {T}
378378
@inbounds for i = 1:(data.mem)
379379
k = mod(data.insert + i - 2, data.mem) + 1
380380
if data.ys[k] != 0
381-
@. d += data.b[k] .^ 2 - data.a[k] .^ 2
381+
d .+= data.b[k] .^ 2 .- data.a[k] .^ 2
382382
end
383383
end
384384
return d

0 commit comments

Comments
 (0)