Skip to content

Commit a38f18c

Browse files
Only manually inline broadcast until fix
Fixes SciML/DifferentialEquations.jl#593 Xref: JuliaLang/julia#35260
1 parent 942c08a commit a38f18c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/diffeqfastbc.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ diffeqbc(x::Array) = DiffEqBC(x)
1515
diffeqbc(x) = x
1616

1717
# Ensure inlining
18-
@inline combine_axes(A, B) = broadcast_shape(broadcast_axes(A), broadcast_axes(B)) # Julia 1.0 compatible
18+
@static if VERSION < v"1.5.0-DEV.634"
19+
@inline combine_axes(A, B) = broadcast_shape(broadcast_axes(A), broadcast_axes(B)) # Julia 1.0 compatible
20+
end
21+
1922
@inline check_broadcast_axes(shp, A::Union{Number, Array, Broadcasted}) = check_broadcast_shape(shp, axes(A))
2023

2124
@noinline throwfastbc(axesA, axesB) = throw(DimensionMismatch("DiffEq's fast broadcast cannot broadcast $axesA with $axesB"))

0 commit comments

Comments
 (0)