From 49da72c687ca87ebd8225a39e8e8bccee6ce8f14 Mon Sep 17 00:00:00 2001 From: Samuel Brand Date: Mon, 11 Nov 2024 15:37:06 +0000 Subject: [PATCH 1/6] patch to fork of benchmarkCI --- .github/workflows/benchmark.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 04802aabd..79b6f1e2e 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -22,6 +22,8 @@ jobs: run: | julia --project=benchmark -e 'using Pkg; Pkg.rm("EpiAware"); + Pkg.rm("BenchmarkCI"); + Pkg.add(url="https://github.com/SamuelBrand1/BenchmarkCI.jl"); Pkg.resolve(); Pkg.instantiate(); Pkg.develop(path = "./EpiAware")' From f4d77727ef00d2f6043718db435e902dd7da6609 Mon Sep 17 00:00:00 2001 From: Samuel Brand Date: Mon, 11 Nov 2024 16:30:33 +0000 Subject: [PATCH 2/6] put fork version of BenchmarkCI in [sources] --- .github/workflows/benchmark.yaml | 2 -- benchmark/Project.toml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 79b6f1e2e..04802aabd 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -22,8 +22,6 @@ jobs: run: | julia --project=benchmark -e 'using Pkg; Pkg.rm("EpiAware"); - Pkg.rm("BenchmarkCI"); - Pkg.add(url="https://github.com/SamuelBrand1/BenchmarkCI.jl"); Pkg.resolve(); Pkg.instantiate(); Pkg.develop(path = "./EpiAware")' diff --git a/benchmark/Project.toml b/benchmark/Project.toml index 88dcf30da..0a7185881 100644 --- a/benchmark/Project.toml +++ b/benchmark/Project.toml @@ -7,3 +7,6 @@ EpiAware = "b2eeebe4-5992-4301-9193-7ebc9f62c855" PkgBenchmark = "32113eaa-f34f-5b0d-bd6c-c81e245fc73d" Turing = "fce5fe82-541a-59a6-adf8-730c64b5f9a0" TuringBenchmarking = "0db1332d-5c25-4deb-809f-459bc696f94f" + +[sources] +BenchmarkCI = {url = "https://github.com/SamuelBrand1/BenchmarkCI.jl"} From 67701229bf54045976be9e53bce9975e6d7cc14b Mon Sep 17 00:00:00 2001 From: Samuel Brand Date: Mon, 11 Nov 2024 16:40:18 +0000 Subject: [PATCH 3/6] swap order --- .github/workflows/benchmark.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 04802aabd..a77eb3978 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -21,8 +21,8 @@ jobs: - name: Install dependencies run: | julia --project=benchmark -e 'using Pkg; - Pkg.rm("EpiAware"); Pkg.resolve(); + Pkg.rm("EpiAware"); Pkg.instantiate(); Pkg.develop(path = "./EpiAware")' - name: Run benchmarks From dc0dd79f824b2cd8467534df8eb2726c2398197b Mon Sep 17 00:00:00 2001 From: Samuel Brand Date: Mon, 11 Nov 2024 16:44:19 +0000 Subject: [PATCH 4/6] add EpiAware [source] --- .github/workflows/benchmark.yaml | 4 +--- benchmark/Project.toml | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index a77eb3978..b15540d4a 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -22,9 +22,7 @@ jobs: run: | julia --project=benchmark -e 'using Pkg; Pkg.resolve(); - Pkg.rm("EpiAware"); - Pkg.instantiate(); - Pkg.develop(path = "./EpiAware")' + Pkg.instantiate()' - name: Run benchmarks run: julia --project=benchmark -e 'using BenchmarkCI; BenchmarkCI.judge(; baseline = "origin/main", retune = true)' - name: Post results diff --git a/benchmark/Project.toml b/benchmark/Project.toml index 0a7185881..4ab843b4f 100644 --- a/benchmark/Project.toml +++ b/benchmark/Project.toml @@ -10,3 +10,4 @@ TuringBenchmarking = "0db1332d-5c25-4deb-809f-459bc696f94f" [sources] BenchmarkCI = {url = "https://github.com/SamuelBrand1/BenchmarkCI.jl"} +EpiAware = {path = "./EpiAware"} From 551498c7ad8e35a060830257b375855abe006a4a Mon Sep 17 00:00:00 2001 From: Samuel Brand Date: Mon, 11 Nov 2024 16:53:29 +0000 Subject: [PATCH 5/6] fix path --- benchmark/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmark/Project.toml b/benchmark/Project.toml index 4ab843b4f..859bd9c6f 100644 --- a/benchmark/Project.toml +++ b/benchmark/Project.toml @@ -10,4 +10,4 @@ TuringBenchmarking = "0db1332d-5c25-4deb-809f-459bc696f94f" [sources] BenchmarkCI = {url = "https://github.com/SamuelBrand1/BenchmarkCI.jl"} -EpiAware = {path = "./EpiAware"} +EpiAware = {path = "../EpiAware"} From adf5c3f1f5d3f60a4192adc2f09978f020344688 Mon Sep 17 00:00:00 2001 From: Samuel Brand Date: Mon, 11 Nov 2024 16:59:29 +0000 Subject: [PATCH 6/6] rm benchmarkCI from project --- .github/workflows/benchmark.yaml | 5 ++++- benchmark/Project.toml | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index b15540d4a..a427578f1 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -21,8 +21,11 @@ jobs: - name: Install dependencies run: | julia --project=benchmark -e 'using Pkg; + Pkg.rm("EpiAware"); + Pkg.add(url="https://github.com/SamuelBrand1/BenchmarkCI.jl"); Pkg.resolve(); - Pkg.instantiate()' + Pkg.instantiate(); + Pkg.develop(path = "./EpiAware")' - name: Run benchmarks run: julia --project=benchmark -e 'using BenchmarkCI; BenchmarkCI.judge(; baseline = "origin/main", retune = true)' - name: Post results diff --git a/benchmark/Project.toml b/benchmark/Project.toml index 859bd9c6f..13be17133 100644 --- a/benchmark/Project.toml +++ b/benchmark/Project.toml @@ -1,5 +1,4 @@ [deps] -BenchmarkCI = "20533458-34a3-403d-a444-e18f38190b5b" BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" DynamicPPL = "366bfd00-2699-11ea-058f-f148b4cae6d8" @@ -7,7 +6,3 @@ EpiAware = "b2eeebe4-5992-4301-9193-7ebc9f62c855" PkgBenchmark = "32113eaa-f34f-5b0d-bd6c-c81e245fc73d" Turing = "fce5fe82-541a-59a6-adf8-730c64b5f9a0" TuringBenchmarking = "0db1332d-5c25-4deb-809f-459bc696f94f" - -[sources] -BenchmarkCI = {url = "https://github.com/SamuelBrand1/BenchmarkCI.jl"} -EpiAware = {path = "../EpiAware"}