Merge pull request #10 from JuliaTrustworthyAI/9-bug-cant-use-decisio…

…nthresholdconvergence-object

Project.toml

@@ -1,7 +1,7 @@
 name = "TaijaParallel"
 uuid = "bf1c2c22-5e42-4e78-8b6b-92e6c673eeb0"
 authors = ["Patrick Altmeyer <[email protected]>"]
-version = "1.0.2"
+version = "1.0.3"
 
 [deps]
 CounterfactualExplanations = "2f13d31b-18db-44c1-bc43-ebaf2cff0be0"

src/TaijaParallel.jl

@@ -32,36 +32,47 @@ macro with_parallelizer(parallelizer, expr)
         expr = expr.args[end]
     end
 
+    Meta.show_sexpr(expr)
+    println("")
+
     # Unpack arguments:
     pllr = esc(parallelizer)
     f = esc(expr.args[1])
     args = expr.args[2:end]
 
     # Split args into positional and keyword arguments:
     aargs = []
-    aakws = Pair{Symbol,Any}[]
+    kwargs_names = []
+    kwargs_values = []
     for el in args
         if Meta.isexpr(el, :parameters)
             for kw in el.args
                 k = kw.args[1]      # parameter name
                 v = kw.args[2]      # parameter value
-                v = typeof(v) == QuoteNode ? v.value : v
-                push!(aakws, Pair(k, v))
+                # v = typeof(v) == QuoteNode ? v.value : v
+                push!(kwargs_names, k)
+                push!(kwargs_values, v)
             end
         else
             push!(aargs, el)
         end
     end
 
-    # Escape arguments:
+    # Escape arguments and create a tuple:
     escaped_args = Expr(:tuple, esc.(aargs)...)
+    kwargs_names = tuple(kwargs_names...)
+    sym = QuoteNode.(kwargs_names)
+    kwargs_values = tuple(kwargs_values...)
 
     # Parallelize:
     output = quote
         if !TaijaParallel.parallelizable($f)
             throw(AssertionError("$($f) is not a parallelizable process."))
+        else
+            @info "Parallelizing with $($pllr)"
         end
-        output = TaijaBase.parallelize($pllr, $f, $escaped_args...; $aakws...)
+        escaped_kwargs = $NamedTuple{($(sym...),)}(($(esc.(kwargs_values)...),))
+        output = TaijaBase.parallelize($pllr, $f, $escaped_args...; escaped_kwargs...)
         output
     end
     return output

test/CounterfactualExplanations.jl/threads.jl

@@ -1,4 +1,5 @@
 using CounterfactualExplanations
+using CounterfactualExplanations.Convergence
 using TaijaData
 using TaijaParallel: ThreadsParallelizer, @with_parallelizer
 
@@ -11,6 +12,7 @@ counterfactual_data =
                 data[2],
             )
 M = fit_model(counterfactual_data, :MLP)
+conv = DecisionThresholdConvergence(decision_threshold = 0.95)
 generator = GenericGenerator()
 factual = 1
 target = 2
@@ -19,7 +21,7 @@ xs = select_factual(counterfactual_data, chosen)
 
 parallelizer = ThreadsParallelizer()
 ces = @with_parallelizer parallelizer begin
-    generate_counterfactual(xs, target, counterfactual_data, M, generator)
+    generate_counterfactual(xs, target, counterfactual_data, M, generator; convergence = conv)
 end
 
 @test true