Skip to content

Commit

Permalink
Merge pull request #145 from FederatedAI/develop-1.7.0
Browse files Browse the repository at this point in the history
Develop 1.7.0
  • Loading branch information
WebankAITeam authored Nov 23, 2021
2 parents 82926c0 + 9e4d5dc commit 5bd857f
Show file tree
Hide file tree
Showing 60 changed files with 4,942 additions and 252 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

[中文](./README.zh.md)

FATE Flow is a multi-participant scheduling platform for managing secure, privacy-preserving federatedlearning end-to-end pipeline, based on:
FATE Flow is a multi-party federated task security scheduling platform for federated learning end-to-end pipeline

- [Shared-State scheduling architecture](https://storage.googleapis.com/pub-tools-public-publication-data/pdf/41684.pdf)
- Secure multi-participant communication across data centers
- [Shared-State Scheduling Architecture](https://storage.googleapis.com/pub-tools-public-publication-data/pdf/41684.pdf)
- Secure Multi-Party Communication Across Data Centers

Providing production-level service capabilities:

Expand All @@ -27,7 +27,7 @@ Please refer to [FATE](https://github.com/FederatedAI/FATE)

## Documentation

The official FATE Flow documentation is here [https://fate-flow.readthedocs.io/zh/latest/zh/](https://fate-flow.readthedocs.io/zh/latest/zh/)
The official FATE Flow documentation is here [https://fate-flow.readthedocs.io/en/latest/](https://fate-flow.readthedocs.io/en/latest/)

## License
[Apache License 2.0](LICENSE)
4 changes: 2 additions & 2 deletions README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[English](./README.md)

FATE Flow是一个管理安全、隐私保护联邦学习端到端全流程的多参与方调度平台, 基于:
FATE Flow是一个联邦学习端到端全流程的多方联合任务安全调度平台, 基于:

- [共享状态调度架构](https://storage.googleapis.com/pub-tools-public-publication-data/pdf/41684.pdf)
- 跨数据中心的多方安全通信
Expand All @@ -27,7 +27,7 @@ FATE Flow是一个管理安全、隐私保护联邦学习端到端全流程的

## 文档

FATE Flow官方文档在这里[https://fate-flow.readthedocs.io/zh/latest/zh/](https://fate-flow.readthedocs.io/zh/latest/zh/)
FATE Flow官方文档在这里[https://fate-flow.readthedocs.io/en/latest/zh/](https://fate-flow.readthedocs.io/en/latest/zh/)

## License
[Apache License 2.0](LICENSE)
84 changes: 84 additions & 0 deletions doc/cli/checkpoint.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
## Checkpoint

### list

List checkpoints.

```bash
flow checkpoint list --model-id <model_id> --model-version <model_version> --role <role> --party-id <party_id> --component-name <component_name>
```

**Options**

| Parameter | Short Flag | Long Flag | Optional | Description |
| -------------- | ---------- | ------------------ | -------- | -------------- |
| model_id | | `--model-id` | No | Model ID |
| model_version | | `--model-version` | No | Model version |
| role | `-r` | `--role` | No | Party role |
| party_id | `-p` | `--party-id` | No | Party ID |
| component_name | `-cpn` | `--component-name` | No | Component name |

**Example**

```json
{
"retcode": 0,
"retmsg": "success",
"data": [
{
"create_time": "2021-11-07T02:34:54.683015",
"step_index": 0,
"step_name": "step_name",
"models": {
"HeteroLogisticRegressionMeta": {
"buffer_name": "LRModelMeta",
"sha1": "6871508f6e6228341b18031b3623f99a53a87147"
},
"HeteroLogisticRegressionParam": {
"buffer_name": "LRModelParam",
"sha1": "e3cb636fc93675684bff27117943f5bfa87f3029"
}
}
}
]
}
```

### get

Get checkpoint information.

```bash
flow checkpoint get --model-id <model_id> --model-version <model_version> --role <role> --party-id <party_id> --component-name <component_name> --step-index <step_index>
```


**Example**

| Parameter | Short Flag | Long Flag | Optional | Description |
| -------------- | ---------- | ------------------ | -------- | ------------------------------------------- |
| model_id | | `--model-id` | No | Model ID |
| model_version | | `--model-version` | No | Model version |
| role | `-r` | `--role` | No | Party role |
| party_id | `-p` | `--party-id` | No | Party ID |
| component_name | `-cpn` | `--component-name` | No | Component name |
| step_index | | `--step-index` | Yes | Step index, cannot be used with `step_name` |
| step_name | | `--step-name` | Yes | Step name, cannot be used with `step_index` |

**Example**

```json
{
"retcode": 0,
"retmsg": "success",
"data": {
"create_time": "2021-11-07T02:34:54.683015",
"step_index": 0,
"step_name": "step_name",
"models": {
"HeteroLogisticRegressionMeta": "CgJMMhEtQxzr4jYaPxkAAAAAAADwPyIHcm1zcHJvcDD///////////8BOTMzMzMzM8M/QApKBGRpZmZYAQ==",
"HeteroLogisticRegressionParam": "Ig0KAng3EW1qASu+uuO/Ig0KAng0EcNi7a65ReG/Ig0KAng4EbJbl4gvVea/Ig0KAng2EcZwlVZTkOu/Ig0KAngwEVpG8dCbGvG/Ig0KAng5ESJNTx5MLve/Ig0KAngzEZ88H9P8qfO/Ig0KAng1EVfWP8JJv/K/Ig0KAngxEVS0xVXoTem/Ig0KAngyEaApgW32Q/K/KSiiE8AukPs/MgJ4MDICeDEyAngyMgJ4MzICeDQyAng1MgJ4NjICeDcyAng4MgJ4OUj///////////8B"
}
}
}
```
4 changes: 2 additions & 2 deletions doc/cli/checkpoint.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
flow checkpoint list --model-id <model_id> --model-version <model_version> --role <role> --party-id <party_id> --component-name <component_name>
```

**参数**
**选项**

| 参数 | 短格式 | 长格式 | 可选参数 | 说明 |
| -------------- | ------ | ------------------ | -------- | ---------- |
Expand Down Expand Up @@ -53,7 +53,7 @@ flow checkpoint get --model-id <model_id> --model-version <model_version> --role
```


**参数**
**选项**

| 参数 | 短格式 | 长格式 | 可选参数 | 说明 |
| -------------- | ------ | ------------------ | -------- | ------------------------------------- |
Expand Down
175 changes: 175 additions & 0 deletions doc/cli/data.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
## Data

### upload

Used to upload the input data for the modeling task to the storage system supported by fate

```bash
flow data upload -c ${conf_path}
```

Note: conf_path is the parameter path, the specific parameters are as follows

**Options**

| parameter name | required | type | description |
| :------------------ | :--- | :----------- | ------------------------------------------------------------ |
| file | yes | string | data storage path |
| id_delimiter | yes | string | Data separator, e.g. "," |
| head | no | int | Whether the data has a table header | yes | int
| partition | yes | int | Number of data partitions |
| storage_engine | no | storage engine type | default "EGGROLL", also support "HDFS", "LOCALFS", "HIVE", etc. |
| namespace | yes | string | table namespace | yes
| table_name | yes | string | table name |
| storage_address | no | object | The storage address of the corresponding storage engine is required
| use_local_data | no | int | The default is 1, which means use the data from the client's machine; 0 means use the data from the fate flow service's machine.
| drop | no | int | Whether to overwrite uploads |
| extend_sid | no | bool | Whether to add a new column for uuid id, default False |
| auto_increasing_sid | no | bool | Whether the new id column is self-increasing (will only work if extend_sid is True), default False |

**Example**

- eggroll

```json
{
"file": "examples/data/breast_hetero_guest.csv",
"id_delimiter": ",",
"head": 1,
"partition": 10,
"namespace": "experiment",
"table_name": "breast_hetero_guest",
"storage_engine": "EGGROLL"
}
```

- hdfs

```json
{
"file": "examples/data/breast_hetero_guest.csv",
"id_delimiter": ",",
"head": 1,
"partition": 10,
"namespace": "experiment",
"table_name": "breast_hetero_guest",
"storage_engine": "HDFS"
}
```

- localfs

```json
{
"file": "examples/data/breast_hetero_guest.csv",
"id_delimiter": ",",
"head": 1,
"partition": 4,
"namespace": "experiment",
"table_name": "breast_hetero_guest",
"storage_engine": "LOCALFS"
}
```

**return parameters**

| parameter name | type | description |
| :------ | :----- | -------- |
| jobId | string | task id |
| retcode | int | return code |
| retmsg | string | return message |
| data | object | return data |

**Example**

```shell
{
"data": {
"board_url": "http://xxx.xxx.xxx.xxx:8080/index.html#/dashboard?job_id=202111081218319075660&role=local&party_id=0",
"code": 0,
"dsl_path": "/data/projects/fate/jobs/202111081218319075660/job_dsl.json",
"job_id": "202111081218319075660",
"logs_directory": "/data/projects/fate/logs/202111081218319075660",
"message": "success",
"model_info": {
"model_id": "local-0#model",
"model_version": "202111081218319075660"
},
"namespace": "experiment",
"pipeline_dsl_path": "/data/projects/fate/jobs/202111081218319075660/pipeline_dsl.json",
"runtime_conf_on_party_path": "/data/projects/fate/jobs/202111081218319075660/local/0/job_runtime_on_party_conf.json",
"runtime_conf_path":"/data/projects/fate/jobs/202111081218319075660/job_runtime_conf.json",
"table_name": "breast_hetero_host",
"train_runtime_conf_path":"/data/projects/fate/jobs/202111081218319075660/train_runtime_conf.json"
},
"jobId": "202111081218319075660",
"retcode": 0,
"retmsg": "success"
}

```

### download

**Brief description:**

Used to download data from within the fate storage engine to file format data

```bash
flow data download -c ${conf_path}
```

Note: conf_path is the parameter path, the specific parameters are as follows

**Options**

| parameter name | required | type | description |
| :---------- | :--- | :----- | -------------- |
| output_path | yes | string | download_path |
| table_name | yes | string | fate table name |
| namespace | yes | int | fate table namespace |

Example:

```json
{
"output_path": "/data/projects/fate/breast_hetero_guest.csv",
"namespace": "experiment",
"table_name": "breast_hetero_guest"
}
```

**return parameters**

| parameter name | type | description |
| :------ | :----- | -------- |
| retcode | int | return code |
| retmsg | string | return message |
| data | object | return data |

**Example**

```json
{
"data": {
"board_url": "http://xxx.xxx.xxx.xxx:8080/index.html#/dashboard?job_id=202111081457135282090&role=local&party_id=0",
"code": 0,
"dsl_path": "/data/projects/fate/jobs/202111081457135282090/job_dsl.json",
"job_id": "202111081457135282090",
"logs_directory": "/data/projects/fate/logs/202111081457135282090",
"message": "success",
"model_info": {
"model_id": "local-0#model",
"model_version": "202111081457135282090"
},
"pipeline_dsl_path": "/data/projects/fate/jobs/202111081457135282090/pipeline_dsl.json",
"runtime_conf_on_party_path": "/data/projects/fate/jobs/202111081457135282090/local/0/job_runtime_on_party_conf.json",
"runtime_conf_path": "/data/projects/fate/jobs/202111081457135282090/job_runtime_conf.json",
"train_runtime_conf_path": "/data/projects/fate/jobs/202111081457135282090/train_runtime_conf.json"
},
"jobId": "202111081457135282090",
"retcode": 0,
"retmsg": "success"
}

```
8 changes: 4 additions & 4 deletions doc/cli/data.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ flow data upload -c ${conf_path}

注: conf_path为参数路径,具体参数如下

**参数**
**选项**

| 参数名 | 必选 | 类型 | 说明 |
| :------------------ | :--- | :----------- | ------------------------------------------------------------ |
Expand Down Expand Up @@ -71,7 +71,7 @@ flow data upload -c ${conf_path}
}
```

**返回参数**
**返回**

| 参数名 | 类型 | 说明 |
| :------ | :----- | -------- |
Expand Down Expand Up @@ -121,7 +121,7 @@ flow data download -c ${conf_path}

注: conf_path为参数路径,具体参数如下

**参数**
**选项**

| 参数名 | 必选 | 类型 | 说明 |
| :---------- | :--- | :----- | -------------- |
Expand All @@ -139,7 +139,7 @@ flow data download -c ${conf_path}
}
```

**返回参数**
**返回**

| 参数名 | 类型 | 说明 |
| :------ | :----- | -------- |
Expand Down
Loading

0 comments on commit 5bd857f

Please sign in to comment.