From 184857cdd7a84fc3584d61a8affde4240a457cdb Mon Sep 17 00:00:00 2001 From: Erick Lavoie <erick.lavoie@epfl.ch> Date: Fri, 3 Sep 2021 17:34:27 +0200 Subject: [PATCH] Added new experiments for random cliques on CIFAR10 --- .../random-fc/non-iid/experiments.sh | 39 +++++++++++++++++++ .../random-ring/non-iid/experiments.sh | 39 +++++++++++++++++++ .../fully-connected/non-iid/experiments.sh | 35 +++++++++++++++++ results-v2/mnist/1-node-iid/experiments.sh | 2 +- 4 files changed, 114 insertions(+), 1 deletion(-) create mode 100755 results-v2/google-fl/cifar10/d-cliques/random-fc/non-iid/experiments.sh create mode 100755 results-v2/google-fl/cifar10/d-cliques/random-ring/non-iid/experiments.sh create mode 100755 results-v2/google-fl/cifar10/fully-connected/non-iid/experiments.sh diff --git a/results-v2/google-fl/cifar10/d-cliques/random-fc/non-iid/experiments.sh b/results-v2/google-fl/cifar10/d-cliques/random-fc/non-iid/experiments.sh new file mode 100755 index 0000000..74acba6 --- /dev/null +++ b/results-v2/google-fl/cifar10/d-cliques/random-fc/non-iid/experiments.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +# Path to current script +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +TOOLS=$SCRIPT_DIR/../../../../../$(cat $SCRIPT_DIR/../../../../../toolspath); cd $TOOLS + +# Add current working directory to executable namespace +export PATH=$PATH:$TOOLS +# Setup root directory for resolution of imports: +# the path of all local python libraries are relative to this +export PYTHONPATH=$TOOLS + +# Each command outputs the run directory, which is then used +# by the next command to add parameters and generate information +# used by the simulator. For a list of available options for each +# command, run 'export PYTHONPATH=.; <command> --help'. +for MS in 5 10 20; do + setup/meta.py \ + --results-directory $SCRIPT_DIR/all \ + --seed 1 | + setup/dataset.py \ + --name cifar10 | + setup/nodes/google-fl.py \ + --nb-nodes 100 \ + --local-shards 2 \ + --shard-size 200 | + setup/topology/d_cliques/random_cliques.py \ + --interclique fully-connected \ + --max-clique-size $MS | + setup/model/gn_lenet.py | + simulate/algorithm/d_sgd.py \ + --batch-size 20 \ + --learning-momentum 0.9 \ + --learning-rate 0.002 | + simulate/logger.py \ + --accuracy-logging-interval 10\ + --nb-processes 8 | + simulate/run.py \ + --nb-epochs 100; +done diff --git a/results-v2/google-fl/cifar10/d-cliques/random-ring/non-iid/experiments.sh b/results-v2/google-fl/cifar10/d-cliques/random-ring/non-iid/experiments.sh new file mode 100755 index 0000000..7a193cf --- /dev/null +++ b/results-v2/google-fl/cifar10/d-cliques/random-ring/non-iid/experiments.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +# Path to current script +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +TOOLS=$SCRIPT_DIR/../../../../../$(cat $SCRIPT_DIR/../../../../../toolspath); cd $TOOLS + +# Add current working directory to executable namespace +export PATH=$PATH:$TOOLS +# Setup root directory for resolution of imports: +# the path of all local python libraries are relative to this +export PYTHONPATH=$TOOLS + +# Each command outputs the run directory, which is then used +# by the next command to add parameters and generate information +# used by the simulator. For a list of available options for each +# command, run 'export PYTHONPATH=.; <command> --help'. +for MS in 5 10 20; do + setup/meta.py \ + --results-directory $SCRIPT_DIR/all \ + --seed 1 | + setup/dataset.py \ + --name cifar10 | + setup/nodes/google-fl.py \ + --nb-nodes 100 \ + --local-shards 2 \ + --shard-size 200 | + setup/topology/d_cliques/random_cliques.py \ + --interclique ring \ + --max-clique-size $MS | + setup/model/gn_lenet.py | + simulate/algorithm/d_sgd.py \ + --batch-size 20 \ + --learning-momentum 0.9 \ + --learning-rate 0.002 | + simulate/logger.py \ + --accuracy-logging-interval 10\ + --nb-processes 8 | + simulate/run.py \ + --nb-epochs 100; +done diff --git a/results-v2/google-fl/cifar10/fully-connected/non-iid/experiments.sh b/results-v2/google-fl/cifar10/fully-connected/non-iid/experiments.sh new file mode 100755 index 0000000..8b784e9 --- /dev/null +++ b/results-v2/google-fl/cifar10/fully-connected/non-iid/experiments.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash +# Path to current script +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +TOOLS=$SCRIPT_DIR/../../../../$(cat $SCRIPT_DIR/../../../../toolspath); cd $TOOLS + +# Add current working directory to executable namespace +export PATH=$PATH:$TOOLS +# Setup root directory for resolution of imports: +# the path of all local python libraries are relative to this +export PYTHONPATH=$TOOLS + +# Each command outputs the run directory, which is then used +# by the next command to add parameters and generate information +# used by the simulator. For a list of available options for each +# command, run 'export PYTHONPATH=.; <command> --help'. +setup/meta.py \ + --results-directory $SCRIPT_DIR/all \ + --seed 1 | +setup/dataset.py \ + --name cifar10 | +setup/nodes/google-fl.py \ + --nb-nodes 100 \ + --local-shards 2 \ + --shard-size 200 | +setup/topology/fully-connected.py | +setup/model/gn_lenet.py | +simulate/algorithm/d_sgd.py \ + --batch-size 20 \ + --learning-momentum 0.9 \ + --learning-rate 0.002 | +simulate/logger.py \ + --accuracy-logging-interval 10\ + --nb-processes 8 | +simulate/run.py \ + --nb-epochs 100 diff --git a/results-v2/mnist/1-node-iid/experiments.sh b/results-v2/mnist/1-node-iid/experiments.sh index 2e7dd1c..e26c871 100755 --- a/results-v2/mnist/1-node-iid/experiments.sh +++ b/results-v2/mnist/1-node-iid/experiments.sh @@ -18,7 +18,7 @@ setup/meta.py \ --seed 1 | setup/dataset.py \ --name mnist \ - --global-train-ratios 0.802568 0.802568 0.802568 0.802568 0.802568 0.802568 0.802568 0.802568 0.802568 0.802568 | + --train-examples-per-class 4500 4500 4500 4500 4500 4500 4500 4500 4500 4500 | setup/nodes.py \ --nb-nodes 1 \ --local-classes 10 \ -- GitLab