Pre-compile Julia sysimage

Author: AnHeuermann

TestBaseModelica/Manifest.toml

@@ -366,9 +366,9 @@ version = "1.16.0"
 
 [[deps.DataFrames]]
 deps = ["Compat", "DataAPI", "DataStructures", "Future", "InlineStrings", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrecompileTools", "PrettyTables", "Printf", "Random", "Reexport", "SentinelArrays", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"]
-git-tree-sha1 = "a37ac0840a1196cd00317b57e39d6586bf0fd6f6"
+git-tree-sha1 = "c967271c27a95160e30432e011b58f42cd7501b5"
 uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-version = "1.7.1"
+version = "1.8.0"
 
 [[deps.DataStructures]]
 deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
@@ -706,9 +706,9 @@ version = "1.11.0"
 
 [[deps.FillArrays]]
 deps = ["LinearAlgebra"]
-git-tree-sha1 = "6a70198746448456524cb442b8af316927ff3e1a"
+git-tree-sha1 = "173e4d8f14230a7523ae11b9a3fa9edb3e0efd78"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
-version = "1.13.0"
+version = "1.14.0"
 weakdeps = ["PDMats", "SparseArrays", "Statistics"]
 
     [deps.FillArrays.extensions]
@@ -717,9 +717,9 @@ weakdeps = ["PDMats", "SparseArrays", "Statistics"]
     FillArraysStatisticsExt = "Statistics"
 
 [[deps.FindFirstFunctions]]
-git-tree-sha1 = "670e1d9ceaa4a3161d32fe2d2fb2177f8d78b330"
+git-tree-sha1 = "544bdc2902fa966900d354510be775f8668a57bd"
 uuid = "64ca27bc-2ba2-4a57-88aa-44e436879224"
-version = "1.4.1"
+version = "1.4.2"
 
 [[deps.FiniteDiff]]
 deps = ["ArrayInterface", "LinearAlgebra", "Setfield"]
@@ -2077,9 +2077,9 @@ weakdeps = ["PrettyTables"]
 
 [[deps.SymbolicLimits]]
 deps = ["SymbolicUtils"]
-git-tree-sha1 = "fabf4650afe966a2ba646cabd924c3fd43577fc3"
+git-tree-sha1 = "f75c7deb7e11eea72d2c1ea31b24070b713ba061"
 uuid = "19f23fe9-fdab-4a78-91af-e7b7767979c3"
