Merge branch 'main' into probprog-hmc

Author: sbrantq

Project.toml

@@ -1,7 +1,7 @@
 name = "Reactant"
 uuid = "3c362404-f566-11ee-1572-e11a4b42c853"
 authors = ["William Moses <wmoses@mit.edu>", "Valentin Churavy <vchuravy@mit.edu>", "Sergio Sánchez Ramírez <sergio.sanchez.ramirez@bsc.es>", "Paul Berg <paul@plutojl.org>", "Avik Pal <avikpal@mit.edu>", "Mosè Giordano <mose@gnu.org>"]
-version = "0.2.176"
+version = "0.2.177"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -105,7 +105,7 @@ PythonCall = "0.9.25"
 Random = "1.10"
 Random123 = "1.7"
 ReactantCore = "0.1.16"
-Reactant_jll = "0.0.258"
+Reactant_jll = "0.0.259"
 ScopedValues = "1.3.0"
 Scratch = "1.2"
 Sockets = "1.10"

deps/ReactantExtra/WORKSPACE

@@ -4,7 +4,7 @@ NSYNC_COMMIT = "82b118aa7ace3132e517e2c467f8732978cf4023"
 
 NSYNC_SHA256 = ""
 
-ENZYMEXLA_COMMIT = "c9ad2b9fadb847b303202e2fc5239516bb7f7a92"
+ENZYMEXLA_COMMIT = "47d57c1cea7b24e210ad75aee6e7c3f93d89ff78"
 
 ENZYMEXLA_SHA256 = ""
 

src/Overlay.jl

@@ -187,7 +187,11 @@ end
 end
 
 @reactant_overlay @noinline function Base.map(f, x::AbstractArray, ys::AbstractArray...)
-    if use_overlayed_version(x) || looped_any(use_overlayed_version, ys)
+    if (
+        use_overlayed_version(x) ||
+        use_overlayed_version(f) ||
+        looped_any(use_overlayed_version, ys)
+    )
         return TracedRArrayOverrides.overloaded_map(f, x, ys...)
     else
         return Base.inferencebarrier(Base.map)(CallWithReactant(f), x, ys...)
@@ -200,6 +204,7 @@ end
     if (
         use_overlayed_version(y) ||
         use_overlayed_version(x) ||
+        use_overlayed_version(f) ||
         looped_any(use_overlayed_version, xs)
     )
         return TracedRArrayOverrides.overloaded_map!(f, y, x, xs...)
@@ -209,15 +214,15 @@ end
 end
 
 @reactant_overlay @noinline function Base._all(f, x::AbstractArray, dims)
-    if use_overlayed_version(x)
+    if use_overlayed_version(x) || use_overlayed_version(f)
         return TracedRArrayOverrides.overloaded_mapreduce(f, &, x; dims)
     else
         return Base.inferencebarrier(Base._all)(CallWithReactant(f), x, dims)
     end
 end
 
 @reactant_overlay @noinline function Base._any(f, x::AbstractArray, dims)
-    if use_overlayed_version(x)
+    if use_overlayed_version(x) || use_overlayed_version(f)
         return TracedRArrayOverrides.overloaded_mapreduce(f, |, x; dims)
     else
         return Base.inferencebarrier(Base._any)(CallWithReactant(f), x, dims)

src/TracedUtils.jl

@@ -15,6 +15,7 @@ using ..Reactant:
     promote_to, # keep this to avoid breaking external code
     broadcast_to_size # keep this to avoid breaking external code
 using ..Ops: @opcall
+using GPUArraysCore: @allowscalar
 using ReactantCore: ReactantCore
 using ReactantCore: MissingTracedValue, is_traced, materialize_traced_array
 
@@ -1086,6 +1087,49 @@ function set!(x, path, tostore; emptypath=false)
     return emptypath && set_paths!(x, ())
 end
 
