rename eggroll to session

Author: sagewe

arch/api/__init__.py

@@ -60,4 +60,4 @@ class NamingPolicy(Enum):
 
 
 # compatibility
-eggroll = session
+session = session

arch/api/session.py

@@ -17,7 +17,6 @@
 import os
 import typing
 import uuid
-import warnings
 from typing import Iterable
 
 from arch.api import RuntimeInstance

contrib/fate_script/cluster/fate_script.py

@@ -6,7 +6,7 @@
 import numpy as np
 import uuid
 from arch.api.cluster.eggroll import _DTable, _EggRoll
-from arch.api import  eggroll
+from arch.api import  session
 from arch.api.cluster import federation
 from arch.api.proto import basic_meta_pb2, federation_pb2, federation_pb2_grpc, storage_basic_pb2
 from arch.api.utils import file_utils, eggroll_serdes

contrib/fate_script/fate_script.py

@@ -3,7 +3,7 @@
 import pandas as pd
 import numpy as np
 
-from arch.api import eggroll
+from arch.api import session
 from contrib.fate_script import WorkMode
 from contrib.fate_script import RuntimeInstance
 from contrib.fate_script.standalone import fate_script as standalone_fate_script
@@ -13,7 +13,7 @@
 from federatedml.util.param_checker import AllChecker
 
 def init(job_id, runtime_conf, mode, server_conf_path="arch/conf/server_conf.json"):
-    eggroll.init(job_id, mode)
+    session.init(job_id, mode)
     print("runtime_conf:{}".format(runtime_conf))
     all_checker = AllChecker(runtime_conf)
     all_checker.check_all()
@@ -63,7 +63,7 @@ def get_lr_x_table(file_path):
     ns = str(uuid.uuid1())
     csv_table = pd.read_csv(file_path)
     data = pd.read_csv(file_path).values
-    x = eggroll.table('fata_script_test_data_x_' + str(RuntimeInstance.FEDERATION.role + str(RuntimeInstance.FEDERATION.job_id)), ns, partition=2, persistent=True)
+    x = session.table('fata_script_test_data_x_' + str(RuntimeInstance.FEDERATION.role + str(RuntimeInstance.FEDERATION.job_id)), ns, partition=2, persistent=True)
     if 'y' in list(csv_table.columns.values):
         data_index = 2
     else:
@@ -77,7 +77,7 @@ def get_lr_y_table(file_path):
     ns = str(uuid.uuid1())
     csv_table = pd.read_csv(file_path)
     data = pd.read_csv(file_path).values
-    y = eggroll.table('fata_script_test_data_y_' + str(RuntimeInstance.FEDERATION.role) + str(RuntimeInstance.FEDERATION.job_id), ns, partition=2, persistent=True)
+    y = session.table('fata_script_test_data_y_' + str(RuntimeInstance.FEDERATION.role) + str(RuntimeInstance.FEDERATION.job_id), ns, partition=2, persistent=True)
     if 'y' not in list(csv_table.columns.values):
         raise RuntimeError("input data must contain y column")
     for i in range(np.shape(data)[0]):

contrib/fate_script/standalone/fate_script.py

@@ -1,7 +1,7 @@
 import pandas as pd
 import numpy as np
 import uuid
-from arch.api import  eggroll
+from arch.api import  session
 from arch.api.standalone import federation
 from arch.api.standalone.federation import FederationRuntime
 from arch.api.utils import file_utils

contrib/fate_script/test/test_blas.py

@@ -5,7 +5,7 @@
 import json
 from numbers import Number
 from arch.api import federation
-from arch.api import eggroll
+from arch.api import session
 from arch.api import RuntimeInstance
 from arch.api.standalone.federation import FederationRuntime
 from arch.api.utils import file_utils
@@ -20,11 +20,11 @@ def test_plain_lr():
     from sklearn.datasets import make_moons
     import functools
     # 修改flow_id 否则内存表可能被覆盖
-    eggroll.init(mode=0)
+    session.init(mode=0)
     ns = str(uuid.uuid1())
 
