Allow running of external models in same working directory (#100)

* Extract datetime as keyword

* Run external models in the same workdir

This allows to reuse files or pass output files from one model to the
next as input.

* Reenable tests

* Fix permissions of unix solver

* Add second solver for Mac

* Update mac test solver

* Update mac binary

* Update squared-mac file 2

---------

Co-authored-by: andrea perin <andrea.perin@irz.uni-hannover.de>

Author: FriesischScott

src/models/externalmodel.jl

@@ -24,9 +24,11 @@ struct ExternalModel <: UQModel
     end
 end
 
-function evaluate!(m::ExternalModel, df::DataFrame)
-    datetime = Dates.format(now(), "YYYY-mm-dd-HH-MM-SS")
-
+function evaluate!(
+    m::ExternalModel,
+    df::DataFrame;
+    datetime::String=Dates.format(now(), "YYYY-mm-dd-HH-MM-SS"),
+)
     n = size(df, 1)
     digits = ndigits(n)
 

src/models/model.jl

@@ -26,9 +26,15 @@ function evaluate!(m::ParallelModel, df::DataFrame)
     return nothing
 end
 
-function evaluate!(models::Vector{T} where {T<:UQModel}, df::DataFrame)
+function evaluate!(models::Vector{<:UQModel}, df::DataFrame)
+    # use same working directory for all external models
+    datetime = Dates.format(now(), "YYYY-mm-dd-HH-MM-SS")
     for m in models
-        evaluate!(m, df)
+        if isa(m, ExternalModel)
+            evaluate!(m, df; datetime=datetime)
+        else
+            evaluate!(m, df)
+        end
     end
     return nothing
 end

test/models/externalmodel.jl

@@ -5,7 +5,7 @@
 
     numberformats = Dict(:x => FormatSpec(".8e"), :* => FormatSpec(".8e"))
 
-    r = Extractor(
+    radius = Extractor(
         base -> begin
             map(x -> parse(Float64, x), readlines(joinpath(base, "out.txt")))[1]
         end, :r
@@ -20,7 +20,7 @@
         binary = joinpath(pwd(), "solvers/bin/radius")
     end
 
-    opensees = Solver(binary, "", "in.txt")
+    solver = Solver(binary, "", "in.txt")
 
     open(joinpath(sourcedir, "in.txt"), "w") do input
         println(input, "{{{ :x }}}")
@@ -30,7 +30,7 @@
     x = RandomVariable(Uniform(0, 1), :x)
     y = RandomVariable(Uniform(0, 1), :y)
 
-    df = sample([x, y], 1)
+    df = sample([x, y], 5)
 
     @testset "No Cleanup" begin
         ext = ExternalModel(
@@ -39,13 +39,13 @@
             extrafiles,
             numberformats,
             tempname(),
-            [r],
-            opensees,
+            [radius],
+            solver,
             false,
         )
         evaluate!(ext, df)
-        @test length(readdir(readdir(ext.workdir; join=true)[1])) != 0
-        @test isapprox(df.r, sqrt.(df.x .^ 2 + df.y .^ 2))
+        @test length(readdir(readdir(ext.workdir; join=true)[1])) == 5
+        @test isapprox(df.r, sqrt.(df.x .^ 2 .+ df.y .^ 2))
     end
 
     @testset "Cleanup" begin
@@ -55,12 +55,59 @@
             extrafiles,
             numberformats,
             tempname(),
-            [r],
-            opensees,
+            [radius],
+            solver,
             true,
         )
         evaluate!(ext, df)
         @test length(readdir(readdir(ext.workdir; join=true)[1])) == 0
         @test isapprox(df.r, sqrt.(df.x .^ 2 + df.y .^ 2))
     end
+
+    @testset "Reuse model output" begin
+        binary2 = ""
+        if Sys.iswindows()
+            binary2 = joinpath(pwd(), "solvers/bin/squared.exe")
+        elseif Sys.isapple()
+            binary2 = joinpath(pwd(), "solvers/bin/squared-mac")
+        else
+            binary2 = joinpath(pwd(), "solvers/bin/squared")
+        end
+
+        solver2 = Solver(binary2, "", "out.txt")
+
+        workdir = tempname()
+
+        ext1 = ExternalModel(
+            sourcedir,
+            sourcefiles,
+            extrafiles,
+            numberformats,
+            workdir,
+            [radius],
+            solver,
+            false,
+        )
+
+        squared = Extractor(
+            base -> begin
+                map(x -> parse(Float64, x), readlines(joinpath(base, "out-squared.txt")))[1]
+            end,
+            :r2,
+        )
+
+        ext2 = ExternalModel(
+            "",
+            String[],
+            extrafiles,
+            Dict{Symbol,FormatSpec}(),
+            workdir,
+            [squared],
+            solver2,
+            true,
+        )
+
+        evaluate!([ext1, ext2], df)
+        @test df.r2 ≈ df.x .^ 2 + df.y .^ 2
+    end
 end

test/solvers/bin/squared

@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <math.h>
+
+int main(int argc, char *argv[])
+{
+    FILE *input = fopen(argv[1], "r");
+
+    double x;
+
+    fscanf(input, "%lf", &x);
+
+    fclose(input);
+
+    double y = pow(x, 2);
+
+    FILE *output = fopen("out-squared.txt", "w");
+
+    fprintf(output, "%.16f", y);
+
+    fclose(output);
+
+    return 0;
+}