update

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):

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

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):

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

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"

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

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
 
 

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

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

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

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):

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

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"

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

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):

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

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"

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

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():

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():

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

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

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

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):

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

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"

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

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
 

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