-    X = eggroll.table('testX7', ns, partition=2)
-    Y = eggroll.table('testY7', ns, partition=2)
+    X = session.table('testX7', ns, partition=2)
+    Y = session.table('testY7', ns, partition=2)
 
     b = np.array([0])
     eta = 1.2
@@ -88,12 +88,12 @@ def test_paillier_lr():
     cipher.generate_key()
 
     # 修改flow_id 否则内存表可能被覆盖
-    eggroll.init(mode=0)
+    session.init(mode=0)
     ns = str(uuid.uuid1())
     p = True
-    X_G = eggroll.table('testX7', ns, partition=2,persistent=p)
-    X_H = eggroll.table('testX7_2', ns, partition=2,persistent=p)
-    Y = eggroll.table('testY7', ns, partition=2,persistent=p)
+    X_G = session.table('testX7', ns, partition=2, persistent=p)
+    X_H = session.table('testX7_2', ns, partition=2, persistent=p)
+    Y = session.table('testY7', ns, partition=2, persistent=p)
 
     b = np.array([0])
     eta = 1.2

examples/hetero_ftl/run_arbiter.py

@@ -17,7 +17,7 @@
 import json
 import sys
 from workflow.hetero_ftl_workflow.hetero_arbiter_workflow import FTLArbiterWorkFlow
-from arch.api import eggroll
+from arch.api import session
 from arch.api import federation
 from arch.api.utils import log_utils
 LOGGER = log_utils.getLogger()
@@ -37,7 +37,7 @@ def _init_argument(self):
 
         LOGGER.debug("The Arbiter job id is {}".format(job_id))
         LOGGER.debug("The Arbiter work mode id is {}".format(self.workflow_param.work_mode))
-        eggroll.init(job_id, self.workflow_param.work_mode)
+        session.init(job_id, self.workflow_param.work_mode)
         federation.init(job_id, runtime_json)
         LOGGER.debug("Finish eggroll and federation init")
 

examples/hetero_ftl/run_guest.py

@@ -18,7 +18,7 @@
 import sys
 from workflow.hetero_ftl_workflow.hetero_guest_workflow import FTLGuestWorkFlow
 from federatedml.ftl.data_util.uci_credit_card_util import load_guest_host_dtable_from_UCI_Credit_Card
-from arch.api import eggroll
+from arch.api import session
 from arch.api import federation
 from arch.api.utils import log_utils
 LOGGER = log_utils.getLogger()
@@ -38,14 +38,14 @@ def _init_argument(self):
 
         LOGGER.debug("The Guest job id is {}".format(job_id))
         LOGGER.debug("The Guest work mode id is {}".format(self.workflow_param.work_mode))
-        eggroll.init(job_id, self.workflow_param.work_mode)
+        session.init(job_id, self.workflow_param.work_mode)
         federation.init(job_id, runtime_json)
         LOGGER.debug("Finish eggroll and federation init")
 
     def gen_data_instance(self, table_name, namespace, mode="fit"):
         data_model_param = self._get_data_model_param()
         if data_model_param.is_read_table:
-            return eggroll.table(table_name, namespace)
+            return session.table(table_name, namespace)
         else:
             data_model_param_dict = dict()
             data_model_param_dict["file_path"] = data_model_param.file_path
@@ -61,7 +61,7 @@ def gen_validation_data_instance(self, table_name, namespace):
         data_model_param = self._get_data_model_param()
         valid_data_model_param = self._get_valid_data_model_param()
         if valid_data_model_param.is_read_table:
-            return eggroll.table(table_name, namespace)
+            return session.table(table_name, namespace)
         else:
             data_model_param_dict = dict()
             data_model_param_dict["file_path"] = valid_data_model_param.file_path

examples/hetero_ftl/run_host.py

@@ -19,7 +19,7 @@
 
 from workflow.hetero_ftl_workflow.hetero_host_workflow import FTLHostWorkFlow
 from federatedml.ftl.data_util.uci_credit_card_util import load_guest_host_dtable_from_UCI_Credit_Card
