Merge pull request #30 from qjing666/master

fix indentation bug and add install requirement

paddle_fl/core/master/fl_job.py

@@ -113,13 +113,13 @@ class FLCompileTimeJob(FLJobBase):
             self._save_readable_program(
                 server_main,
                 "%s/server.main.program.txt" % server_folder)
-	    self._save_str_list(self._feed_names,
+            self._save_str_list(self._feed_names,
                             "%s/feed_names" % server_folder)
-	    self._save_str_list(self._target_names,
+            self._save_str_list(self._target_names,
                             "%s/target_names" % server_folder)
-	    self._save_endpoints(self._server_endpoints,
+            self._save_endpoints(self._server_endpoints,
                             "%s/endpoints" % server_folder)
-	    self._save_strategy(self._strategy,
+            self._save_strategy(self._strategy,
                            "%s/strategy.pkl" % server_folder)
 
         for i in range(trainer_num):
@@ -139,7 +139,7 @@ class FLCompileTimeJob(FLJobBase):
             self._save_readable_program(
                 trainer_main,
                 "%s/trainer.main.program.txt" % trainer_folder)
-	    self._save_str_list(self._feed_names,
+            self._save_str_list(self._feed_names,
                             "%s/feed_names" % trainer_folder)
             self._save_str_list(self._target_names,
                             "%s/target_names" % trainer_folder)

paddle_fl/core/submitter/client_base.py

@@ -106,7 +106,7 @@ class HPCClient(object):
                            self.wheel))
             fout.write("export PATH=python/bin:$PATH\n")
             if self.monitor_cmd != "":
-	        fout.write("mpirun -npernode 1 -timestamp-output -tag-output -machinefile "
+                fout.write("mpirun -npernode 1 -timestamp-output -tag-output -machinefile "
                            "${{PBS_NODEFILE}} python/bin/{} > monitor.log 2> monitor.elog &\n".format(self.monitor_cmd))
             fout.write("mpirun -npernode 1 -timestamp-output -tag-output -machinefile ${PBS_NODEFILE} python/bin/python train_program.py\n")
             fout.write("if [[ $? -ne 0 ]]; then\n")

paddle_fl/core/trainer/fl_trainer.py

@@ -16,7 +16,7 @@ import logging
 from paddle_fl.core.scheduler.agent_master import FLWorkerAgent
 import numpy
 import hmac
-from .diffiehellman.diffiehellman import DiffieHellman
+#from .diffiehellman.diffiehellman import DiffieHellman
 
 class FLTrainerFactory(object):
     def __init__(self):

paddle_fl/version.py

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """ PaddleFL version string """
-fl_version = "0.1.2"
-module_proto_version = "0.1.2"
+fl_version = "0.1.3"
+module_proto_version = "0.1.3"

setup.py

@@ -29,7 +29,7 @@ def python_version():
 max_version, mid_version, min_version = python_version()
 
 REQUIRED_PACKAGES = [
-    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle >= 1.6' 
+    'six >= 1.10.0', 'protobuf >= 3.1.0','paddlepaddle >= 1.6', 'zmq' 
 ]
 
 if max_version < 3: