Skip to content

Commit

Permalink
Make parallel_pipelines the default
Browse files Browse the repository at this point in the history
  • Loading branch information
angelhof committed Dec 8, 2023
1 parent 38c5cb4 commit 832db28
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
12 changes: 9 additions & 3 deletions compiler/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,13 @@ def add_common_arguments(parser):
)
parser.add_argument(
"--parallel_pipelines",
help="Run multiple pipelines in parallel if they are safe to run",
help="(obsolete) Run multiple pipelines in parallel if they are safe to run. Now true by default. See --no_parallel_pipelines.",
action="store_true",
default=True,
)
parser.add_argument(
"--no_parallel_pipelines",
help="Disable parallel running of independent pipelines",
action="store_true",
default=False,
)
Expand Down Expand Up @@ -301,8 +307,8 @@ def pass_common_arguments(pash_arguments):
arguments.append("--distributed_exec")
if pash_arguments.speculative:
arguments.append("--speculative")
if pash_arguments.parallel_pipelines:
arguments.append("--parallel_pipelines")
if pash_arguments.no_parallel_pipelines:
arguments.append("--no_parallel_pipelines")
if pash_arguments.daemon_communicates_through_unix_pipes:
arguments.append("--daemon_communicates_through_unix_pipes")
arguments.append("--r_split_batch_size")
Expand Down
6 changes: 3 additions & 3 deletions compiler/orchestrator_runtime/pash_init_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export pash_checking_log_file=0
export pash_checking_debug_level=0
export pash_avoid_pash_runtime_completion_flag=0
export pash_profile_driven_flag=1
export pash_parallel_pipelines=0
export pash_no_parallel_pipelines=0
export pash_daemon_communicates_through_unix_pipes_flag=0
export pash_speculative_flag=0
export show_version=0
Expand Down Expand Up @@ -67,8 +67,8 @@ do
pash_checking_debug_level=1
fi

if [ "--parallel_pipelines" == "$item" ]; then
export pash_parallel_pipelines=1
if [ "--no_parallel_pipelines" == "$item" ]; then
export pash_no_parallel_pipelines=1
fi

if [ "--daemon_communicates_through_unix_pipes" == "$item" ]; then
Expand Down
4 changes: 2 additions & 2 deletions compiler/pash_runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ else
pash_redir_output echo "$$: (2) Traps set: $traps_set"
# Don't fork if compilation failed. The script might have effects on the shell state.
if [ "$pash_runtime_return_code" -ne 0 ] ||
## If parallel pipelines is not enabled we shouldn't fork
[ "$pash_parallel_pipelines" -eq 0 ] ||
## If parallel pipelines is disabled using a flag we shouldn't fork
[ "$pash_no_parallel_pipelines" -eq 1 ] ||
## If parallel pipelines is explicitly disabled (e.g., due to context), no forking
[ "$pash_disable_parallel_pipelines" -eq 1 ] ||
## If traps are set, no forking
Expand Down
2 changes: 1 addition & 1 deletion evaluation/tests/interface_tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export PASH_TOP=${PASH_TOP:-$(git rev-parse --show-toplevel --show-superproject-
# time: print real in seconds, to simplify parsing

bash="bash"
pash="$PASH_TOP/pa.sh --parallel_pipelines --profile_driven"
pash="$PASH_TOP/pa.sh --profile_driven"

output_dir="$PASH_TOP/evaluation/tests/interface_tests/output"
rm -rf "$output_dir"
Expand Down
5 changes: 2 additions & 3 deletions evaluation/tests/test_evaluation_scripts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,11 @@ n_inputs=(

if [ "$EXPERIMENTAL" -eq 1 ]; then
configurations=(
# "" # Commenting this out since the tests take a lot of time to finish
"--parallel_pipelines"
""
)
else
configurations=(
"--parallel_pipelines --profile_driven"
"--profile_driven"
)
fi

Expand Down

0 comments on commit 832db28

Please sign in to comment.