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 b2be9a64732eec1a322be9a50303f982f734593f..0932a4d016a593ed1f2c2fb537cbd1259421737c 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 a35e3aaf8631a628be0c6dc0724be18127633ff3..a8f507e678acc0f4c6faabcf8d5fcaea7a7e3ba0 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 3740982b54613169074c95e510809d55ed54121b..aa1e9a86504673968cdfb969de5321df5d33277e 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 ea76f214c551d3ecf3cd66deb6779e37f2dc0748..8a1be916edda07c78f086f1c47b8e1f50713cdb2 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 dc4756e8420d58e66828938153b2b52d1a7723e0..e6f752880bbaf30005eeb59ac2d9765707eeaf06 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