Attempt at activating benchmarks on a dev branch, using PBP and XPalm's own dev branches, see what happens

Author: Samuel-amap

.github/workflows/benchmarks_and_downstream.yml

@@ -2,7 +2,7 @@ name: BenchmarksAndDownstream
 on:
   push:
     branches:
-      - main
+      - dev
       - benchmarks-github-action
     tags: "*"
     workflow-dispatch:
@@ -30,6 +30,7 @@ jobs:
         arch:
           - x64
         package:
+        # the group setting is unused atm
         - {user: VEZY, repo: PlantSimEngine.jl, group: Downstream}
     steps:
       - uses: actions/checkout@v4

test/downstream/Project.toml

@@ -3,7 +3,6 @@ BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 MultiScaleTreeGraph = "dd4a991b-8a45-4075-bede-262ee62d5583"
-PlantBiophysics = "7ae8fcfa-76ad-4ec6-9ea7-5f8f5e2d6ec9"
 PlantMeteo = "4630fe09-e0fb-4da5-a846-781cb73437b6"
 PlantSimEngine = "9a576370-710b-4269-adf9-4f603a9c6423"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

test/downstream/test-all-benchmarks.jl

@@ -37,15 +37,15 @@ suite[suite_name]["PBP_multiple_timesteps_MT"] = @benchmarkable benchmark_plantb
 suite[suite_name]["PBP_multiple_timesteps_ST"] = @benchmarkable benchmark_plantbiophysics_multitimestep_ST($leaf, $meteo)
 
 # "XPalm benchmark" 
-#=include("test-xpalm.jl")
+include("test-xpalm.jl")
 suite[suite_name]["XPalm_setup"] = @benchmarkable xpalm_default_param_create() seconds = 120
 
 palm, models, out_vars, meteo = xpalm_default_param_create()
 sim_outputs = xpalm_default_param_run(palm, models, out_vars, meteo)
 
 suite[suite_name]["XPalm_run"] = @benchmarkable xpalm_default_param_run($palm, $models, $out_vars, $meteo) seconds = 120
 suite[suite_name]["XPalm_convert_outputs"] = @benchmarkable xpalm_default_param_convert_outputs($sim_outputs) seconds = 120
-=#
+
 tune!(suite)
 results = run(suite, verbose=true)
 BenchmarkTools.save(dirname(@__FILE__) * "/output.json", median(results))

test/downstream/test-plantbiophysics.jl

@@ -2,6 +2,9 @@
 #using Pkg
 #Pkg.develop("PlantSimEngine")
 #using PlantSimEngine
+
+using Pkg
+Pkg.add(url="https://github.com/VEZY/PlantBiophysics.jl#dev")
 using Statistics
 #using DataFrames
 #using CSV

test/downstream/test-xpalm.jl

@@ -4,7 +4,7 @@
 
 # no release of XPalm yet, so can't just add it to the .toml
 using Pkg
-Pkg.add(url="https://github.com/PalmStudio/XPalm.jl")
+Pkg.add(url="https://github.com/PalmStudio/XPalm.jl#dev")
 
 using Test
 using PlantMeteo#, MultiScaleTreeGraph
@@ -15,8 +15,8 @@ using XPalm
 using BenchmarkTools
 
 function xpalm_default_param_create()
-    meteo = CSV.read("../XPalm.jl/0-data/Meteo_Nigeria_PR.txt", DataFrame)
-    meteo.duration = [Dates.Day(i[1:1]) for i in meteo.duration]
+    meteo = CSV.read(joinpath(dirname(dirname(pathof(XPalm))),"0-data","meteo.csv"), DataFrame)
+    #meteo.duration = [Dates.Day(i[1:1]) for i in meteo.duration]
     m = Weather(meteo)
 
     out_vars = Dict{String,Any}(
@@ -32,12 +32,12 @@ function xpalm_default_param_create()
     )
 
     # Example 1: Run the model with the default parameters (but output as a DataFrame):
-    palm = Palm(initiation_age=0, parameters=default_parameters())
-    models = model_mapping(palm)
+    palm = XPalm.Palm(initiation_age=0, parameters=XPalm.default_parameters())
+    models = XPalm.model_mapping(palm)
     return palm, models, out_vars, meteo
 end
 
-function xpalm_default_param_run(palm, models, meteo, out_vars)
+function xpalm_default_param_run(palm, models, out_vars, meteo)
     sim_outputs = PlantSimEngine.run!(palm.mtg, models, meteo, tracked_outputs=out_vars, executor=PlantSimEngine.SequentialEx(), check=false)
     return sim_outputs
 end