+function __elem_apply_loop_condition(idx_ref, fn_ref::F, res_ref, args_ref, L_ref) where {F}
+    return idx_ref[] < L_ref[]
+end
+
+function __elem_apply_loop_body(idx_ref, fn_ref::F, res_ref, args_ref, L_ref) where {F}
+    args = args_ref[]
+    fn = fn_ref[]
+    res = res_ref[]
+    idx = idx_ref[] + 1
+
+    scalar_args = [@allowscalar(arg[idx]) for arg in args]
+    @allowscalar res[idx] = fn(scalar_args...)
+
+    idx_ref[] = idx
+    res_ref[] = res
+    return nothing
+end
+
+function elem_apply_via_while_loop(f, args::Vararg{Any,Nargs}) where {Nargs}
+    @assert allequal(size.(args)) "All args must have the same size"
+    L = length(first(args))
+    # flattening the tensors makes the auto-batching pass work nicer
+    flat_args = [ReactantCore.materialize_traced_array(vec(arg)) for arg in args]
+
+    # This wont be a mutating function so we can safely execute it once
+    res_tmp = @allowscalar(f([@allowscalar(arg[1]) for arg in flat_args]...))
+    result = similar(first(flat_args), Reactant.unwrapped_eltype(res_tmp), L)
+
+    ind_var = Ref(0)
+    f_ref = Ref(f)
+    result_ref = Ref(result)
+    args_ref = Ref(flat_args)
+    limit_ref = Ref(L)
+
+    ReactantCore.traced_while(
+        __elem_apply_loop_condition,
+        __elem_apply_loop_body,
+        (ind_var, f_ref, result_ref, args_ref, limit_ref),
+    )
+
+    return ReactantCore.materialize_traced_array(reshape(result, size(first(args))))
+end
+
 function elem_apply(f, args::Vararg{Any,Nargs}) where {Nargs}
     if all(iszero ∘ ndims, args)
         scalar_args = map(args) do arg
@@ -1094,6 +1138,13 @@ function elem_apply(f, args::Vararg{Any,Nargs}) where {Nargs}
         return Reactant.call_with_reactant(f, scalar_args...)
     end
 
+    # we can expand the scope of this later to support cases where the output
+    # doesn't align with `Ops.batch`. For now we just handle cases that would
+    # obviously fail with scalarizing the inputs.
+    if Reactant.use_overlayed_version(f)
+        return elem_apply_via_while_loop(f, args...)
+    end
+
     argprefix::Symbol = gensym("broadcastarg")
     resprefix::Symbol = gensym("broadcastresult")
     resargprefix::Symbol = gensym("broadcastresarg")

test/batching.jl

@@ -100,3 +100,27 @@ end
 
     @test @jit(batch_with_closure(x_ra, y_ra)) ≈ batch_with_closure(x, y)
 end
+
+function map_with_scalar_indexing(i, x, y)
+    c = max(x[i], y[i])
+    return x[i] + y[i] + c
+end
+
+function mctr(f, range, x, y)
+    f2(i) = f(i, x, y)
+    return map(f2, range)
+end
+
+@testset "map with scalar indexing" begin
+    input1 = Reactant.to_rarray(Reactant.TestUtils.construct_test_array(Float32, 10))
+    input2 = Reactant.to_rarray(Reactant.TestUtils.construct_test_array(Float32, 10))
+
+    hlo = @code_hlo optimize = false mctr(map_with_scalar_indexing, 1:8, input1, input2)
+    @test contains(repr(hlo), "stablehlo.while")
+    hlo = @code_hlo optimize = true mctr(map_with_scalar_indexing, 1:8, input1, input2)
+    @test !contains(repr(hlo), "stablehlo.while")
+
+    res_ra = @jit mctr(map_with_scalar_indexing, 1:8, input1, input2)
+    res = mctr(map_with_scalar_indexing, 1:8, Array(input1), Array(input2))
+    @test res_ra ≈ res
+end