Skip to content

fix: remove merge conflict markers #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
w1m024 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: remove merge conflict markers #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 1 addition & 56 deletions code/run/exp_cluster/batch_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
for trace in 'Philly_MIX2' # 'Philly_MIX1' 'Helios_MIX2' 'Helios_MIX1'; # 'Helios_MIX2' 'Helios_MIX1' 'Helios_SLO'; # 'Philly_MIX2' 'Philly_SLO' 'Philly_MIX1';
do
obj='adaptive'
Expand Down Expand Up @@ -51,58 +50,4 @@ done
# python main.py --schedule=time-aware --trace=data/exp/trace_job_"$trace".csv --save_log_dir=result/$trace --ident=$trace --placement=consolidate --num_node_p_switch=$num_node_p_switch --name_list=$name_list --check_time_interval=10 &

# bash run/exp_cluster/batch_run.sh
=======
for trace in 'Philly_MIX2' # 'Philly_MIX1' 'Helios_MIX2' 'Helios_MIX1'; # 'Helios_MIX2' 'Helios_MIX1' 'Helios_SLO'; # 'Philly_MIX2' 'Philly_SLO' 'Philly_MIX1';
do
obj='adaptive'
if [[ $trace = 'Helios_SLO' ]]; then
echo $trace
name_list='data/name.lst'
num_node_p_switch=96
lease_term_interval=20
elif [[ $trace = 'Helios_MIX1' ]]; then
num_node_p_switch=96
lease_term_interval=20
name_list='data/name.lst'
elif [[ $trace = 'Helios_MIX2' ]]; then
num_node_p_switch=96
lease_term_interval=20
name_list='data/name.lst'
elif [[ $trace = 'Pri_MIX3' ]]; then
num_node_p_switch=96
lease_term_interval=20
name_list='data/name.lst'
elif [[ $trace = 'Philly_SLO' ]]; then
num_node_p_switch=120
name_list='data/philly/name.lst'
lease_term_interval=20
elif [[ $trace = 'Philly_MIX1' ]]; then
num_node_p_switch=120
lease_term_interval=20
name_list='data/philly/name.lst'
elif [[ $trace = 'Philly_MIX2' ]]; then
num_node_p_switch=120
lease_term_interval=20
name_list='data/philly/name.lst'
fi

echo $num_node_p_switch
echo $name_list
# python main.py --schedule=srtf --trace=data/exp/trace_job_"$trace".csv --save_log_dir=result/$trace --ident=$trace --placement=consolidate --num_node_p_switch=$num_node_p_switch --name_list=$name_list &
# python main.py --schedule=fifo --trace=data/exp/trace_job_$trace.csv --save_log_dir=result/$trace --ident=$trace --placement=consolidate --num_node_p_switch=$num_node_p_switch --name_list=$name_list &
# python main.py --schedule=themis --trace=data/exp/trace_job_$trace.csv --save_log_dir=result/$trace --ident=$trace --placement=consolidate --num_node_p_switch=$num_node_p_switch --name_list=$name_list --check_time_interval=5 &
# python main.py --schedule=dlas --trace=data/exp/trace_job_$trace.csv --save_log_dir=result/$trace --ident=$trace --placement=consolidate --num_node_p_switch=$num_node_p_switch --name_list=$name_list &
# python main.py --schedule=tetri-sched --trace=data/exp/trace_job_$trace.csv --save_log_dir=result/$trace --ident=$trace --lease_term_interval=20 --check_time_interval=5 --placement=random --num_node_p_switch=$num_node_p_switch --name_list=$name_list &
# python main.py --schedule=time-aware --trace=data/exp/trace_job_"$trace".csv --save_log_dir=result/$trace --ident=$trace --placement=consolidate --num_node_p_switch=$num_node_p_switch --name_list=$name_list --check_time_interval=1 &
# python main.py --schedule=genie --trace=data/exp/trace_job_"$trace".csv --save_log_dir=result/$trace --ident=$trace --placement=consolidate --num_node_p_switch=$num_node_p_switch --name_list=$name_list --check_time_interval=5 &
# python main.py --schedule=sigma --trace=data/exp/trace_job_$trace.csv --save_log_dir=result/$trace --ident=$trace --lease_term_interval=15 --check_time_interval=15 --placement=consolidate --num_node_p_switch=$num_node_p_switch --name_list=$name_list &
python main.py --schedule=time-aware-with-lease --trace=data/exp/trace_job_"$trace".csv --save_log_dir=result/$trace --ident=$trace --aggressive=True --mip_objective=$obj --placement=local_search --profile=True --check_time_interval=1 --disable_turn_off=True --num_node_p_switch=$num_node_p_switch --lease_term_interval=$lease_term_interval --name_list=$name_list &
done

# standard
# python main.py --schedule=tetri-sched --trace=data/exp/trace_job_$trace.csv --save_log_dir=result/$trace --ident=$trace --lease_term_interval=15 --check_time_interval=5 --placement=random --num_node_p_switch=$num_node_p_switch --name_list=$name_list &
# python main.py --schedule=time-aware --trace=data/exp/trace_job_"$trace".csv --save_log_dir=result/$trace --ident=$trace --placement=consolidate --num_node_p_switch=$num_node_p_switch --name_list=$name_list --check_time_interval=10 &

# bash run/exp_cluster/batch_run.sh
>>>>>>> 88a20b892eaeeb590fe4bfa1733b3b55605f7d82
# python run/exp_cluster/eval.py --input_file_dir=result --output_file_dir=stats
# python run/exp_cluster/eval.py --input_file_dir=result --output_file_dir=stats