Merge https://github.com/PaddlePaddle/PaddleFL

paddle_fl/__init__.py

@@ -18,4 +18,3 @@ from . import common
 from . import core
 from . import dataset
 from . import reader
-

paddle_fl/core/master/__init__.py

@@ -11,5 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-

paddle_fl/core/master/job_generator.py

@@ -146,4 +146,3 @@ class JobGenerator(object):
         local_job.set_target_names(self._target_names)
         local_job.set_strategy(fl_strategy)
         local_job.save(output)
-

paddle_fl/core/strategy/fl_strategy_base.py

@@ -273,5 +273,3 @@ class SecAggStrategy(FedAvgStrategy):
     @param_name_list.setter
     def param_name_list(self, s):
         self._param_name_list = s
-
-

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):
@@ -149,6 +149,9 @@ class FedAvgTrainer(FLTrainer):
         return loss
        
  
+
+
+
 class SecAggTrainer(FLTrainer):
     def __init__(self):
         super(SecAggTrainer, self).__init__()
@@ -244,4 +247,3 @@ class SecAggTrainer(FLTrainer):
 
     def stop(self):
         return False
-

paddle_fl/examples/dpsgd_demo/fl_trainer.py

@@ -68,5 +68,3 @@ while not trainer.stop():
 
     save_dir = (output_folder + "/epoch_%d") % epoch_id
     trainer.save_inference_program(output_folder)
-
-

setup.py

@@ -71,4 +71,3 @@ setup(
     ],
     license='Apache 2.0',
     keywords=('paddle_fl paddlepaddle multi-task transfer distributed-training'))
-