Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 2.1.0 #152

Merged
merged 19 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8301dce
add support for fate-llm 2.0
mgqa34 Feb 19, 2024
f6ffd1c
support distribution of source.yaml for homo-nn
mgqa34 Feb 20, 2024
cfb4ca6
Merge pull request #146 from FederatedAI/feature-2.1.0-support_llm
talkingwallace Feb 20, 2024
edc8467
Add data loader support Signed-off-by: weijingchen <talkingwallace@so…
talkingwallace Feb 21, 2024
e5d87f6
Renam in&out var Signed-off-by: weijingchen <talkingwallace@sohu.com>
talkingwallace Feb 22, 2024
f0760f7
rename loader Signed-off-by: weijingchen <talkingwallace@sohu.com>
talkingwallace Feb 22, 2024
e2554da
fix upload
zhihuiwan Feb 26, 2024
8ca3e56
Merge pull request #147 from FederatedAI/feature-2.1.0-fate_flow
zhihuiwan Feb 26, 2024
927e718
rename union input: input data list --> input datas
nemirorox Feb 27, 2024
301e3f9
Merge pull request #148 from FederatedAI/feature-2.1.0-union-input
mgqa34 Feb 27, 2024
b20ab4a
update evaluation Signed-off-by: weijingchen <talkingwallace@sohu.com>
talkingwallace Feb 27, 2024
dfde378
edit doc
nemirorox Feb 28, 2024
48a394a
Merge pull request #149 from FederatedAI/feature-2.1.0-union-input
mgqa34 Feb 28, 2024
4e5b855
edit load config
nemirorox Feb 29, 2024
4871f0a
Merge pull request #150 from FederatedAI/feature-2.1.0-union-input
mgqa34 Feb 29, 2024
6059d9d
update version of fate_client
mgqa34 Feb 29, 2024
5a8bf51
update version of component define yaml
mgqa34 Feb 29, 2024
ceea0d8
Merge pull request #151 from FederatedAI/feature-2.1.0-update_version
mgqa34 Feb 29, 2024
ed44037
update release note of fate-client 2.1.0
mgqa34 Feb 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## Release 2.1.0
### Major improvements
* Pipeline: add supports for fate-llm 2.0
* newly added LLMModelLoader, LLMDatasetLoader, LLMDataFuncLoader
* newly added configuration parsing of seq2seq_runner and ot_runner
* Pipeline: unified input interface of components

## Release 2.0.0
### Feature Highlights
> FATE-Client 2.0: Building Scalable Federated DSL for Application Layer Interconnection
Expand Down
44 changes: 22 additions & 22 deletions doc/pipeline.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ Below lists data input and output of all components:
| Coordinated-LR | CoordinatedLR | train_data, validate_data, test_data, cv_data | train_output_data, validate_output_data, test_output_data, cv_output_datas |
| Coordinated-LinR | CoordinatedLinR | train_data, validate_data, test_data, cv_data | train_output_data, validate_output_data, test_output_data, cv_output_datas |
| Homo-LR | HomoLR | train_data, validate_data, test_data, cv_data | train_output_data, validate_output_data, test_output_data, cv_output_datas |
| Homo-NN | HomoNN | train_data, validate_data, test_data | train_data_output, predict_data_output|
| Hetero-NN | HeteroNN | train_data, validate_data, test_data | train_data_output, predict_data_output|
| Hetero Secure Boosting | HeteroSecureBoost | train_data, validate_data, test_data, cv_data | train_data_output, test_output_data, cv_output_datas |
| Evaluation | Evaluation | input_data | |
| Union | Union | input_data_list | output_data |
| Homo-NN | HomoNN | train_data, validate_data, test_data | train_output_data, test_output_data |
| Hetero-NN | HeteroNN | train_data, validate_data, test_data | train_output_data, test_output_data |
| Hetero Secure Boosting | HeteroSecureBoost | train_data, validate_data, test_data, cv_data | train_output_data, test_output_data, cv_output_datas |
| Evaluation | Evaluation | input_datas | |
| Union | Union | input_datas | output_data |

### Model

Expand All @@ -114,23 +114,23 @@ Model training components also may take `warm_start_model`, but note that only o

Below lists model input and output of all components:

