Merge branch 'master' into easy_use

docs/requirements.txt

@@ -2,4 +2,5 @@ sphinx==2.1.0
 mistune
 sphinx_rtd_theme
 paddlepaddle>=1.6
-zqm
+zmq
+

paddle_fl/core/trainer/diffiehellman/diffiehellman.py

@@ -43,7 +43,7 @@ try:
     rng = RAND_bytes
 except(AttributeError, ImportError):
     rng = os.urandom
-
+  
 class DiffieHellman:
     """
     Implements the Diffie-Hellman key exchange protocol.

paddle_fl/examples/femnist_demo/fl_master.py

@@ -25,7 +25,7 @@ model = Model()
 model.cnn()
 
 job_generator = JobGenerator()
-optimizer = fluid.optimizer.SGD(learning_rate=0.1)
+optimizer = fluid.optimizer.Adam(learning_rate=0.1)
 job_generator.set_optimizer(optimizer)
 job_generator.set_losses([model.loss])
 job_generator.set_startup_program(model.startup_program)