From 22fccc145d7ceae22108b0b25ae061c8439b6136 Mon Sep 17 00:00:00 2001
From: Erick Lavoie <erick.lavoie@epfl.ch>
Date: Mon, 6 Sep 2021 12:26:50 +0200
Subject: [PATCH] Added missing experiments and --clique-gradient option
---
.../random-fc/non-iid/experiments.sh | 5 ++-
.../random-ring/non-iid/experiments.sh | 5 ++-
.../fully-connected/non-iid/experiments.sh | 2 +-
.../random-fc/non-iid/experiments.sh | 40 +++++++++++++++++++
.../random-ring/non-iid/experiments.sh | 40 +++++++++++++++++++
5 files changed, 87 insertions(+), 5 deletions(-)
create mode 100755 results-v2/google-fl/mnist/d-cliques/random-fc/non-iid/experiments.sh
create mode 100755 results-v2/google-fl/mnist/d-cliques/random-ring/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
index 74acba6..57762a7 100755
--- 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
@@ -30,10 +30,11 @@ for MS in 5 10 20; do
simulate/algorithm/d_sgd.py \
--batch-size 20 \
--learning-momentum 0.9 \
- --learning-rate 0.002 |
+ --learning-rate 0.002 \
+ --clique-gradient |
simulate/logger.py \
--accuracy-logging-interval 10\
- --nb-processes 8 |
+ --nb-processes 4 |
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
index 7a193cf..43f7d46 100755
--- 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
@@ -30,10 +30,11 @@ for MS in 5 10 20; do
simulate/algorithm/d_sgd.py \
--batch-size 20 \
--learning-momentum 0.9 \
- --learning-rate 0.002 |
+ --learning-rate 0.002 \
+ --clique-gradient |
simulate/logger.py \
--accuracy-logging-interval 10\
- --nb-processes 8 |
+ --nb-processes 4 |
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
index 8b784e9..e67f375 100755
--- a/results-v2/google-fl/cifar10/fully-connected/non-iid/experiments.sh
+++ b/results-v2/google-fl/cifar10/fully-connected/non-iid/experiments.sh
@@ -30,6 +30,6 @@ simulate/algorithm/d_sgd.py \
--learning-rate 0.002 |
simulate/logger.py \
--accuracy-logging-interval 10\
- --nb-processes 8 |
+ --nb-processes 4 |
simulate/run.py \
--nb-epochs 100
diff --git a/results-v2/google-fl/mnist/d-cliques/random-fc/non-iid/experiments.sh b/results-v2/google-fl/mnist/d-cliques/random-fc/non-iid/experiments.sh
new file mode 100755
index 0000000..9577105
--- /dev/null
+++ b/results-v2/google-fl/mnist/d-cliques/random-fc/non-iid/experiments.sh
@@ -0,0 +1,40 @@
+#!/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 mnist |
+ setup/nodes/google-fl.py \
+ --nb-nodes 100 \
+ --local-shards 2 \
+ --shard-size 250 |
+ setup/topology/d_cliques/random-cliques.py \
+ --interclique fully-connected \
+ --max-clique-size $MS |
+ setup/model/linear.py |
+ simulate/algorithm/d_sgd.py \
+ --batch-size 125 \
+ --learning-momentum 0.0 \
+ --learning-rate 0.1 \
+ --clique-gradient |
+ simulate/logger.py \
+ --accuracy-logging-interval 10\
+ --nb-processes 2 |
+ simulate/run.py \
+ --nb-epochs 100;
+done
diff --git a/results-v2/google-fl/mnist/d-cliques/random-ring/non-iid/experiments.sh b/results-v2/google-fl/mnist/d-cliques/random-ring/non-iid/experiments.sh
new file mode 100755
index 0000000..3014c6f
--- /dev/null
+++ b/results-v2/google-fl/mnist/d-cliques/random-ring/non-iid/experiments.sh
@@ -0,0 +1,40 @@
+#!/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 mnist |
+ setup/nodes/google-fl.py \
+ --nb-nodes 100 \
+ --local-shards 2 \
+ --shard-size 250 |
+ setup/topology/d_cliques/random-cliques.py \
+ --interclique ring \
+ --max-clique-size $MS |
+ setup/model/linear.py |
+ simulate/algorithm/d_sgd.py \
+ --batch-size 125 \
+ --learning-momentum 0.0 \
+ --learning-rate 0.1 \
+ --clique-gradient |
+ simulate/logger.py \
+ --accuracy-logging-interval 10\
+ --nb-processes 2 |
+ simulate/run.py \
+ --nb-epochs 100;
+done
--
GitLab