From dbb5ea9c26437ac3381f97d8130f3f43a256887b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 18 May 2025 16:09:25 +0200 Subject: [PATCH] ci/eval: remove left-over stats.json This seems to be a left-over from before the performance comparison was changed to a difference-per-chunk analysis. (cherry picked from commit edaf51cb83e3bef31ba33ce7327dfc9ac7f48843) --- ci/eval/default.nix | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/ci/eval/default.nix b/ci/eval/default.nix index d46d0f9a759d..4bd390307152 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -8,7 +8,6 @@ procps, nixVersions, jq, - sta, python3, }: @@ -188,10 +187,7 @@ let rm "$chunkOutputDir"/stats/"$seq_end" fi - # Make sure the glob doesn't break when there's no files - shopt -s nullglob cat "$chunkOutputDir"/result/* > $out/paths - cat "$chunkOutputDir"/stats/* > $out/stats.jsonstream ''; combine = @@ -202,7 +198,6 @@ let { nativeBuildInputs = [ jq - sta ]; } '' @@ -225,39 +220,6 @@ let ) | from_entries ' > $out/outpaths.json - # Computes min, mean, error, etc. for a list of values and outputs a JSON from that - statistics() { - local stat=$1 - sta --transpose | - jq --raw-input --argjson stat "$stat" -n ' - [ - inputs | - split("\t") | - { key: .[0], value: (.[1] | fromjson) } - ] | - from_entries | - { - key: ($stat | join(".")), - value: . - }' - } - - # Gets all available number stats (without .sizes because those are constant and not interesting) - readarray -t stats < <(jq -cs '.[0] | del(.sizes) | paths(type == "number")' ${resultsDir}/*/stats.jsonstream) - - # Combines the statistics from all evaluations - { - echo "{ \"key\": \"minAvailMemory\", \"value\": $(cat ${resultsDir}/*/min-avail-memory | sta --brief --min) }" - echo "{ \"key\": \"minFreeSwap\", \"value\": $(cat ${resultsDir}/*/min-free-swap | sta --brief --min) }" - cat ${resultsDir}/*/total-time | statistics '["totalTime"]' - for stat in "''${stats[@]}"; do - cat ${resultsDir}/*/stats.jsonstream | - jq --argjson stat "$stat" 'getpath($stat)' | - statistics "$stat" - done - } | - jq -s from_entries > $out/stats.json - mkdir -p $out/stats for d in ${resultsDir}/*; do