From fc339f95d2152882b024d7f0d4723c22f23a44bd Mon Sep 17 00:00:00 2001 From: jingqinghe Date: Thu, 7 May 2020 14:03:53 +0800 Subject: [PATCH] deal with conflict --- .../examples/generate_job_from_program/fl_master.py | 6 +++--- .../examples/generate_job_from_program/fl_scheduler.py | 2 +- .../examples/generate_job_from_program/fl_server.py | 6 +++--- .../examples/generate_job_from_program/fl_trainer.py | 4 ++-- .../examples/generate_job_from_program/program_saver.py | 2 +- .../paddle_fl}/examples/generate_job_from_program/run.sh | 0 .../paddle_fl}/examples/generate_job_from_program/stop.sh | 0 7 files changed, 10 insertions(+), 10 deletions(-) rename {paddle_fl => python/paddle_fl/paddle_fl}/examples/generate_job_from_program/fl_master.py (85%) rename {paddle_fl => python/paddle_fl/paddle_fl}/examples/generate_job_from_program/fl_scheduler.py (92%) rename {paddle_fl => python/paddle_fl/paddle_fl}/examples/generate_job_from_program/fl_server.py (85%) rename {paddle_fl => python/paddle_fl/paddle_fl}/examples/generate_job_from_program/fl_trainer.py (95%) rename {paddle_fl => python/paddle_fl/paddle_fl}/examples/generate_job_from_program/program_saver.py (95%) rename {paddle_fl => python/paddle_fl/paddle_fl}/examples/generate_job_from_program/run.sh (100%) rename {paddle_fl => python/paddle_fl/paddle_fl}/examples/generate_job_from_program/stop.sh (100%) diff --git a/paddle_fl/examples/generate_job_from_program/fl_master.py b/python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_master.py similarity index 85% rename from paddle_fl/examples/generate_job_from_program/fl_master.py rename to python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_master.py index b2be9a6..0932a4d 100644 --- a/paddle_fl/examples/generate_job_from_program/fl_master.py +++ b/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 diff --git a/paddle_fl/examples/generate_job_from_program/fl_scheduler.py b/python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_scheduler.py similarity index 92% rename from paddle_fl/examples/generate_job_from_program/fl_scheduler.py rename to python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_scheduler.py index a35e3aa..a8f507e 100644 --- a/paddle_fl/examples/generate_job_from_program/fl_scheduler.py +++ b/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 diff --git a/paddle_fl/examples/generate_job_from_program/fl_server.py b/python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_server.py similarity index 85% rename from paddle_fl/examples/generate_job_from_program/fl_server.py rename to python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_server.py index 3740982..aa1e9a8 100644 --- a/paddle_fl/examples/generate_job_from_program/fl_server.py +++ b/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" diff --git a/paddle_fl/examples/generate_job_from_program/fl_trainer.py b/python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_trainer.py similarity index 95% rename from paddle_fl/examples/generate_job_from_program/fl_trainer.py rename to python/paddle_fl/paddle_fl/examples/generate_job_from_program/fl_trainer.py index ea76f21..8a1be91 100644 --- a/paddle_fl/examples/generate_job_from_program/fl_trainer.py +++ b/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 diff --git a/paddle_fl/examples/generate_job_from_program/program_saver.py b/python/paddle_fl/paddle_fl/examples/generate_job_from_program/program_saver.py similarity index 95% rename from paddle_fl/examples/generate_job_from_program/program_saver.py rename to python/paddle_fl/paddle_fl/examples/generate_job_from_program/program_saver.py index dc4756e..e6f7528 100644 --- a/paddle_fl/examples/generate_job_from_program/program_saver.py +++ b/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') diff --git a/paddle_fl/examples/generate_job_from_program/run.sh b/python/paddle_fl/paddle_fl/examples/generate_job_from_program/run.sh similarity index 100% rename from paddle_fl/examples/generate_job_from_program/run.sh rename to python/paddle_fl/paddle_fl/examples/generate_job_from_program/run.sh diff --git a/paddle_fl/examples/generate_job_from_program/stop.sh b/python/paddle_fl/paddle_fl/examples/generate_job_from_program/stop.sh similarity index 100% rename from paddle_fl/examples/generate_job_from_program/stop.sh rename to python/paddle_fl/paddle_fl/examples/generate_job_from_program/stop.sh -- GitLab