chore: minor cleanup

Author: avik-pal

benchmark/Project.toml

@@ -8,4 +8,4 @@ PrettyTables = "3"
 julia = "1.11"
 
 [workspace]
-projects = ["nn", "misc", "polybench"]
+projects = ["nn", "misc", "polybench", "comrade"]

benchmark/Comrade/CondaPkg.toml benchmark/comrade/CondaPkg.tomlbenchmark/Comrade/CondaPkg.toml renamed to benchmark/comrade/CondaPkg.toml

@@ -26,33 +26,15 @@ VLBIImagePriors = "b1ba175b-8447-452c-b961-7db2d6f7a029"
 VLBILikelihoods = "90db92cd-0007-4c0a-8e51-dbf0782ce592"
 VLBISkyModels = "d6343c73-7174-4e0f-bb64-562643efbeca"
 
-[sources.Comrade]
-rev = "ptiede-reactant"
-url = "https://github.com/ptiede/Comrade.jl"
-
-[sources.ComradeBase]
-rev = "main"
-url = "https://github.com/ptiede/ComradeBase.jl"
-
-[sources.NFFT]
-rev = "ptiede-reactant"
-url = "https://github.com/ptiede/NFFT.jl"
-
-[sources.Reactant]
-path = "../../"
-
-[sources.TransformVariables]
-rev = "ptiede-reactant"
-url = "https://github.com/ptiede/TransformVariables.jl"
-
-[sources.VLBIImagePriors]
-rev = "ptiede-reactantperf"
-url = "https://github.com/ptiede/VLBIImagePriors.jl"
-
-[sources.VLBILikelihoods]
-rev = "ptiede-reactant"
-url = "https://github.com/ptiede/VLBILikelihoods.jl"
-
-[sources.VLBISkyModels]
-rev = "ptiede-reactnfft"
-url = "https://github.com/EHTJulia/VLBISkyModels.jl"
+[sources]
+Comrade = {url = "https://github.com/ptiede/Comrade.jl", rev = "ptiede-reactant"}
+ComradeBase = {url = "https://github.com/ptiede/ComradeBase.jl", rev = "main"}
+NFFT = {url = "https://github.com/ptiede/NFFT.jl", rev = "ptiede-reactant"}
+Reactant = {path = "../.."}
+TransformVariables = {url = "https://github.com/ptiede/TransformVariables.jl", rev = "ptiede-reactant"}
+VLBIImagePriors = {url = "https://github.com/ptiede/VLBIImagePriors.jl", rev = "ptiede-reactantperf"}
+VLBILikelihoods = {url = "https://github.com/ptiede/VLBILikelihoods.jl", rev = "ptiede-reactant"}
+VLBISkyModels = {url = "https://github.com/EHTJulia/VLBISkyModels.jl", rev = "ptiede-reactnfft"}
+
+[compat]
+julia = "1.11"

benchmark/Comrade/Project.toml benchmark/comrade/Project.tomlbenchmark/Comrade/Project.toml renamed to benchmark/comrade/Project.toml

@@ -12,10 +12,7 @@ function gradref(tpostr, xr)
 end
 
 function run_comrade_benchmark!(
-    results::Dict,
-    benchmark_name::String,
-    backend::String,
-    tpostr, 
+    results::Dict, benchmark_name::String, backend::String, tpostr
 )
     # TODO which Enzyme passes do I want to enable and disable
     run_benchmark!(results, benchmark_name, backend, tpostr, "forward", "Default")
@@ -27,11 +24,10 @@ function run_benchmark!(
     results::Dict,
     benchmark_name::String,
     backend::String,
-    tpost, 
+    tpost,
     fwd_or_bwd::String,
-    tag::String
+    tag::String,
 )
-
     if !haskey(results, "TFLOP/s")
         results["TFLOP/s"] = Dict{String,Float64}()
     end
@@ -59,10 +55,7 @@ function run_benchmark!(
         error("Unknown fwd_or_bwd: $(fwd_or_bwd)")
     end
 
-    prof_result = Reactant.Profiler.profile_with_xprof(
-        fn,tpost, x; nrepeat=10, warmup=3
-    )
-
+    prof_result = Reactant.Profiler.profile_with_xprof(fn, tpost, x; nrepeat=10, warmup=3)
 
     results["Runtime (s)"][full_benchmark_name] =
         prof_result.profiling_result.runtime_ns / 1e9
@@ -84,5 +77,3 @@ function run_benchmark!(
     @info print_stmt
     return nothing
 end
-
-

benchmark/Comrade/comimager.jl benchmark/comrade/comimager.jlbenchmark/Comrade/comimager.jl renamed to benchmark/comrade/comimager.jl

@@ -1,35 +1,11 @@
 # Comrade Benchmarks Runner
 # This script runs all Comrade benchmarks and stores results to a JSON file
-
-using Pkg
-
-@static if VERSION ≥ v"1.10-" && VERSION < v"1.11"
-    Pkg.add([
-        PackageSpec(; name="ComradeBase", rev="main"),
-        PackageSpec(; name="Comrade", rev="ptiede-reactant"),
-        PackageSpec(; name="VLBISkyModels", rev="ptiede-reactnfft"),
-        PackageSpec(; name="VLBILikelihoods", rev="ptiede-reactant"),
-        PackageSpec(; name="VLBIImagePriors", rev="ptiede-reactantperf"),
-        PackageSpec(;
-            url="https://github.com/ptiede/TransformVariables.jl", rev="ptiede-reactant"
-        ),
-        PackageSpec(;
-            url="https://github.com/ptiede/NFFT.jl", rev="ptiede-reactant"
-        )
-    ])
-    Pkg.develop(; path=joinpath(@__DIR__, "../../"))
-end
-
-
 # Load dependencies
 using Reactant
 using Chairmarks: @b
 using Random: Random
 using Printf: @sprintf
 
-
-
-using Reactant
 using LinearAlgebra
 using AbstractFFTs
 
@@ -52,6 +28,8 @@ include("common.jl")
 
 @info sprint(io -> versioninfo(io; verbose=true))
 
+backend = get_backend()
+
 include("comimager.jl")
 
 function run_all_benchmarks(backend::String)
@@ -63,7 +41,6 @@ function run_all_benchmarks(backend::String)
     tpostr = build_post(μas2rad(200.0), 64, dataf)
     run_comrade_benchmark!(results, "Comrade EHT Imaging 64 x 64", backend, tpostr)
 
-
     tpostr = build_post(μas2rad(200.0), 128, dataf)
     run_comrade_benchmark!(results, "Comrade EHT Imaging 128 x 128", backend, tpostr)
 
@@ -73,5 +50,6 @@ function run_all_benchmarks(backend::String)
     return results
 end
 
+res = run_all_benchmarks(backend)
 
-res = run_all_benchmarks(get_backend())
+save_results(results, joinpath(@__DIR__, "results"), "comrade", backend)