chore: benchmark fixes (#2033)

disorderedmaterials · Jan 9, 2025 · 0c99832 · 0c99832
1 parent 0305b20
commit 0c99832
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -48,8 +48,8 @@ jobs:
           export LD_LIBRARY_PATH=`pwd`/build/onetbb/lib
 
           nix build -L .#benchmarks
-
-          nix run .#benchmarks > all_benchmark_results.json
+          rm result
+          nix run -L .#benchmarks > all_benchmark_results.json
 
           cat all_benchmark_results.json
       - name: Store benchmark result

diff --git a/flake.nix b/flake.nix
@@ -71,7 +71,10 @@
           pkgs.stdenv.mkDerivation ({
             inherit version;
             pname = exe-name mpi gui;
-            src = ./.;
+            src = builtins.path {
+              path = ./.;
+              name = "dissolve-src";
+            };
             buildInputs = base_libs pkgs ++ pkgs.lib.optional mpi pkgs.openmpi
               ++ pkgs.lib.optionals gui (gui_libs system pkgs)
               ++ pkgs.lib.optionals checks (check_libs pkgs)
@@ -208,6 +211,7 @@
               for bm in ${self.packages.${system}.benchmarks}/bin/benchmark_*
               do
                 export BENCHNAME=$(basename ${"$"}{bm})_result.json
+                >&2 echo Running ${"$"}{BENCHNAME}
                 ${"$"}{bm} --benchmark_format=json > $TMP/${"$"}{BENCHNAME}
               done
               ${pkgs.jq}/bin/jq -s '[.[] | to_entries] | flatten | reduce .[] as $dot ({}; .[$dot.key] += $dot.value)' $TMP/benchmark_*.json > $TMP/all_benchmark_results.json