| Algorithm | Component Name | Model Input | Model Output |
|--------------------------|------------------------|-------------------------------|--------------|
| PSI | PSI | | |
| Sampling | Sample | | |
| Data Split | DataSplit | | |
| Feature Scale | FeatureScale | input_model | output_model |
| Data Statistics | Statistics | | output_model |
| Hetero Feature Binning | HeteroFeatureBinning | input_model | output_model |
| Hetero Feature Selection | HeteroFeatureSelection | input_models, input_model | output_model |
| Coordinated-LR | CoordinatedLR | input_model, warm_start_model | output_model |
| Coordinated-LinR | CoordinatedLinR | input_model, warm_start_model | output_model |
| Homo-LR | HomoLR | input_model, warm_start_model | output_model |
| Homo-NN | HomoNN | train_model_input, predict_model_input, train_model_output | train_model_output |
| Hetero-NN|HeteroNN|train_model_input, predict_model_input, train_model_output| train_model_output|
| Hetero Secure Boosting | HeteroSecureBoost | train_model_input, predict_model_input, train_model_output | train_model_output |
| Evaluation | Evaluation | | |
| Union | Union | | |
| Algorithm | Component Name | Model Input | Model Output |
|--------------------------|------------------------|--------------------------------|--------------|
| PSI | PSI | | |
| Sampling | Sample | | |
| Data Split | DataSplit | | |
| Feature Scale | FeatureScale | input_model | output_model |
| Data Statistics | Statistics | | output_model |
| Hetero Feature Binning | HeteroFeatureBinning | input_model | output_model |
| Hetero Feature Selection | HeteroFeatureSelection | input_models, input_model | output_model |
| Coordinated-LR | CoordinatedLR | input_model, warm_start_model | output_model |
| Coordinated-LinR | CoordinatedLinR | input_model, warm_start_model | output_model |
| Homo-LR | HomoLR | input_model, warm_start_model | output_model |
| Homo-NN | HomoNN | input_model, warm_start_model | output_model |
| Hetero-NN | HeteroNN | input_model, warm_start_model | output_model |
| Hetero Secure Boosting | HeteroSecureBoost | input_model, warm_start_model | output_model |
| Evaluation | Evaluation | | |
| Union | Union | | |

## Build A Pipeline

