Remove parallel support

README.md

@@ -101,12 +101,6 @@ The final result is found in `results/result_adjusted.csv`.
 Directory `results/merges` contains all the merges for each repo.
 Directory `results/merges_tested` contains all the merges that have been tested.
 
-To execute `run_combined.sh` on multiple machines in parallel create a machine address list in `machines.txt` and run:
-
-```bash
-./src/scripts/utils/run_multiple_machines.sh main machines.txt <project_path_on_machine>
-```
-
 #### If `make small-test` fails
 
 If `make small-test` fails in a branch that you wish to merge into the main
@@ -188,7 +182,6 @@ To run style checking run `make style`.
 
     * repo.py -> Contains the Repo class which represents a repo.
 
-    * split_repos.py -> Splits the repos for parallel execution.
 
     * write_head_hashes.py -> Writes the head hashes of all repos to a file.
 
@@ -202,14 +195,6 @@ To run style checking run `make style`.
 
     * merge_tools/ -> Contains all the merge tools scripts.
 
-    * utils/
-
-      * run_remotely.sh -> Runs the full stack on a remote machine.
-
-      * run_multiple_machine.sh -> Runs the full stack on multiple remote machines.
-
-      * diff_statistics.py -> Various diff commands to compare the results of two merges.
-
   * src/main/java/astmergeevaluation/FindMergeCommits.java -> Finds all merge commits in a repo.
 
 * input_data/ -> Input data, which is a list of repositories; see its README.md.

run.sh

@@ -193,16 +193,9 @@ else
         --n_merges "$total_merges"
 fi
 
-echo "run.sh: about to run split_repos.py"
-python3 src/python/split_repos.py \
-    --repos_csv "$OUT_DIR/repos_head_passes.csv" \
-    --machine_id "$machine_id" \
-    --num_machines "$num_machines" \
-    --output_file "$OUT_DIR/local_repos.csv"
-
-echo "run.sh: about to run split_repos.py"
+echo "run.sh: about to run merge_analyzer.py"
 python3 src/python/merge_analyzer.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_sampled/" \
     --output_dir "$OUT_DIR/merges_analyzed/" \
     --n_sampled_merges "$N_MERGES" \