Merge branch 'master' into secagg

docs/requirements.txt

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

paddle_fl/core/trainer/fl_trainer.py

@@ -17,7 +17,6 @@ from paddle_fl.core.scheduler.agent_master import FLWorkerAgent
 import numpy
 import hmac
 import hashlib
-
 from .diffiehellman.diffiehellman import DiffieHellman
 
 class FLTrainerFactory(object):

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)