-from arch.api import eggroll
+from arch.api import session
 from arch.api import federation
 from arch.api.utils import log_utils
 LOGGER = log_utils.getLogger()
@@ -39,14 +39,14 @@ def _init_argument(self):
 
         LOGGER.debug("The Host job id is {}".format(job_id))
         LOGGER.debug("The Host work mode id is {}".format(self.workflow_param.work_mode))
-        eggroll.init(job_id, self.workflow_param.work_mode)
+        session.init(job_id, self.workflow_param.work_mode)
         federation.init(job_id, runtime_json)
         LOGGER.debug("Finish eggroll and federation init")
 
     def gen_data_instance(self, table_name, namespace, mode="fit"):
         data_model_param = self._get_data_model_param()
         if data_model_param.is_read_table:
-            return eggroll.table(table_name, namespace)
+            return session.table(table_name, namespace)
         else:
             data_model_param_dict = dict()
             data_model_param_dict["file_path"] = data_model_param.file_path
@@ -62,7 +62,7 @@ def gen_validation_data_instance(self, table_name, namespace):
         data_model_param = self._get_data_model_param()
         valid_data_model_param = self._get_valid_data_model_param()
         if valid_data_model_param.is_read_table:
-            return eggroll.table(table_name, namespace)
+            return session.table(table_name, namespace)
         else:
             data_model_param_dict = dict()
             data_model_param_dict["file_path"] = valid_data_model_param.file_path

fate_flow/utils/download.py

@@ -15,7 +15,7 @@
 #
 import os
 
-from arch.api import eggroll,storage
+from arch.api import session,storage
 
 from arch.api.utils import log_utils, dtable_utils
 
@@ -35,7 +35,7 @@ def run(self, component_parameters=None, args=None):
         table_name, namespace = dtable_utils.get_table_info(config=self.parameters,
                                                             create=False)
         job_id = "_".join(self.taskid.split("_")[:2])
-        eggroll.init(job_id, self.parameters["work_mode"])
+        session.init(job_id, self.parameters["work_mode"])
         with open(os.path.abspath(self.parameters["output_path"]), "w") as fout:
             data_table = storage.get_data_table(name=table_name, namespace=namespace)
             print('===== begin to export data =====')

federatedml/feature/feature_scale/test/min_max_scale_test.py

@@ -6,7 +6,7 @@
 
 from sklearn.preprocessing import MinMaxScaler as MMS
 
-from arch.api import eggroll
+from arch.api import session
 from federatedml.feature.feature_scale.min_max_scale import MinMaxScale
 from federatedml.feature.instance import Instance
 from federatedml.param.scale_param import ScaleParam
@@ -41,8 +41,8 @@ def print_table(self, table):
             print("id:{}, value:{}".format(v[0], v[1].features))
 
     def data_to_eggroll_table(self, data, jobid, partition=1, work_mode=0):
-        eggroll.init(jobid, mode=work_mode)
-        data_table = eggroll.parallelize(data, include_key=False)
+        session.init(jobid, mode=work_mode)
+        data_table = session.parallelize(data, include_key=False)
         return data_table
 
     def sklearn_attribute_format(self, scaler, feature_range):

federatedml/feature/feature_scale/test/standard_scale_test.py

@@ -6,7 +6,7 @@
 
 from sklearn.preprocessing import StandardScaler as SSL
 
-from arch.api import eggroll
+from arch.api import session
 from federatedml.feature.feature_scale.standard_scale import StandardScale
 from federatedml.feature.instance import Instance
 from federatedml.param.scale_param import ScaleParam
@@ -40,8 +40,8 @@ def print_table(self, table):
             print(v[1].features)
 
     def data_to_eggroll_table(self, data, jobid, partition=1, work_mode=0):
-        eggroll.init(jobid, mode=work_mode)
-        data_table = eggroll.parallelize(data, include_key=False, partition=10)
+        session.init(jobid, mode=work_mode)
+        data_table = session.parallelize(data, include_key=False, partition=10)
         return data_table
 
     def get_table_instance_feature(self, table_instance):

federatedml/feature/sampler.py

