Skip to content

Commit

Permalink
Remove run_full.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
benedikt-schesch committed Aug 23, 2024
1 parent d7d4caa commit 8493cc5
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
16 changes: 11 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ The output data appears in `results/small/`.
To run the stack on all repos:

```bash
./run_full.sh
./run_combined.sh
```

To run the stack on all repos and also diff the merges' outputs:

```bash
./run_full.sh -d
./run_combined.sh -d
```

This will run the entire code on all the repos and automatically decompress the cache if `cache/` does not exist.
Expand All @@ -97,7 +97,7 @@ The final result is found in `results/result.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_full.sh` on multiple machines in parallel create a machine address list in `machines.txt` and run:
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>
Expand All @@ -112,7 +112,7 @@ in your branch, and investigate the differences.

### Load the stored cache

To decompress the cache run `make decompress-cache`. This is done automatically in `run_full.sh` if `cache/` does not exist.
To decompress the cache run `make decompress-cache`. This is done automatically in `run_combined.sh` if `cache/` does not exist.

### Store the cache

Expand Down Expand Up @@ -144,7 +144,13 @@ To run style checking run `make style`.

* run_small.sh -> This file executes the stack on two repositories.

* run_full.sh -> This file executes the stack on all the repositories.
* run_combined.sh -> This file executes the stack on all the repositories.

* run_greatest_hits.sh -> This file executes the stack on the greatest hits repositories.

* run_reaper.sh -> This file executes the stack on the reaper repositories.

* run_1000.sh -> This file executes the stack on the 1000 repositories.

* src/ -> contains the following scripts:

Expand Down
2 changes: 1 addition & 1 deletion run_1000.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

# usage: ./run_full.sh [-i <machine_id> -n <num_machines>] [-d]
# usage: ./run_1000.sh [-i <machine_id> -n <num_machines>] [-d]
# Runs the stack all the repositories
# The output appears in result/ .
# <machine_id> optional argument to specify the id of the current machine.
Expand Down
4 changes: 2 additions & 2 deletions src/scripts/utils/run_remotely.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ NUM_MACHINES=$4
ROOT_PATH_ON_MACHINE=$5

echo "Running branch $BRANCH on machine $MACHINE_SSH with id $MACHINE_ID out of $NUM_MACHINES machines (ROOT PATH: $ROOT_PATH_ON_MACHINE)"
echo "Executing: ssh -t $MACHINE_SSH \"cd $ROOT_PATH_ON_MACHINE; pwd; killall screen; git checkout $BRANCH; git pull; conda activate AST; make clean-local; screen -m nice -n 10 ./run_full.sh $MACHINE_ID $NUM_MACHINES\""
echo "Executing: ssh -t $MACHINE_SSH \"cd $ROOT_PATH_ON_MACHINE; pwd; killall screen; git checkout $BRANCH; git pull; conda activate AST; make clean-local; screen -m nice -n 10 ./run_combined.sh $MACHINE_ID $NUM_MACHINES\""

# Connect to machine and execute code using a screen session
ssh -t "$MACHINE_SSH" "cd $ROOT_PATH_ON_MACHINE; pwd; killall screen; git checkout $BRANCH; git pull; conda activate AST; make clean-local; screen -m nice -n 10 ./run_full.sh $MACHINE_ID $NUM_MACHINES"
ssh -t "$MACHINE_SSH" "cd $ROOT_PATH_ON_MACHINE; pwd; killall screen; git checkout $BRANCH; git pull; conda activate AST; make clean-local; screen -m nice -n 10 ./run_combined.sh $MACHINE_ID $NUM_MACHINES"

0 comments on commit 8493cc5

Please sign in to comment.