Merge branch 'master' into dataset

docs/requirements.txt

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

paddle_fl/core/trainer/diffiehellman/diffiehellman.py

@@ -42,9 +42,9 @@ try:
     from ssl import RAND_bytes
     rng = RAND_bytes
 except(AttributeError, ImportError):
-    raise RNGError
-#python2
-#rng = os.urandom
+    #python2
+    rng = os.urandom
+    #raise RNGError
 
 class DiffieHellman:
     """

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):