-version = "0.2.2"
+version = "0.2.3"
 
 [[deps.SymbolicUtils]]
 deps = ["AbstractTrees", "ArrayInterface", "Bijections", "ChainRulesCore", "Combinatorics", "ConstructionBase", "DataStructures", "DocStringExtensions", "DynamicPolynomials", "ExproniconLite", "LinearAlgebra", "MultivariatePolynomials", "NaNMath", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArrays", "SymbolicIndexingInterface", "TaskLocalValues", "TermInterface", "TimerOutputs", "Unityper"]

TestBaseModelica/README.md

@@ -27,6 +27,12 @@ To speed up the execution of the test and reduce the TTFP-overhad of Julia there
   julia> create_sysimage(["TestBaseModelica"]; sysimage_path="TestBaseModelica.so", precompile_execution_file="precompile_skript.jl" )
   ```
 
+  ```bash
+  time julia --project=$(pwd) -e 'using TestBaseModelica; solver_settings=SolverSettings(start_time=0.0, stop_time=1.0, interval=0.02, tolerance=1e-6); test_settings=TestSettings(modelname="ExampleFirstOrder", output_directory="ExampleFirstOrder", solver_settings=solver_settings); run_test(joinpath("examples", "ExampleFirstOrder.mo"); settings=test_settings)'
+
+  time julia --sysimage=TestBaseModelica.so -e 'using .TestBaseModelica; solver_settings=SolverSettings(start_time=0.0, stop_time=1.0, interval=0.02, tolerance=1e-6); test_settings=TestSettings(modelname="ExampleFirstOrder", output_directory="ExampleFirstOrder", solver_settings=solver_settings); run_test(joinpath("examples", "ExampleFirstOrder.mo"); settings=test_settings)'
+  ```
+
 2. Keep a Julia daemon running in the background for all tests by using
    [DaemonMode.jl](https://github.com/dmolina/DaemonMode.jl)
 

TestBaseModelica/precompile_skript.jl

@@ -7,11 +7,12 @@ solver_settings = SolverSettings(
   tolerance = 1e-6
 )
 
+output_directory = "tmp_out_dir"
 test_settings = TestSettings(
   modelname = "ExampleFirstOrder",
-  output_directory = "ExampleFirstOrder",
-  solver_settings = solver_settings)
-
-run_test(joinpath("examples", "ExampleFirstOrder.mo"); settings = test_settings)
+  output_directory = output_directory,
+  solver_settings = solver_settings
+)
 
-rm("ExampleFirstOrder", force=true, recursive=true)
+run_test(joinpath(@__DIR__, "examples", "ExampleFirstOrder.mo"); settings = test_settings)
+rm(output_directory, force=true, recursive=true)

basemodelica.py

@@ -1,7 +1,11 @@
+import monotonic
+import os.path
 import subprocess
+
 from juliacall import Main as jl
+from omcommon import friendlyStr
 
-def print_julia_version():
+def print_julia_version() -> None:
 
   julia = None
   try:
@@ -13,10 +17,27 @@ def print_julia_version():
 
   jl.seval("using InteractiveUtils; versioninfo()")
 
-def dev_testbasemodelica_jl():
+def precompile_testbaesmodelica(systemImage: os.path) -> None:
+  """Update and pre-compile TestBaseModelica to `sysimage`.
 
-  jl.seval('import Pkg; Pkg.develop(path="TestBaseModelica")')
+  Update dependencies of TestBaseModelica to get the latest version of
+  BaseModelica.jl from branch main. Create a pre-compile system image of package
+  TestBaseModelica with PackageCompiler.jl. This might take a wile!
+  """
 
-def update_testbasemodelica():
+  start = monotonic.monotonic()
+  print("Updating and pre-compiling Julia package TestBaseModelica. This might take a while, hang tight!")
+  jl.seval('import Pkg;'
+           "Pkg.activate();"
+           'Pkg.add("PackageCompiler");'
+           'using PackageCompiler;'
+           'Pkg.activate("TestBaseModelica");'
+           'Pkg.update();'
+           'Pkg.status();'
+           'create_sysimage(["TestBaseModelica"]; sysimage_path="%s", precompile_execution_file="TestBaseModelica/precompile_skript.jl")'
+           % systemImage)
+  execTime = monotonic.monotonic() - start
+  print("Done pre-compiling in %s." % friendlyStr(execTime))
 
-  jl.seval('import Pkg; Pkg.activate("TestBaseModelica"); Pkg.update(); Pkg.status()')
+  if not os.path.isfile(systemImage):
+    raise FileNotFoundError("Something went wrong, couldn't find %s" % systemImage)

test.py

@@ -314,10 +314,10 @@ def timeSeconds(f):
 sys.stdout.flush()
 
 # Print Julia versions for BaseModelica.jl import
+julia_sysimage = os.path.abspath("TestBaseModelica.so")
 if basemodelica_mtk_import:
   basemodelica.print_julia_version()
-  basemodelica.dev_testbasemodelica_jl()
-  basemodelica.update_testbasemodelica()
+  basemodelica.precompile_testbaesmodelica(julia_sysimage)
 
 try:
   os.unlink("HelloWorld"+exeExt)
@@ -516,6 +516,7 @@ def testHelloWorld(cmd):
   if basemodelica_mtk_import:
     c["basemodelica-export"] = True
     c["basemodelica-mtk-import"] = True
+    c["julia-system-image"] = julia_sysimage
 
 # Create mos-files
 

testmodel.py

@@ -546,7 +546,7 @@ def sendExpressionOldOrNew(cmd):
         fp.write("test_settings = TestSettings(modelname=\"%s\", solver_settings=solver_settings)\n" % (conf["fileName"]))
         fp.write("run_test(\"%s.mo\"; settings = test_settings)\n" % (conf["modelName"]))
 
-      cmd = "julia %s" % juliaCallFile
+      cmd = "julia --sysimage=%s %s" % (conf["julia-system-image"], juliaCallFile)
       with open(simFile,"w") as fp:
         fp.write("%s\n" % (cmd))
       res = checkOutputTimeout(