From 7da6187262e3a672a388857fa9d762f585c86481 Mon Sep 17 00:00:00 2001 From: jingqinghe Date: Thu, 30 Apr 2020 10:02:17 +0800 Subject: [PATCH] update --- python/paddle_fl/paddle_fl/core/server/fl_server.py | 2 +- python/paddle_fl/paddle_fl/core/trainer/fl_trainer.py | 2 +- python/paddle_fl/paddle_fl/examples/ctr_demo/fl_master.py | 6 +++--- .../paddle_fl/paddle_fl/examples/ctr_demo/fl_scheduler.py | 2 +- python/paddle_fl/paddle_fl/examples/ctr_demo/fl_server.py | 6 +++--- .../paddle_fl/paddle_fl/examples/ctr_demo/fl_trainer.py | 4 ++-- .../paddle_fl/paddle_fl/examples/dpsgd_demo/fl_master.py | 6 +++--- .../paddle_fl/examples/dpsgd_demo/fl_scheduler.py | 2 +- .../paddle_fl/paddle_fl/examples/dpsgd_demo/fl_server.py | 2 +- .../paddle_fl/paddle_fl/examples/dpsgd_demo/fl_trainer.py | 4 ++-- .../paddle_fl/examples/femnist_demo/fl_master.py | 6 +++--- .../paddle_fl/examples/femnist_demo/fl_scheduler.py | 2 +- .../paddle_fl/examples/femnist_demo/fl_server.py | 6 +++--- .../paddle_fl/examples/femnist_demo/fl_trainer.py | 6 +++--- .../paddle_fl/examples/gru4rec_demo/fl_master.py | 6 +++--- .../paddle_fl/examples/gru4rec_demo/fl_scheduler.py | 2 +- .../paddle_fl/examples/gru4rec_demo/fl_server.py | 6 +++--- .../paddle_fl/examples/gru4rec_demo/fl_trainer.py | 6 +++--- .../paddle_fl/examples/k8s_deployment/master/fl_master.py | 6 +++--- .../examples/k8s_deployment/scheduler/fl_scheduler.py | 2 +- .../paddle_fl/examples/k8s_deployment/server/fl_server.py | 6 +++--- .../examples/k8s_deployment/trainer0/fl_trainer.py | 4 ++-- .../examples/k8s_deployment/trainer1/fl_trainer.py | 4 ++-- .../paddle_fl/paddle_fl/examples/secagg_demo/fl_master.py | 6 +++--- .../paddle_fl/examples/secagg_demo/fl_scheduler.py | 2 +- .../paddle_fl/paddle_fl/examples/secagg_demo/fl_server.py | 6 +++--- .../paddle_fl/examples/secagg_demo/fl_trainer.py | 4 ++-- .../paddle_fl/examples/submitter_demo/scheduler_client.py | 8 ++++---- .../paddle_fl/examples/submitter_demo/train_program.py | 8 ++++---- 29 files changed, 66 insertions(+), 66 deletions(-) diff --git a/python/paddle_fl/paddle_fl/core/server/fl_server.py b/python/paddle_fl/paddle_fl/core/server/fl_server.py index 9327a00..60f727f 100644 --- a/python/paddle_fl/paddle_fl/core/server/fl_server.py +++ b/python/paddle_fl/paddle_fl/core/server/fl_server.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import paddle.fluid as fluid -from paddle_fl..jingqinghe_newname.core.scheduler.agent_master import FLServerAgent +from paddle_fl.paddle_fl.core.scheduler.agent_master import FLServerAgent class FLServer(object): diff --git a/python/paddle_fl/paddle_fl/core/trainer/fl_trainer.py b/python/paddle_fl/paddle_fl/core/trainer/fl_trainer.py index f5157dd..04a4cf1 100755 --- a/python/paddle_fl/paddle_fl/core/trainer/fl_trainer.py +++ b/python/paddle_fl/paddle_fl/core/trainer/fl_trainer.py @@ -13,7 +13,7 @@ # limitations under the License. import paddle.fluid as fluid import logging -from paddle_fl.jingqinghe_newname.core.scheduler.agent_master import FLWorkerAgent +from paddle_fl.paddle_fl.core.scheduler.agent_master import FLWorkerAgent import numpy import hmac import hashlib diff --git a/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_master.py b/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_master.py index ef0598f..b8e5bbf 100644 --- a/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_master.py +++ b/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_master.py @@ -13,9 +13,9 @@ # limitations under the License. import paddle.fluid as fluid -import paddle_fl.jingqinghe_newname as fl -from paddle_fl.jingqinghe_newname.core.master.job_generator import JobGenerator -from paddle_fl.jingqinghe_newname.core.strategy.fl_strategy_base import FLStrategyFactory +import paddle_fl.paddle_fl as fl +from paddle_fl.paddle_fl.core.master.job_generator import JobGenerator +from paddle_fl.paddle_fl.core.strategy.fl_strategy_base import FLStrategyFactory class Model(object): diff --git a/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_scheduler.py b/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_scheduler.py index 0114bfd..08619d3 100644 --- a/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_scheduler.py +++ b/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_scheduler.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from paddle_fl.jingqinghe_newname.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/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_server.py b/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_server.py index c5d34f5..e5ee778 100644 --- a/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_server.py +++ b/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_server.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle_fl.jingqinghe_newname as fl +import paddle_fl.paddle_fl as fl import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.server.fl_server import FLServer -from paddle_fl.jingqinghe_newname.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/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_trainer.py b/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_trainer.py index fbeb208..955b9cd 100644 --- a/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_trainer.py +++ b/python/paddle_fl/paddle_fl/examples/ctr_demo/fl_trainer.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.trainer.fl_trainer import FLTrainerFactory -from paddle_fl.jingqinghe_newname.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 as np import sys import logging diff --git a/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_master.py b/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_master.py index 04f0e33..ef46e2e 100644 --- a/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_master.py +++ b/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_master.py @@ -13,9 +13,9 @@ # limitations under the License. import paddle.fluid as fluid -import paddle_fl.jingqinghe_newname as fl -from paddle_fl.jingqinghe_newname.core.master.job_generator import JobGenerator -from paddle_fl.jingqinghe_newname.core.strategy.fl_strategy_base import FLStrategyFactory +import paddle_fl.paddle_fl as fl +from paddle_fl.paddle_fl.core.master.job_generator import JobGenerator +from paddle_fl.paddle_fl.core.strategy.fl_strategy_base import FLStrategyFactory import math diff --git a/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_scheduler.py b/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_scheduler.py index 29bba5a..f208762 100644 --- a/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_scheduler.py +++ b/python/paddle_fl/paddle_fl/examples/dpsgd_demo/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 = 4 server_num = 1 diff --git a/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_server.py b/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_server.py index 95982c5..bfda7a2 100644 --- a/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_server.py +++ b/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_server.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle_fl.jingqinghe_newname 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 diff --git a/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_trainer.py b/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_trainer.py index 5b104d3..194db69 100644 --- a/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_trainer.py +++ b/python/paddle_fl/paddle_fl/examples/dpsgd_demo/fl_trainer.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from paddle_fl.jingqinghe_newname.core.trainer.fl_trainer import FLTrainerFactory -from paddle_fl.jingqinghe_newname.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/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_master.py b/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_master.py index 2523925..74ffe18 100644 --- a/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_master.py +++ b/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_master.py @@ -13,9 +13,9 @@ # limitations under the License. import paddle.fluid as fluid -import paddle_fl.jingqinghe_newname as fl -from paddle_fl.jingqinghe_newname.core.master.job_generator import JobGenerator -from paddle_fl.jingqinghe_newname.core.strategy.fl_strategy_base import FLStrategyFactory +import paddle_fl.paddle_fl as fl +from paddle_fl.paddle_fl.core.master.job_generator import JobGenerator +from paddle_fl.paddle_fl.core.strategy.fl_strategy_base import FLStrategyFactory class Model(object): diff --git a/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_scheduler.py b/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_scheduler.py index 8fe8e28..2ff13f4 100644 --- a/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_scheduler.py +++ b/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_scheduler.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from paddle_fl.jingqinghe_newname.core.scheduler.agent_master import FLScheduler +from paddle_fl.paddle_fl.core.scheduler.agent_master import FLScheduler worker_num = 4 server_num = 1 diff --git a/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_server.py b/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_server.py index dd8978a..eb40666 100644 --- a/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_server.py +++ b/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_server.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle_fl.jingqinghe_newname as fl +import paddle_fl.paddle_fl as fl import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.server.fl_server import FLServer -from paddle_fl.jingqinghe_newname.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/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_trainer.py b/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_trainer.py index c926ab9..4e58610 100644 --- a/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_trainer.py +++ b/python/paddle_fl/paddle_fl/examples/femnist_demo/fl_trainer.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from paddle_fl.jingqinghe_newname.core.trainer.fl_trainer import FLTrainerFactory -from paddle_fl.jingqinghe_newname.core.master.fl_job import FLRunTimeJob -import paddle_fl.jingqinghe_newname.dataset.femnist +from paddle_fl.paddle_fl.core.trainer.fl_trainer import FLTrainerFactory +from paddle_fl.paddle_fl.core.master.fl_job import FLRunTimeJob +import paddle_fl.paddle_fl.dataset.femnist import numpy import sys import paddle diff --git a/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_master.py b/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_master.py index f0d0388..742e5a0 100644 --- a/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_master.py +++ b/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_master.py @@ -13,9 +13,9 @@ # limitations under the License. import paddle.fluid as fluid -import paddle_fl.jingqinghe_newname as fl -from paddle_fl.jingqinghe_newname.core.master.job_generator import JobGenerator -from paddle_fl.jingqinghe_newname.core.strategy.fl_strategy_base import FLStrategyFactory +import paddle_fl.paddle_fl as fl +from paddle_fl.paddle_fl.core.master.job_generator import JobGenerator +from paddle_fl.paddle_fl.core.strategy.fl_strategy_base import FLStrategyFactory class Model(object): diff --git a/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_scheduler.py b/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_scheduler.py index 8fe8e28..2ff13f4 100644 --- a/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_scheduler.py +++ b/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_scheduler.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from paddle_fl.jingqinghe_newname.core.scheduler.agent_master import FLScheduler +from paddle_fl.paddle_fl.core.scheduler.agent_master import FLScheduler worker_num = 4 server_num = 1 diff --git a/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_server.py b/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_server.py index 7458c63..aa1e9a8 100644 --- a/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_server.py +++ b/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_server.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle_fl.jingqinghe_newname as fl +import paddle_fl.paddle_fl as fl import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.server.fl_server import FLServer -from paddle_fl.jingqinghe_newname.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/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_trainer.py b/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_trainer.py index 8ecc121..f6f3439 100644 --- a/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_trainer.py +++ b/python/paddle_fl/paddle_fl/examples/gru4rec_demo/fl_trainer.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from paddle_fl.jingqinghe_newname.core.trainer.fl_trainer import FLTrainerFactory -from paddle_fl.jingqinghe_newname.core.master.fl_job import FLRunTimeJob -from paddle_fl.jingqinghe_newname.reader.gru4rec_reader import Gru4rec_Reader +from paddle_fl.paddle_fl.core.trainer.fl_trainer import FLTrainerFactory +from paddle_fl.paddle_fl.core.master.fl_job import FLRunTimeJob +from paddle_fl.paddle_fl.reader.gru4rec_reader import Gru4rec_Reader import paddle.fluid as fluid import numpy as np import sys diff --git a/python/paddle_fl/paddle_fl/examples/k8s_deployment/master/fl_master.py b/python/paddle_fl/paddle_fl/examples/k8s_deployment/master/fl_master.py index 95a01dc..3eabd72 100644 --- a/python/paddle_fl/paddle_fl/examples/k8s_deployment/master/fl_master.py +++ b/python/paddle_fl/paddle_fl/examples/k8s_deployment/master/fl_master.py @@ -15,9 +15,9 @@ import argparse import paddle.fluid as fluid import os -import paddle_fl.jingqinghe_newname as fl -from paddle_fl.jingqinghe_newname.core.master.job_generator import JobGenerator -from paddle_fl.jingqinghe_newname.core.strategy.fl_strategy_base import FLStrategyFactory +import paddle_fl.paddle_fl as fl +from paddle_fl.paddle_fl.core.master.job_generator import JobGenerator +from paddle_fl.paddle_fl.core.strategy.fl_strategy_base import FLStrategyFactory def parse_args(): diff --git a/python/paddle_fl/paddle_fl/examples/k8s_deployment/scheduler/fl_scheduler.py b/python/paddle_fl/paddle_fl/examples/k8s_deployment/scheduler/fl_scheduler.py index 7f61a07..ad4b2ae 100644 --- a/python/paddle_fl/paddle_fl/examples/k8s_deployment/scheduler/fl_scheduler.py +++ b/python/paddle_fl/paddle_fl/examples/k8s_deployment/scheduler/fl_scheduler.py @@ -13,7 +13,7 @@ # limitations under the License. import argparse -from paddle_fl.jingqinghe_newname.core.scheduler.agent_master import FLScheduler +from paddle_fl.paddle_fl.core.scheduler.agent_master import FLScheduler def parse_args(): diff --git a/python/paddle_fl/paddle_fl/examples/k8s_deployment/server/fl_server.py b/python/paddle_fl/paddle_fl/examples/k8s_deployment/server/fl_server.py index 2e98e7f..6d60f46 100644 --- a/python/paddle_fl/paddle_fl/examples/k8s_deployment/server/fl_server.py +++ b/python/paddle_fl/paddle_fl/examples/k8s_deployment/server/fl_server.py @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle_fl.jingqinghe_newname as fl +import paddle_fl.paddle_fl as fl import os import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.server.fl_server import FLServer -from paddle_fl.jingqinghe_newname.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 import time server = FLServer() server_id = 0 diff --git a/python/paddle_fl/paddle_fl/examples/k8s_deployment/trainer0/fl_trainer.py b/python/paddle_fl/paddle_fl/examples/k8s_deployment/trainer0/fl_trainer.py index e27f315..e8b704d 100644 --- a/python/paddle_fl/paddle_fl/examples/k8s_deployment/trainer0/fl_trainer.py +++ b/python/paddle_fl/paddle_fl/examples/k8s_deployment/trainer0/fl_trainer.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.trainer.fl_trainer import FLTrainerFactory -from paddle_fl.jingqinghe_newname.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 as np import sys import os diff --git a/python/paddle_fl/paddle_fl/examples/k8s_deployment/trainer1/fl_trainer.py b/python/paddle_fl/paddle_fl/examples/k8s_deployment/trainer1/fl_trainer.py index 629720b..71c2377 100644 --- a/python/paddle_fl/paddle_fl/examples/k8s_deployment/trainer1/fl_trainer.py +++ b/python/paddle_fl/paddle_fl/examples/k8s_deployment/trainer1/fl_trainer.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.trainer.fl_trainer import FLTrainerFactory -from paddle_fl.jingqinghe_newname.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 as np import sys import os diff --git a/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_master.py b/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_master.py index e574a3c..42abb27 100644 --- a/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_master.py +++ b/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_master.py @@ -13,9 +13,9 @@ # limitations under the License. import paddle.fluid as fluid -import paddle_fl.jingqinghe_newname as fl -from paddle_fl.jingqinghe_newname.core.master.job_generator import JobGenerator -from paddle_fl.jingqinghe_newname.core.strategy.fl_strategy_base import FLStrategyFactory +import paddle_fl.paddle_fl as fl +from paddle_fl.paddle_fl.core.master.job_generator import JobGenerator +from paddle_fl.paddle_fl.core.strategy.fl_strategy_base import FLStrategyFactory class Model(object): diff --git a/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_scheduler.py b/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_scheduler.py index 7c12870..4f69047 100644 --- a/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_scheduler.py +++ b/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_scheduler.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from paddle_fl.jingqinghe_newname.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/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_server.py b/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_server.py index c5d34f5..e5ee778 100644 --- a/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_server.py +++ b/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_server.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle_fl.jingqinghe_newname as fl +import paddle_fl.paddle_fl as fl import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.server.fl_server import FLServer -from paddle_fl.jingqinghe_newname.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/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_trainer.py b/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_trainer.py index aa084a3..a091d62 100644 --- a/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_trainer.py +++ b/python/paddle_fl/paddle_fl/examples/secagg_demo/fl_trainer.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from paddle_fl.jingqinghe_newname.core.trainer.fl_trainer import FLTrainerFactory -from paddle_fl.jingqinghe_newname.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 logging diff --git a/python/paddle_fl/paddle_fl/examples/submitter_demo/scheduler_client.py b/python/paddle_fl/paddle_fl/examples/submitter_demo/scheduler_client.py index fe50cbd..d882758 100644 --- a/python/paddle_fl/paddle_fl/examples/submitter_demo/scheduler_client.py +++ b/python/paddle_fl/paddle_fl/examples/submitter_demo/scheduler_client.py @@ -18,11 +18,11 @@ import random import zmq import time import sys -from paddle_fl.jingqinghe_newname.core.submitter.client_base import HPCClient -from paddle_fl.jingqinghe_newname.core.scheduler.agent_master import FLScheduler +from paddle_fl.paddle_fl.core.submitter.client_base import HPCClient +from paddle_fl.paddle_fl.core.scheduler.agent_master import FLScheduler import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.master.job_generator import JobGenerator -from paddle_fl.jingqinghe_newname.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 from model import Model import tarfile diff --git a/python/paddle_fl/paddle_fl/examples/submitter_demo/train_program.py b/python/paddle_fl/paddle_fl/examples/submitter_demo/train_program.py index 609fd30..671d05d 100644 --- a/python/paddle_fl/paddle_fl/examples/submitter_demo/train_program.py +++ b/python/paddle_fl/paddle_fl/examples/submitter_demo/train_program.py @@ -17,11 +17,11 @@ import random import zmq import os import tarfile -import paddle_fl.jingqinghe_newname as fl +import paddle_fl.paddle_fl as fl import paddle.fluid as fluid -from paddle_fl.jingqinghe_newname.core.server.fl_server import FLServer -from paddle_fl.jingqinghe_newname.core.master.fl_job import FLRunTimeJob -from paddle_fl.jingqinghe_newname.core.trainer.fl_trainer import FLTrainerFactory +from paddle_fl.paddle_fl.core.server.fl_server import FLServer +from paddle_fl.paddle_fl.core.master.fl_job import FLRunTimeJob +from paddle_fl.paddle_fl.core.trainer.fl_trainer import FLTrainerFactory import numpy as np import sys import logging -- GitLab