From 80a25104b1c2548223f6304b739412f231aee114 Mon Sep 17 00:00:00 2001 From: Aayush Sabharwal Date: Sat, 7 Jun 2025 11:30:05 +0530 Subject: [PATCH 1/4] ci: fix benchmark script --- benchmark/benchmarks.jl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/benchmark/benchmarks.jl b/benchmark/benchmarks.jl index dc7487b18c..861d7b0722 100644 --- a/benchmark/benchmarks.jl +++ b/benchmark/benchmarks.jl @@ -1,6 +1,8 @@ using ModelingToolkit, BenchmarkTools using ModelingToolkitStandardLibrary -using ModelingToolkitStandardLibrary.Thermal +using ModelingToolkitStandardLibrary.Electrical +using ModelingToolkitStandardLibrary.Mechanical.Rotational +using ModelingToolkitStandardLibrary.Blocks using OrdinaryDiffEqDefault const SUITE = BenchmarkGroup() @@ -51,4 +53,4 @@ tspan = (0.0, 6.0) SUITE["ODEProblem"] = @benchmarkable ODEProblem($model, $u0, $tspan) prob = ODEProblem(model, u0, tspan) -SUITE["init"] = init($prob) +SUITE["init"] = @benchmarkable init($prob) From fea5333cf493a23cac23f5910b35cce5fd894d74 Mon Sep 17 00:00:00 2001 From: Aayush Sabharwal Date: Sat, 7 Jun 2025 11:32:35 +0530 Subject: [PATCH 2/4] ci: don't run tests when benchmarks change --- .github/workflows/Downstream.yml | 1 + .github/workflows/ReleaseTest.yml | 1 + .github/workflows/Tests.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 6d79ee746a..7c536bbead 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -6,6 +6,7 @@ on: pull_request: paths-ignore: - 'docs/**' + - 'benchmark/**' concurrency: # Skip intermediate builds: always, but for the master branch and tags. diff --git a/.github/workflows/ReleaseTest.yml b/.github/workflows/ReleaseTest.yml index f8b592e9d0..a9e1ee1821 100644 --- a/.github/workflows/ReleaseTest.yml +++ b/.github/workflows/ReleaseTest.yml @@ -6,6 +6,7 @@ on: pull_request: paths-ignore: - 'docs/**' + - 'benchmark/**' concurrency: # Skip intermediate builds: always, but for the master branch and tags. diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index a62f7f272d..5b2bca6289 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -13,6 +13,7 @@ on: - master paths-ignore: - 'docs/**' + - 'benchmark/**' concurrency: # Skip intermediate builds: always, but for the master branch. From 5eae6a2c8dfb4b75899dadb4f3e7674c60ecf1e5 Mon Sep 17 00:00:00 2001 From: Aayush Sabharwal Date: Sat, 7 Jun 2025 12:53:08 +0530 Subject: [PATCH 3/4] ci: fix benchmark CI script --- .github/workflows/benchmark.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index c025bf4907..6fa719dcdb 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -22,3 +22,5 @@ jobs: - uses: MilesCranmer/AirspeedVelocity.jl@action-v1 with: julia-version: "${{ matrix.version }}" + script: "benchmark/benchmarks.jl" + extra-pkgs: "ModelingToolkitStandardLibrary,OrdinaryDiffEqDefault" From 70902a6849ab076ca8f5732132a146dea8138527 Mon Sep 17 00:00:00 2001 From: Aayush Sabharwal Date: Sat, 7 Jun 2025 12:55:26 +0530 Subject: [PATCH 4/4] ci: remove redundant `benchmark/Project.toml` --- benchmark/Project.toml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 benchmark/Project.toml diff --git a/benchmark/Project.toml b/benchmark/Project.toml deleted file mode 100644 index 666ceb7abb..0000000000 --- a/benchmark/Project.toml +++ /dev/null @@ -1,3 +0,0 @@ -[deps] -ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739" -OrdinaryDiffEqDefault = "50262376-6c5a-4cf5-baba-aaf4f84d72d7"