Merge remote-tracking branch 'origin/remove_parallel_support' into fu…

…ll_timing_results
benedikt-schesch · Sep 27, 2024 · ddb5685 · ddb5685
2 parents 5960c32 + d34ba8d
commit ddb5685
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@ venv
 **/*_explanation.txt
 cache-small/
 apache-maven-3.9.2/
-results/local_repos.csv
 machines.txt
 .valid_merges
 cache/

diff --git a/run.sh b/run.sh
@@ -203,15 +203,15 @@ python3 src/python/merge_analyzer.py \
 
 echo "run.sh: about to run merge_tester.py"
 python3 src/python/merge_tester.py \
-    --repos_head_passes_csv "$OUT_DIR/local_repos.csv" \
+    --repos_head_passes_csv "$OUT_DIR/repos_head_passes.csv" \
     --merges_path "$OUT_DIR/merges_analyzed/" \
     --output_dir "$OUT_DIR/merges_tested/" \
     --cache_dir "$CACHE_DIR"
 
 if [ "$no_timing" = false ]; then
     echo "run.sh: about to run merge_runtime_measure.py"
     python3 src/python/merge_runtime_measure.py \
-        --repos_head_passes_csv "$OUT_DIR/local_repos.csv" \
+        --repos_head_passes_csv "$OUT_DIR/repos_head_passes.csv" \
         --merges "$OUT_DIR/merges_tested/" \
         --output_dir "$OUT_DIR/merges_timed/" \
         --n_sampled_timing 1 \