Merge pull request #499 from SciML/myb/bc

Fix @.. on MArrays

Author: YingboMa

Project.toml

@@ -1,7 +1,7 @@
 name = "DiffEqBase"
 uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "6.31.0"
+version = "6.31.1"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/diffeqfastbc.jl

@@ -42,21 +42,23 @@ preprocess_args(f::typeof(diffeqbc), dest, args::Tuple{}) = ()
 
 # Performance optimization for the common identity scalar case: dest .= val
 @inline copyto!(dest::DiffEqBC, bc::Broadcasted{<:AbstractArrayStyle{0}}) = copyto!(dest.x, bc)
-@inline function copyto!(dest::DiffEqBC, bc::Broadcasted)
-    axes(dest) == axes(bc) || throwdm(axes(dest), axes(bc))
-    dest′ = dest.x
-    # Performance optimization: broadcast!(identity, dest, A) is equivalent to copyto!(dest, A) if indices match
-    if bc.f === identity && bc.args isa Tuple{AbstractArray} # only a single input argument to broadcast!
-        A = bc.args[1]
-        if axes(dest) == axes(A)
-            return copyto!(dest′, A)
-        end
-    end
-    bcs′ = preprocess(diffeqbc, dest, bc)
-    @simd ivdep for I in eachindex(bcs′)
-        @inbounds dest′[I] = bcs′[I]
-    end
-    return dest′ # return the original array without the wrapper
+for B in (Broadcasted, Broadcasted{<:StaticArrays.StaticArrayStyle}) # fix ambiguity
+  @eval @inline function copyto!(dest::DiffEqBC, bc::$B)
+      axes(dest) == axes(bc) || throwdm(axes(dest), axes(bc))
+      dest′ = dest.x
+      # Performance optimization: broadcast!(identity, dest, A) is equivalent to copyto!(dest, A) if indices match
+      if bc.f === identity && bc.args isa Tuple{AbstractArray} # only a single input argument to broadcast!
+          A = bc.args[1]
+          if axes(dest) == axes(A)
+              return copyto!(dest′, A)
+          end
+      end
+      bcs′ = preprocess(diffeqbc, dest, bc)
+      @simd ivdep for I in eachindex(bcs′)
+          @inbounds dest′[I] = bcs′[I]
+      end
+      return dest′ # return the original array without the wrapper
+  end
 end
 
 # Forcing `broadcasted` to inline is not necessary, since `Vern9` plays well
@@ -79,12 +81,12 @@ macro ..(x)
     expr = Base.Broadcast.__dot__(x)
     if expr.head in (:(.=), :(.+=), :(.-=), :(.*=), :(./=), :(.\=), :(.^=)) # we exclude `÷=` `%=` `&=` `|=` `⊻=` `>>>=` `>>=` `<<=` because they are for integers
       name = gensym()
-      dest = :(DiffEqBase.diffeqbc($(expr.args[1])))
+      dest = :(diffeqbc($(esc(expr.args[1]))))
       expr.args[1] = name
-      return esc(quote
-                  $name = $dest
-                  $expr
-                 end)
+      return quote
+        $(esc(name)) = $dest
+        $(esc(expr))
+      end
     else
       return esc(expr)
     end