From 865f814773c0f41072608f27d53c8ab939722088 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Tue, 25 Nov 2025 17:54:51 +0100 Subject: [PATCH 1/2] Fix path in pre-compile script --- TestBaseModelica/precompile_skript.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestBaseModelica/precompile_skript.jl b/TestBaseModelica/precompile_skript.jl index d694fa3..520d5ac 100644 --- a/TestBaseModelica/precompile_skript.jl +++ b/TestBaseModelica/precompile_skript.jl @@ -4,7 +4,7 @@ using TestBaseModelica examples = [ (splitext(basename(file))[1], file) for file in filter( f -> endswith(f, ".bmo"), - readdir(joinpath("examples"), join=true) + readdir(joinpath(@__DIR__, "examples"), join=true) ) ] From 608b1ae30c212156f67408528464633411eab002 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Wed, 26 Nov 2025 12:53:56 +0100 Subject: [PATCH 2/2] BaeModelica.jl disable sys-image --- .CI/Jenkinsfile | 2 +- TestBaseModelica/Manifest.toml | 85 +++++++++++++++------------------- basemodelica.py | 4 +- testmodel.py | 12 ++++- 4 files changed, 50 insertions(+), 53 deletions(-) diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile index e983fd0..2b43ffe 100644 --- a/.CI/Jenkinsfile +++ b/.CI/Jenkinsfile @@ -718,7 +718,7 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om sh """ julia --project=TestBaseModelica -e 'import Pkg; Pkg.build(verbose=true); Pkg.precompile()' """ - JULIA_TESTTING_FLAG="--basemodelica-mtk-import" + JULIA_TESTTING_FLAG="--basemodelica-mtk-import --no-julia-sys-image" } OMCPATH = "${omcompiler ? '../' : './'}OMCompiler" diff --git a/TestBaseModelica/Manifest.toml b/TestBaseModelica/Manifest.toml index cc459d1..0a184bf 100644 --- a/TestBaseModelica/Manifest.toml +++ b/TestBaseModelica/Manifest.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.12.2" +julia_version = "1.11.7" manifest_format = "2.0" -project_hash = "ff02b4387029154838b392dfec68ad8bb41640a1" +project_hash = "25e7a480ef4d37391d5758c9e976208fa64c525f" [[deps.ADTypes]] git-tree-sha1 = "8be2ae325471fc20b11c27bb34b518541d07dd3a" @@ -246,7 +246,7 @@ weakdeps = ["Dates", "LinearAlgebra"] [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "1.3.0+1" +version = "1.1.1+0" [[deps.CompositeTypes]] git-tree-sha1 = "bce26c3dab336582805503bed209faab1c279768" @@ -501,7 +501,7 @@ version = "0.7.16" [[deps.Downloads]] deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" -version = "1.7.0" +version = "1.6.0" [[deps.DynamicPolynomials]] deps = ["Future", "LinearAlgebra", "MultivariatePolynomials", "MutableArithmetics", "Reexport", "Test"] @@ -839,11 +839,6 @@ git-tree-sha1 = "937da4713526b96ac9a178e2035019d3b78ead4a" uuid = "70703baa-626e-46a2-a12c-08ffd08c73b4" version = "0.4.10" -[[deps.JuliaSyntaxHighlighting]] -deps = ["StyledStrings"] -uuid = "ac6e5ff7-fb65-4e79-a425-ec3bc9c03011" -version = "1.12.0" - [[deps.JumpProcesses]] deps = ["ArrayInterface", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "DocStringExtensions", "FunctionWrappers", "Graphs", "LinearAlgebra", "PoissonRandom", "Random", "RecursiveArrayTools", "Reexport", "SciMLBase", "Setfield", "StaticArrays", "SymbolicIndexingInterface", "UnPack"] git-tree-sha1 = "746d3ac930339ca8a37590892c98493fba89e9d3" @@ -895,9 +890,9 @@ version = "0.1.17" [[deps.LazyArrays]] deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "MacroTools", "SparseArrays"] -git-tree-sha1 = "0f68899e54e5e98cff674bbe6380bcf89f603787" +git-tree-sha1 = "af3b88d1f2602712d0039ae6e5b610a4bbd959a1" uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02" -version = "2.9.1" +version = "2.9.2" [deps.LazyArrays.extensions] LazyArraysBandedMatricesExt = "BandedMatrices" @@ -922,24 +917,24 @@ uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" version = "0.6.4" [[deps.LibCURL_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.15.0+0" +version = "8.6.0+0" [[deps.LibGit2]] -deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"] +deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" version = "1.11.0" [[deps.LibGit2_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll"] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.9.0+0" +version = "1.7.2+0" [[deps.LibSSH2_jll]] -deps = ["Artifacts", "Libdl", "OpenSSL_jll"] +deps = ["Artifacts", "Libdl", "MbedTLS_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" -version = "1.11.3+1" +version = "1.11.0+1" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -964,7 +959,7 @@ version = "7.4.1" [[deps.LinearAlgebra]] deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -version = "1.12.0" +version = "1.11.0" [[deps.LinearSolve]] deps = ["ArrayInterface", "ChainRulesCore", "ConcreteStructs", "DocStringExtensions", "EnumX", "GPUArraysCore", "InteractiveUtils", "Krylov", "LazyArrays", "Libdl", "LinearAlgebra", "MKL_jll", "Markdown", "OpenBLAS_jll", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLLogging", "SciMLOperators", "Setfield", "StaticArraysCore", "UnPack"] @@ -1069,7 +1064,7 @@ uuid = "d125e4d3-2237-4719-b19c-fa641b8a4667" version = "0.1.8" [[deps.Markdown]] -deps = ["Base64", "JuliaSyntaxHighlighting", "StyledStrings"] +deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" version = "1.11.0" @@ -1083,6 +1078,11 @@ weakdeps = ["SparseArrays"] [deps.MaybeInplace.extensions] MaybeInplaceSparseArraysExt = "SparseArrays" +[[deps.MbedTLS_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" +version = "2.28.6+0" + [[deps.MicroMamba]] deps = ["Pkg", "Scratch", "micromamba_jll"] git-tree-sha1 = "011cab361eae7bcd7d278f0a7a00ff9c69000c51" @@ -1101,9 +1101,9 @@ version = "1.11.0" [[deps.ModelingToolkit]] deps = ["ADTypes", "AbstractTrees", "ArrayInterface", "BlockArrays", "ChainRulesCore", "Combinatorics", "CommonSolve", "Compat", "ConstructionBase", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "DiffEqNoiseProcess", "DiffRules", "DifferentiationInterface", "Distributed", "Distributions", "DocStringExtensions", "DomainSets", "DynamicQuantities", "EnumX", "ExprTools", "FillArrays", "FindFirstFunctions", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "Graphs", "ImplicitDiscreteSolve", "InteractiveUtils", "JuliaFormatter", "JumpProcesses", "Latexify", "Libdl", "LinearAlgebra", "MLStyle", "Moshi", "NaNMath", "OffsetArrays", "OrderedCollections", "OrdinaryDiffEqCore", "PreallocationTools", "PrecompileTools", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SCCNonlinearSolve", "SciMLBase", "SciMLPublic", "SciMLStructures", "Serialization", "Setfield", "SimpleNonlinearSolve", "SparseArrays", "SpecialFunctions", "StaticArrays", "SymbolicIndexingInterface", "SymbolicUtils", "Symbolics", "URIs", "UnPack", "Unitful"] -git-tree-sha1 = "ea3a5c734abae9de7f892e1f63f1549e7d1a7179" +git-tree-sha1 = "179338bcf2475961651552e00090014bb750c858" uuid = "961ee093-0014-501f-94e3-6117800e7a78" -version = "10.29.0" +version = "10.30.0" [deps.ModelingToolkit.extensions] MTKBifurcationKitExt = "BifurcationKit" @@ -1131,7 +1131,7 @@ version = "0.3.7" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -version = "2025.5.20" +version = "2023.12.12" [[deps.MuladdMacro]] git-tree-sha1 = "cac9cc5499c25554cba55cd3c30543cff5ca4fab" @@ -1168,7 +1168,7 @@ version = "1.1.3" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" -version = "1.3.0" +version = "1.2.0" [[deps.NonlinearSolve]] deps = ["ADTypes", "ArrayInterface", "BracketingNonlinearSolve", "CommonSolve", "ConcreteStructs", "DifferentiationInterface", "FastClosures", "FiniteDiff", "ForwardDiff", "LineSearch", "LinearAlgebra", "LinearSolve", "NonlinearSolveBase", "NonlinearSolveFirstOrder", "NonlinearSolveQuasiNewton", "NonlinearSolveSpectralMethods", "PrecompileTools", "Preferences", "Reexport", "SciMLBase", "SimpleNonlinearSolve", "StaticArraysCore", "SymbolicIndexingInterface"] @@ -1273,17 +1273,12 @@ weakdeps = ["Adapt"] [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.29+0" +version = "0.3.27+1" [[deps.OpenLibm_jll]] deps = ["Artifacts", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" -version = "0.8.7+0" - -[[deps.OpenSSL_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.5.4+0" +version = "0.8.5+0" [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] @@ -1543,7 +1538,7 @@ version = "1.3.0" [[deps.Pkg]] deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -version = "1.12.0" +version = "1.11.0" weakdeps = ["REPL"] [deps.Pkg.extensions] @@ -1597,9 +1592,9 @@ version = "0.4.34" [[deps.PrecompileTools]] deps = ["Preferences"] -git-tree-sha1 = "07a921781cab75691315adc645096ed5e370cb77" +git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f" uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a" -version = "1.3.3" +version = "1.2.1" [[deps.Preferences]] deps = ["TOML"] @@ -1656,7 +1651,7 @@ version = "2.11.2" Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9" [[deps.REPL]] -deps = ["InteractiveUtils", "JuliaSyntaxHighlighting", "Markdown", "Sockets", "StyledStrings", "Unicode"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" version = "1.11.0" @@ -1911,7 +1906,7 @@ version = "1.2.2" [[deps.SparseArrays]] deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -version = "1.12.0" +version = "1.11.0" [[deps.SparseMatrixColorings]] deps = ["ADTypes", "DocStringExtensions", "LinearAlgebra", "PrecompileTools", "Random", "SparseArrays"] @@ -2037,7 +2032,7 @@ uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" [[deps.SuiteSparse_jll]] deps = ["Artifacts", "Libdl", "libblastrampoline_jll"] uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "7.8.3+2" +version = "7.7.0+0" [[deps.SymbolicIndexingInterface]] deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"] @@ -2132,12 +2127,6 @@ deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" version = "1.11.0" -[[deps.TestBaseModelica]] -deps = ["BaseModelica", "CSV", "DataFrames", "ModelingToolkit", "SciMLBase"] -path = "." -uuid = "bba3f925-4bbc-4b14-b723-9b95a7c9c63c" -version = "0.1.0" - [[deps.TestItems]] git-tree-sha1 = "42fd9023fef18b9b78c8343a4e2f3813ffbcefcb" uuid = "1c621080-faea-4a02-84b6-bbd5e436b8fe" @@ -2235,12 +2224,12 @@ version = "1.6.1" [[deps.Zlib_jll]] deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.3.1+2" +version = "1.2.13+1" [[deps.libblastrampoline_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" -version = "5.15.0+0" +version = "5.11.0+0" [[deps.micromamba_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"] @@ -2251,7 +2240,7 @@ version = "1.5.12+0" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" -version = "1.64.0+1" +version = "1.59.0+0" [[deps.oneTBB_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"] @@ -2260,9 +2249,9 @@ uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e" version = "2022.0.0+1" [[deps.p7zip_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] +deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" -version = "17.7.0+0" +version = "17.4.0+2" [[deps.pixi_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"] diff --git a/basemodelica.py b/basemodelica.py index a871a1f..74e34f8 100644 --- a/basemodelica.py +++ b/basemodelica.py @@ -1,7 +1,6 @@ import monotonic import os.path import shutil -import subprocess import warnings from omcommon import friendlyStr @@ -35,8 +34,8 @@ def precompile_testbaesmodelica(systemImage: os.PathLike | None = None) -> None: """ start = monotonic.monotonic() - print("Updating Julia package TestBaseModelica") + print("Updating Julia package TestBaseModelica.jl") jl.seval('import Pkg;' 'Pkg.activate();' 'Pkg.add("PackageCompiler");' @@ -46,6 +45,7 @@ def precompile_testbaesmodelica(systemImage: os.PathLike | None = None) -> None: 'Pkg.status();') if systemImage == None: + print("Developing TestBaseModelica.jl") jl.seval('Pkg.activate();' 'Pkg.develop(path="TestBaseModelica");' 'Pkg.precompile("TestBaseModelica")') diff --git a/testmodel.py b/testmodel.py index 4d16ba8..72d25e5 100755 --- a/testmodel.py +++ b/testmodel.py @@ -549,9 +549,17 @@ 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" + # Get correct julia executable / system image if conf["julia-system-image"] != "": - cmd += " --sysimage=%s" % conf["julia-system-image"] + cmd = "julia --sysimage=%s" % conf["julia-system-image"] + else: + try: + from juliacall import CONFIG + cmd = CONFIG["exepath"] + except (ImportError, Exception) as e: + print(e) + cmd = "julia" # Fallback to system Julia + cmd += " %s" % juliaCallFile with open(simFile,"w") as fp: with open(juliaCallFile, "r") as juliaFile: