Skip to content

sync latest code - #1

Merged
jsuper merged 924 commits into
jsuper:masterfrom
FederatedAI:master
Mar 21, 2023
Merged

jsuper merged 924 commits into
jsuper:masterfrom
FederatedAI:master

Conversation

@jsuper

@jsuper jsuper commented Mar 21, 2023

Copy link
Copy Markdown
Owner

Signed-off-by: githubID email

Fixes ISSUE #xxx

Changes:

nemirorox and others added 30 commits November 11, 2022 14:20
Signed-off-by: nemirorox <yolandawu131@gmail.com>
Signed-off-by: nemirorox <yolandawu131@gmail.com>
Signed-off-by: nemirorox <yolandawu131@gmail.com>
Signed-off-by: Jat <jat@sinosky.org>
Signed-off-by: mgqa34 <mgq3374541@163.com>
Signed-off-by: mgqa34 <mgq3374541@163.com>
…b.com:FederatedAI/FATE into feature-1.10-ecdh-mpsi

� Conflicts:
�	python/federatedml/statistic/intersect/intersect_model.py
Signed-off-by: nemirorox <yolandawu131@gmail.com>
Signed-off-by: paulbaogang <paulbao@webank.com>
Signed-off-by: Fang, Xiaoran <xiaoran.fang@intel.com>
Signed-off-by: Jat <jat@sinosky.org>
Signed-off-by: Jat <jat@sinosky.org>
Signed-off-by: Jat <jat@sinosky.org>
…com:FederatedAI/FATE into feature-1.10-binning

� Conflicts:
�	python/federatedml/feature/binning/iv_calculator.py
�	python/federatedml/feature/hetero_feature_binning/hetero_binning_guest.py
Signed-off-by: Fang, Xiaoran <xiaoran.fang@intel.com>
Signed-off-by: paulbaogang <paulbao@webank.com>
Signed-off-by: nemirorox <yolandawu131@gmail.com>
Signed-off-by: nemirorox <yolandawu131@gmail.com>
Signed-off-by: nemirorox <yolandawu131@gmail.com>
Signed-off-by: nemirorox <yolandawu131@gmail.com>
Signed-off-by: weijingchen <talkingwallace@sohu.com>
Signed-off-by: weijingchen <talkingwallace@sohu.com>
talkingwallace and others added 29 commits December 27, 2022 15:47
Signed-off-by: weijingchen <talkingwallace@sohu.com>
Signed-off-by: weijingchen <talkingwallace@sohu.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: mgqa34 <mgq3374541@163.com>
Merge fate-v1.10.0's update into master
Signed-off-by: mgqa34 <mgq3374541@163.com>
Signed-off-by: mgqa34 <mgq3374541@163.com>
Signed-off-by: Jat <jat@sinosky.org>
Signed-off-by: NicerOuZa <378292586@qq.com>
Signed-off-by: NicerOuZa <378292586@qq.com>
@jsuper
jsuper merged commit a9b27d4 into jsuper:master Mar 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.