deal with conflict

paddle_fl/examples/generate_job_from_program/fl_master.py → python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_master.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle_fl as fl
+import paddle_fl.paddle_fl as fl
 import paddle.fluid as fluid
-from paddle_fl.core.master.job_generator import JobGenerator
-from paddle_fl.core.strategy.fl_strategy_base import FLStrategyFactory
+from paddle_fl.paddle_fl.core.master.job_generator import JobGenerator
+from paddle_fl.paddle_fl.core.strategy.fl_strategy_base import FLStrategyFactory
 
 build_strategy = FLStrategyFactory()
 build_strategy.fed_avg = True

paddle_fl/examples/generate_job_from_program/fl_scheduler.py → python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_scheduler.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle_fl.core.scheduler.agent_master import FLScheduler
+from paddle_fl.paddle_fl.core.scheduler.agent_master import FLScheduler
 
 worker_num = 2
 server_num = 1

paddle_fl/examples/generate_job_from_program/fl_server.py → python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_server.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle_fl as fl
+import paddle_fl.paddle_fl as fl
 import paddle.fluid as fluid
-from paddle_fl.core.server.fl_server import FLServer
-from paddle_fl.core.master.fl_job import FLRunTimeJob
+from paddle_fl.paddle_fl.core.server.fl_server import FLServer
+from paddle_fl.paddle_fl.core.master.fl_job import FLRunTimeJob
 server = FLServer()
 server_id = 0
 job_path = "fl_job_config"

paddle_fl/examples/generate_job_from_program/fl_trainer.py → python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_trainer.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle_fl.core.trainer.fl_trainer import FLTrainerFactory
-from paddle_fl.core.master.fl_job import FLRunTimeJob
+from paddle_fl.paddle_fl.core.trainer.fl_trainer import FLTrainerFactory
+from paddle_fl.paddle_fl.core.master.fl_job import FLRunTimeJob
 import numpy
 import sys
 import paddle

paddle_fl/examples/generate_job_from_program/program_saver.py → python/paddle_fl/paddle_fl/examples/generate_job_from_program/program_saver.py

@@ -15,7 +15,7 @@
 import os
 import json
 import paddle.fluid as fluid
-from paddle_fl.core.master.job_generator import JobGenerator
+from paddle_fl.paddle_fl.core.master.job_generator import JobGenerator
 
 input = fluid.layers.data(name='input', shape=[1, 28, 28], dtype="float32")
 label = fluid.layers.data(name='label', shape=[1], dtype='int64')