Expand Down
1 change: 1 addition & 0 deletions python/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
include fate_client/pipeline/component_define/fate/*.yaml
include fate_client/pipeline/*.yaml
include fate_client/*.yaml
include fate_client/pipeline/components/fate/nn/*.yaml
2 changes: 1 addition & 1 deletion python/fate_client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "2.0.0"
__version__ = "2.1.0"
4 changes: 2 additions & 2 deletions python/fate_client/flow_sdk/api/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ def upload(self, file: str, head: bool, partitions: int, meta: dict, namespace:
{'code': 0, 'message': 'success','data':{...}]}
"""
kwargs = locals()
if not os.path.exists(file):
raise Exception(f"{file} is not exist, please check the file path")
# if not os.path.exists(file):
# raise Exception(f"{file} is not exist, please check the file path")
params = filter_invalid_params(**kwargs)
return self._post(url='/data/component/upload', json=params)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ component:
name: coordinated_linr
description: ''
provider: fate
version: 2.0.0
labels: [ ]
version: 2.1.0
labels: []
roles:
- guest
- host
Expand Down Expand Up @@ -373,8 +373,9 @@ component:
types:
- json_metric
optional: false
stages: [ ]
roles: [ ]
stages: []
roles: []
description: metric, invisible for user
is_multi: false
schema_version: v1

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ component:
name: coordinated_lr
description: ''
provider: fate
version: 2.0.0
labels: [ ]
version: 2.1.0
labels: []
roles:
- guest
- host
Expand Down Expand Up @@ -383,8 +383,9 @@ component:
types:
- json_metric
optional: false
stages: [ ]
roles: [ ]
stages: []
roles: []
description: metric, invisible for user
is_multi: false
schema_version: v1

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ component:
name: data_split
description: ''
provider: fate
version: 2.0.0
labels: [ ]
version: 2.1.0
labels: []
roles:
- guest
- host
Expand Down Expand Up @@ -111,7 +111,7 @@ component:
- host
description: ''
is_multi: false
model: { }
model: {}
output_artifacts:
data:
train_output_data:
Expand Down Expand Up @@ -147,7 +147,7 @@ component:
- host
description: ''
is_multi: false
model: { }
model: {}
metric:
metric:
types:
Expand All @@ -161,3 +161,4 @@ component:
description: metric, invisible for user
is_multi: false
schema_version: v1

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ component:
name: dataframe_transformer
description: ''
provider: fate
version: 2.0.0
version: 2.1.0
labels: []
roles:
- local
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ component:
name: evaluation
description: ''
provider: fate
version: 2.0.0
version: 2.1.0
labels: []
roles:
- guest
Expand Down Expand Up @@ -54,7 +54,7 @@ component:
use 'label' in the input dataframe
input_artifacts:
data:
input_data:
input_datas:
types:
- dataframe
optional: false
Expand Down Expand Up @@ -82,3 +82,4 @@ component:
description: metric, invisible for user
is_multi: false
schema_version: v1

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ component:
name: feature_correlation
description: ''
provider: fate
version: 2.0.0
labels: [ ]
version: 2.1.0
labels: []
roles:
- guest
- host
Expand Down Expand Up @@ -65,9 +65,9 @@ component:
- host
description: ''
is_multi: false
model: { }
model: {}
output_artifacts:
data: { }
data: {}
model:
output_model:
types:
Expand All @@ -93,3 +93,4 @@ component:
description: metric, invisible for user
is_multi: false
schema_version: v1

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ component:
name: feature_scale
description: ''
provider: fate
version: 2.0.0
version: 2.1.0
labels: []
roles:
- guest
Expand All @@ -29,7 +29,7 @@ component:
title: typing.Union[list, dict]
anyOf:
- type: array
items: { }
items: {}
- type: object
default:
- 0
Expand Down Expand Up @@ -164,8 +164,9 @@ component:
types:
- json_metric
optional: false
stages: [ ]
roles: [ ]
stages: []
roles: []
description: metric, invisible for user
is_multi: false
schema_version: v1

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ component:
name: hetero_feature_binning
description: ''
provider: fate
version: 2.0.0
labels: [ ]
version: 2.1.0
labels: []
roles:
- guest
- host
Expand Down Expand Up @@ -266,8 +266,9 @@ component:
types:
- json_metric
optional: false
stages: [ ]
roles: [ ]
stages: []
roles: []
description: metric, invisible for user
is_multi: false
schema_version: v1

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ component:
name: hetero_feature_selection
description: ''
provider: fate
version: 2.0.0
labels: [ ]
version: 2.1.0
labels: []
roles:
- guest
- host
Expand Down Expand Up @@ -178,8 +178,8 @@ component:
manual_param:
type: ModelMetaclass
default:
keep_col: [ ]
filter_out_col: [ ]
keep_col: []
filter_out_col: []
optional: true
description: manual filter param
type_meta:
Expand All @@ -188,13 +188,13 @@ component:
properties:
keep_col:
title: Keep Col
default: [ ]
default: []
type: array
items:
type: string
filter_out_col:
title: Filter Out Col
default: [ ]
default: []
type: array
items:
type: string
Expand Down Expand Up @@ -309,8 +309,9 @@ component:
types:
- json_metric
optional: false
stages: [ ]
roles: [ ]
stages: []
roles: []
description: metric, invisible for user
is_multi: false
schema_version: v1

13 changes: 7 additions & 6 deletions python/fate_client/pipeline/component_define/fate/hetero_nn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ component:
name: hetero_nn
description: ''
provider: fate
version: 2.0.0
version: 2.1.0
labels: []
roles:
- guest
Expand Down Expand Up @@ -87,7 +87,7 @@ component:
description: ''
is_multi: false
model:
train_model_input:
warm_start_model:
types:
- model_directory
optional: true
Expand All @@ -98,7 +98,7 @@ component:
- host
description: ''
is_multi: false
predict_model_input:
input_model:
types:
- model_directory
optional: false
Expand All @@ -111,7 +111,7 @@ component:
is_multi: false
output_artifacts:
data:
train_data_output:
train_output_data:
types:
- dataframe
optional: true
Expand All @@ -122,7 +122,7 @@ component:
- host
description: ''
is_multi: false
predict_data_output:
test_output_data:
types:
- dataframe
optional: true
Expand All @@ -134,7 +134,7 @@ component:
description: ''
is_multi: false
model:
train_model_output:
output_model:
types:
- model_directory
optional: true
Expand All @@ -155,3 +155,4 @@ component:
description: metric, invisible for user
is_multi: false
schema_version: v1

Loading