From 2cdfa16bb4b2004b5ec85f1fa52e08e1b2a92b5a Mon Sep 17 00:00:00 2001 From: aisen <1431371354@qq.com> Date: Fri, 22 Jul 2022 14:10:42 +0800 Subject: [PATCH 1/4] 2022/07/22 fix_vert_binning_send_date --- .../binning/vertfeaturebinning/default_runtime.json | 2 +- .../vertfeaturebinning/vert_binning_promoter.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/kernel/components/binning/vertfeaturebinning/default_runtime.json b/kernel/components/binning/vertfeaturebinning/default_runtime.json index b1581755c..6fc62d73b 100644 --- a/kernel/components/binning/vertfeaturebinning/default_runtime.json +++ b/kernel/components/binning/vertfeaturebinning/default_runtime.json @@ -10,7 +10,7 @@ "bin_names": [], "category_indexes": [], "category_names": [], - "local_only": true, + "local_only": false, "transform_param": { "is_serving_model": false, "transform_cols": -1, diff --git a/kernel/components/binning/vertfeaturebinning/vert_binning_promoter.py b/kernel/components/binning/vertfeaturebinning/vert_binning_promoter.py index 1e8f4bbbf..bdcd45674 100644 --- a/kernel/components/binning/vertfeaturebinning/vert_binning_promoter.py +++ b/kernel/components/binning/vertfeaturebinning/vert_binning_promoter.py @@ -241,6 +241,7 @@ class VertFeatureBinningPromoter(BaseVertFeatureBinning): provider_binning_obj = CustomBinning(provider_model_params) provider_binning_obj.cal_iv_woe(result_counts, provider_model_params.adjustment_factor) provider_binning_obj.set_role_party(role=consts.PROVIDER, member_id=provider_member_id) + provider_binning_obj = self.restructure_binning_result(provider_binning_obj) self.provider_results.append(provider_binning_obj) per_provider_result["result"] = provider_binning_obj per_provider_result["method"] = provider_model_params.method @@ -250,4 +251,12 @@ class VertFeatureBinningPromoter(BaseVertFeatureBinning): per_provider_result_copy = copy.deepcopy(per_provider_result) per_provider_results_list.append(per_provider_result_copy) all_provider_result_list.append(per_provider_results_list) - return all_provider_result_list \ No newline at end of file + return all_provider_result_list + + def restructure_binning_result(self, binning_obj): + to_none_list = ["event_count_array", "event_rate_array", "non_event_count_array", "non_event_rate_array"] + for bin_result_obj in binning_obj.bin_results.all_cols_results.items(): + if bin_result_obj: + for static in to_none_list: + setattr(bin_result_obj[1], static, None) + return binning_obj \ No newline at end of file -- Gitee From 2060ea0b7bfdd32e4be2676436635397d23e36b7 Mon Sep 17 00:00:00 2001 From: fuxingbit Date: Tue, 9 Aug 2022 11:22:58 +0800 Subject: [PATCH 2/4] Update federated_learning.md --- docs/federated_learning/federated_learning.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/federated_learning/federated_learning.md b/docs/federated_learning/federated_learning.md index b8c74bba5..f2d5df702 100644 --- a/docs/federated_learning/federated_learning.md +++ b/docs/federated_learning/federated_learning.md @@ -2,7 +2,7 @@ 在机器学习领域，通常情况下更多的样本、更丰富的维度，有助于开发出更优质的模型。 -所以我们希望采取联合建模的方式，增加样本数或维度来提升模型品质，但往往联合建模面临着数据隐私、安全合规等问题的阻碍，联邦学习建模技术应运而生而生。 +所以我们希望采取联合建模的方式，增加样本数或维度来提升模型品质，但往往联合建模面临着数据隐私、安全合规等问题的阻碍，联邦学习建模技术应运而生。 联邦学习（Federated Learning）是机器学习与隐私计算结合的一种技术，它实现了多个数据集在不交换样本的前提下进行多方联合机器学习建模。 @@ -75,4 +75,4 @@ WeFe 联邦学习系统中共有三种角色： 混合联邦在一个建模任务中同时包含了横向联邦与纵向联邦，由于包含纵向联邦，所以所有参与者都只能得到与己方特征相关的部分的模型。 -以上图为例，模型的后续使用需要 **A + B** 或者 **C + B** 才能拼合出一个完整的模型进行预测。 \ No newline at end of file +以上图为例，模型的后续使用需要 **A + B** 或者 **C + B** 才能拼合出一个完整的模型进行预测。 -- Gitee From ec806c34aefe4f711e92cebc0c232a6548f5083a Mon Sep 17 00:00:00 2001 From: "yuxin.zhang" Date: Tue, 9 Aug 2022 14:13:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4union=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../welab/wefe/common/data/mongodb/config/MongoConfig.java | 5 ----- .../service/DataSetMemberPermissionContractService.java | 1 - .../wefe/union/service/service/DatasetContractService.java | 1 - 3 files changed, 7 deletions(-) diff --git a/common/java/common-data-mongodb/src/main/java/com/welab/wefe/common/data/mongodb/config/MongoConfig.java b/common/java/common-data-mongodb/src/main/java/com/welab/wefe/common/data/mongodb/config/MongoConfig.java index 0b064ccf5..b872bc46f 100644 --- a/common/java/common-data-mongodb/src/main/java/com/welab/wefe/common/data/mongodb/config/MongoConfig.java +++ b/common/java/common-data-mongodb/src/main/java/com/welab/wefe/common/data/mongodb/config/MongoConfig.java @@ -53,11 +53,6 @@ public class MongoConfig { return new SimpleMongoDbFactory(mongoClient, databaseName); } - @Bean - public MongoTransactionManager transactionManager(MongoDbFactory mongoDbFactory) { - return new MongoTransactionManager(mongoDbFactory); - } - @Bean public MongoTemplate mongoTemplate(MongoDbFactory mongoDbFactory) { return new MongoTemplate(mongoDbFactory, getConverter(mongoDbFactory)); diff --git a/union/union-service/src/main/java/com/welab/wefe/union/service/service/DataSetMemberPermissionContractService.java b/union/union-service/src/main/java/com/welab/wefe/union/service/service/DataSetMemberPermissionContractService.java index dfe5e52a9..856719f5f 100644 --- a/union/union-service/src/main/java/com/welab/wefe/union/service/service/DataSetMemberPermissionContractService.java +++ b/union/union-service/src/main/java/com/welab/wefe/union/service/service/DataSetMemberPermissionContractService.java @@ -44,7 +44,6 @@ import java.util.stream.Collectors; * @author yuxin.zhang */ @Service -@Transactional(rollbackFor = Exception.class) public class DataSetMemberPermissionContractService extends AbstractContractService { private static final Logger LOG = LoggerFactory.getLogger(DataSetMemberPermissionContractService.class); diff --git a/union/union-service/src/main/java/com/welab/wefe/union/service/service/DatasetContractService.java b/union/union-service/src/main/java/com/welab/wefe/union/service/service/DatasetContractService.java index 62cd31a73..967f8fb1b 100644 --- a/union/union-service/src/main/java/com/welab/wefe/union/service/service/DatasetContractService.java +++ b/union/union-service/src/main/java/com/welab/wefe/union/service/service/DatasetContractService.java @@ -36,7 +36,6 @@ import java.util.List; * @author yuxin.zhang */ @Service -@Transactional(rollbackFor = Exception.class) public class DatasetContractService extends AbstractContractService { private final BlockChainContext blockChainContext = BlockChainContext.getInstance(); -- Gitee From 31d9a9432628fc8ab38a86a955edc764912385dd Mon Sep 17 00:00:00 2001 From: "winter.zou" Date: Fri, 19 Aug 2022 16:13:28 +0800 Subject: [PATCH 4/4] update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ea4ebccfd..88f397f48 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ gen .settings/ .classpath .vscode/ - +.factorypath # 排除编译输出 *.class -- Gitee