Merge pull request FederatedAI#526 from FederatedAI/feature-1.0.1-sup…

…port_dataset_in_version Feature 1.0.1 support dataset in version
pf-wang · Sep 3, 2019 · 4e22c0e · 4e22c0e
2 parents acb0f8d + 1ec273e
commit 4e22c0e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/arch/api/utils/upload.py b/arch/api/utils/upload.py
@@ -142,7 +142,8 @@ def generate_table_name(input_file_path):
                 table_name = _table_name
             eggroll.init(job_id=args.job_id, mode=work_mode)
             input_data = read_data(input_file_path, table_name, namespace, head)
-            data_table = storage.save_data(input_data, name=table_name, namespace=namespace, partition=partition)
+            in_version = job_config.get('in_version', False)
+            data_table = storage.save_data(input_data, name=table_name, namespace=namespace, partition=partition, in_version=in_version)
             print("------------load data finish!-----------------")
             print("file: {}".format(input_file_path))
             print("total data_count: {}".format(data_table.count()))

diff --git a/arch/api/utils/version_control.py b/arch/api/utils/version_control.py
@@ -126,7 +126,3 @@ def get_commit_tmp_table(data_table_namespace):
                                       partition=1, create_if_missing=True, error_if_exist=False)
     return version_tmp_table
 
-
-def get_id_library_table_name():
-    id_library_info = eggroll.table('info', 'id_library', partition=10, create_if_missing=True, error_if_exist=False)
-    return id_library_info.get("use_data_id")
diff --git a/cluster-deploy/example-dir-tree/serving-server/conf/serving-server.properties b/cluster-deploy/example-dir-tree/serving-server/conf/serving-server.properties
@@ -17,6 +17,7 @@ coordinator=webank
 ip=127.0.0.1
 port=8000
 workMode=0
+serviceRoleName=serving
 inferenceWorkerThreadNum=10
 #storage
 # maybe python/data/

diff --git a/...ing/federatedml/src/main/java/com/webank/ai/fate/serving/federatedml/model/BaseModel.java b/...ing/federatedml/src/main/java/com/webank/ai/fate/serving/federatedml/model/BaseModel.java
@@ -101,12 +101,12 @@ protected ReturnResult getFederatedPredictFromRemote(Context  context,FederatedP
 
             metaDataBuilder.setSrc(
                     topicBuilder.setPartyId(String.valueOf(srcParty.getPartyId())).
-                            setRole("serving")
+                            setRole(Configuration.getProperty("serviceRoleName", "serving"))
                             .setName("partnerPartyName")
                             .build());
             metaDataBuilder.setDst(
                     topicBuilder.setPartyId(String.valueOf(dstParty.getPartyId()))
-                            .setRole("serving")
+                            .setRole(Configuration.getProperty("serviceRoleName", "serving"))
                             .setName("partyName")
                             .build());
             metaDataBuilder.setCommand(Proxy.Command.newBuilder().setName("federatedInference").build());

diff --git a/fate-serving/serving-server/src/main/resources/serving-server.properties b/fate-serving/serving-server/src/main/resources/serving-server.properties
@@ -17,6 +17,7 @@ coordinator=webank
 ip=127.0.0.1
 port=8000
 workMode=0
+serviceRoleName=serving
 inferenceWorkerThreadNum=10
 #storage
 # maybe python/data/