From 96f645385723d5b233d2a6074b3728be29cb1284 Mon Sep 17 00:00:00 2001
From: Rafael Pires <rafael.pires@epfl.ch>
Date: Wed, 16 Feb 2022 15:31:44 +0100
Subject: [PATCH] No need to tell which is the first machine. Didn't work with
non-contiguous machine numbers.
---
README.rst | 15 +++++++++++----
eval/run.sh | 6 ++----
2 files changed, 13 insertions(+), 8 deletions(-)
mode change 100644 => 100755 eval/run.sh
diff --git a/README.rst b/README.rst
index 7a77286..1086840 100644
--- a/README.rst
+++ b/README.rst
@@ -8,14 +8,21 @@ Setting up decentralizepy
* Fork the repository.
* Clone and enter your local repository.
-* Check if you have ``python>=3.8``.
-* (Optional) Create and activate a virtual environment.
+* Check if you have ``python>=3.8``. ::
+
+ python --version
+
+* (Optional) Create and activate a virtual environment. ::
+
+ python3 -m venv [venv-name]
+ source [venv-name]/bin/activate
+
* Update pip. ::
pip3 install --upgrade pip
pip install --upgrade pip
-* On Mac M1, installing ``pyzmq`` fails with `pip`. Use ``conda``.
+* On Mac M1, installing ``pyzmq`` fails with `pip`. Use `conda <https://conda.io>`_.
* Install decentralizepy for development. ::
pip3 install --editable .\[dev\]
@@ -26,7 +33,7 @@ Running the code
* Choose and modify one of the config files in ``eval/{step,epoch}_configs``.
* Modify the dataset paths and ``addresses_filepath`` in the config file.
-* In eval/run.sh, modify ``first_machine`` (used to calculate machine_id of all machines), ``original_config``, and other arguments as required.
+* In eval/run.sh, modify arguments as required.
* Execute eval/run.sh on all the machines simultaneously. There is a synchronization barrier mechanism at the start so that all processes start training together.
Node
diff --git a/eval/run.sh b/eval/run.sh
old mode 100644
new mode 100755
index d049355..9869a17
--- a/eval/run.sh
+++ b/eval/run.sh
@@ -3,10 +3,6 @@
decpy_path=~/Gitlab/decentralizepy/eval
cd $decpy_path
-first_machine=128
-m=`/sbin/ifconfig ens785 | grep 'inet ' | awk '{print $2}' | awk -v FS=. '{print $4}'`
-m=`expr $m - $first_machine`
-
env_python=~/miniconda3/envs/decpy/bin/python3
graph=96_nodes_random1.edges
original_config=epoch_configs/config_celeba.ini
@@ -18,6 +14,8 @@ test_after=2
eval_file=testing.py
log_level=INFO
+m=`cat $(grep addresses_filepath $original_config | awk '{print $3}') | grep $(/sbin/ifconfig ens785 | grep 'inet ' | awk '{print $2}') | cut -d'"' -f2`
+
cp $original_config $config_file
echo "alpha = 0.75" >> $config_file
$env_python $eval_file -mid $m -ps $procs_per_machine -ms $machines -is $iterations -gf $graph -ta $test_after -cf $config_file -ll $log_level
--
GitLab