@@ -14,7 +14,7 @@
 #  limitations under the License.
 #
 
-from arch.api import eggroll
+from arch.api import session
 from arch.api import federation
 from sklearn.utils import resample
 from fate_flow.entity.metric import Metric
@@ -119,7 +119,7 @@ def __sample(self, data_inst, sample_ids=None):
                                       n_samples=sample_num,
                                       random_state=self.random_state)
 
-            sample_dtable = eggroll.parallelize(zip(sample_ids, range(len(sample_ids))),
+            sample_dtable = session.parallelize(zip(sample_ids, range(len(sample_ids))),
                                                 include_key=True,
                                                 partition=data_inst._partitions)
             new_data_inst = data_inst.join(sample_dtable, lambda v1, v2: v1)
@@ -152,7 +152,7 @@ def __sample(self, data_inst, sample_ids=None):
                 index = id_maps[sample_ids[i]]
                 new_data.append((i, data_set[index][1]))
 
-            new_data_inst = eggroll.parallelize(new_data,
+            new_data_inst = session.parallelize(new_data,
                                                 include_key=True,
                                                 partition=data_inst._partitions)
 
@@ -299,7 +299,7 @@ def __sample(self, data_inst, sample_ids=None):
 
                 callback(self.tracker, "stratified", callback_metrics)
 
-            sample_dtable = eggroll.parallelize(zip(sample_ids, range(len(sample_ids))),
+            sample_dtable = session.parallelize(zip(sample_ids, range(len(sample_ids))),
                                                 include_key=True,
                                                 partition=data_inst._partitions)
             new_data_inst = data_inst.join(sample_dtable, lambda v1, v2: v1)
@@ -358,7 +358,7 @@ def __sample(self, data_inst, sample_ids=None):
                 index = id_maps[sample_ids[i]]
                 new_data.append((i, data_set[index][1]))
 
-            new_data_inst = eggroll.parallelize(new_data,
+            new_data_inst = session.parallelize(new_data,
                                                 include_key=True,
                                                 partition=data_inst._partitions)
 

federatedml/feature/test/bucket_binning_test.py

@@ -18,9 +18,9 @@
 
 import numpy as np
 
-from arch.api import eggroll
+from arch.api import session
 
-eggroll.init("123")
+session.init("123")
 
 from federatedml.feature.binning.bucket_binning import BucketBinning
 from federatedml.feature.instance import Instance
@@ -43,7 +43,7 @@ def setUp(self):
             tmp_pair = (str(i), inst)
             final_result.append(tmp_pair)
             numpy_array.append(tmp)
-        table = eggroll.parallelize(final_result,
+        table = session.parallelize(final_result,
                                     include_key=True,
                                     partition=10)
 

federatedml/feature/test/imputer_test.py

@@ -2,7 +2,7 @@
 import time
 import unittest
 
-from arch.api import eggroll
+from arch.api import session
 from federatedml.feature.imputer import Imputer
 
 
@@ -42,8 +42,8 @@ def print_table(self, table):
             print(v[1].features)
 
     def data_to_eggroll_table(self, data, jobid, partition=10, work_mode=0):
-        eggroll.init(jobid, mode=work_mode)
-        data_table = eggroll.parallelize(data, include_key=False, partition=partition)
+        session.init(jobid, mode=work_mode)
+        data_table = session.parallelize(data, include_key=False, partition=partition)
         return data_table
 
     def table_to_list(self, table_instance):

federatedml/feature/test/one_hot_test.py

@@ -19,9 +19,9 @@
 
 import unittest
 
-from arch.api import eggroll
+from arch.api import session
 
-eggroll.init("123")
+session.init("123")
 from federatedml.feature.one_hot_encoder import OneHotEncoder
 from federatedml.feature.instance import Instance
 import numpy as np
@@ -44,7 +44,7 @@ def setUp(self):
             tmp_pair = (str(i), inst)
             final_result.append(tmp_pair)
 
-        table = eggroll.parallelize(final_result,
+        table = session.parallelize(final_result,
                                     include_key=True,
                                     partition=10)
         table.schema = {"header": self.header}