Skip to content

Commit

Permalink
Merge pull request #5422 from FederatedAI/dev-2.0.0-rc
Browse files Browse the repository at this point in the history
Dev 2.0.0 rc
  • Loading branch information
dylan-fan authored Dec 29, 2023
2 parents a624b13 + f544453 commit 1fdcab3
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 18 deletions.
12 changes: 8 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
[submodule "eggroll"]
path = eggroll
url = https://github.com/FederatedAI/eggroll.git
branch = dev-3.0.0-rc
branch = v3.0.0
[submodule "fate_client"]
path = fate_client
url = https://github.com/FederatedAI/FATE-Client
branch = dev-2.0.0-rc
branch = v2.0.0
[submodule "fate_flow"]
path = fate_flow
url = https://github.com/FederatedAI/FATE-Flow
branch = dev-2.0.0-rc
branch = v2.0.0
[submodule "fate_test"]
path = fate_test
url = https://github.com/FederatedAI/FATE-Test.git
branch = dev-2.0.0-rc
branch = v2.0.0
[submodule "fate_board"]
path = fate_board
url = https://github.com/FederatedAI/FATE-Board.git
branch = v2.0.0
10 changes: 5 additions & 5 deletions deploy/standalone-deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ FATE-Flow provides federated job life cycle management, includes scheduling, dat

##### 2.2.1.1 Installing FATE, FATE-Flow, FATE-Client
```shell
pip install fate_client[fate,fate_flow]==2.0.0.b0
pip install fate_client[fate,fate_flow]==2.0.0
```
#### 2.2.1.2 Service Initialization
```shell
Expand Down Expand Up @@ -71,7 +71,7 @@ users can directly import fate and use built-in algorithms and secure protocols

#### 2.2.2.1 Installing FATE
```shell
pip install pyfate==2.0.0.b0
pip install pyfate==2.0.0
```
#### 2.2.2.2 Using Guides
Refer to [examples](../../doc/2.0/fate/ml)
Expand All @@ -90,13 +90,13 @@ Refer to [examples](../../doc/2.0/fate/ml)
Set the necessary environment variables for deployment (note that environment variables set in this way are only valid for the current terminal session. If you open a new terminal session, such as logging in again or opening a new window, you will need to reset them).

```bash
export version={FATE version number for this deployment, e.g., 2.0.0-beta}
export version={FATE version number for this deployment, e.g., 2.0.0}
```

Example:

```bash
export version=2.0.0-beta
export version=2.0.0
```

### 3.2 Pull Docker Images
Expand Down Expand Up @@ -131,7 +131,7 @@ docker run -it --name standalone_fate -p 8080:8080 federatedai/standalone_fate:$
### 3.4 Testing

```bash
source /data/projects/fate/fate_flow/bin/init_env.sh
source /data/projects/fate/bin/init_env.sh
```

- [Test Items](#5-Test-Items)
Expand Down
10 changes: 5 additions & 5 deletions deploy/standalone-deploy/README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ FATE-Flow提供了联邦作业生命周期管理,包括调度、数据管理

##### 2.2.1.1 安装FATE、FATE-Flow、FATE-Client
```shell
pip install fate_client[fate,fate_flow]==2.0.0.b0
pip install fate_client[fate,fate_flow]==2.0.0
```

#### 2.2.1.2 服务初始化
Expand Down Expand Up @@ -70,7 +70,7 @@ FATE提供多种联邦算法和安全协议, 用户可以在安装 FATE 后直

#### 2.2.1.1 安装 FATE
```shell
pip install pyfate==2.0.0.b0
pip install pyfate==2.0.0
```

#### 2.2.2.2 使用指引
Expand All @@ -92,13 +92,13 @@ pip install pyfate==2.0.0.b0
设置部署所需环境变量(注意,通过以下方式设置的环境变量仅在当前终端会话中有效。如果打开新的终端会话,例如重新登录或打开新窗口,请重新设置)。

```bash
export version={本次部署的 FATE 版本号, 如 2.0.0-beta}
export version={本次部署的 FATE 版本号, 如 2.0.0}
```

示例:

```bash
export version=2.0.0-beta
export version=2.0.0
```

### 3.2 拉取镜像
Expand Down Expand Up @@ -133,7 +133,7 @@ docker run -it --name standalone_fate -p 8080:8080 federatedai/standalone_fate:$
### 3.4 测试

```bash
source /data/projects/fate/fate_flow/bin/init_env.sh
source /data/projects/fate/bin/init_env.sh
```

- [测试项](#5-测试项)
Expand Down
2 changes: 1 addition & 1 deletion eggroll
1 change: 1 addition & 0 deletions fate_board
Submodule fate_board added at 24574a
2 changes: 1 addition & 1 deletion fate_client
Submodule fate_client updated 54 files
+5 −1 README.md
+6 −12 RELEASE.md
+136 −0 doc/cli_index.md
+40 −42 doc/pipeline.md
+1 −1 python/fate_client/__init__.py
+2 −1 python/fate_client/flow_cli/build/build_doc.py
+16 −0 python/fate_client/flow_cli/build/doc/data.md
+18 −0 python/fate_client/flow_cli/build/doc/table.md
+1 −0 python/fate_client/flow_cli/utils/args_desc.py
+6 −1 python/fate_client/flow_cli/utils/cli_args.py
+3 −3 python/fate_client/flow_sdk/api/client.py
+35 −20 python/fate_client/flow_sdk/api/data.py
+15 −15 python/fate_client/flow_sdk/api/log.py
+18 −7 python/fate_client/flow_sdk/api/model.py
+49 −54 python/fate_client/flow_sdk/api/output.py
+18 −6 python/fate_client/flow_sdk/api/permission.py
+14 −14 python/fate_client/flow_sdk/api/provider.py
+1 −0 python/fate_client/flow_sdk/api/site.py
+11 −10 python/fate_client/flow_sdk/api/table.py
+7 −7 python/fate_client/flow_sdk/api/task.py
+5 −0 python/fate_client/pipeline/adapters/bfia/component_define/unionpay/hetero_lr.yaml
+5 −0 python/fate_client/pipeline/adapters/bfia/component_define/unionpay/hetero_secureboost.yaml
+5 −0 python/fate_client/pipeline/adapters/bfia/component_define/unionpay/intersection.yaml
+2 −0 python/fate_client/pipeline/adapters/bfia/components/unionpay/hetero_lr.py
+2 −0 python/fate_client/pipeline/adapters/bfia/components/unionpay/hetero_secureboost.py
+2 −0 python/fate_client/pipeline/adapters/bfia/components/unionpay/intersection.py
+29 −36 python/fate_client/pipeline/adapters/bfia/translator/dsl_translator.py
+1 −1 python/fate_client/pipeline/component_define/fate/coordinated_linr.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/coordinated_lr.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/data_split.yaml
+0 −97 python/fate_client/pipeline/component_define/fate/dataframe_io_test.yaml
+37 −44 python/fate_client/pipeline/component_define/fate/dataframe_transformer.yaml
+3 −4 python/fate_client/pipeline/component_define/fate/evaluation.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/feature_correlation.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/feature_scale.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/hetero_feature_binning.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/hetero_feature_selection.yaml
+1 −2 python/fate_client/pipeline/component_define/fate/hetero_nn.yaml
+25 −24 python/fate_client/pipeline/component_define/fate/hetero_sbt.yaml
+16 −11 python/fate_client/pipeline/component_define/fate/homo_lr.yaml
+1 −2 python/fate_client/pipeline/component_define/fate/homo_nn.yaml
+2 −2 python/fate_client/pipeline/component_define/fate/psi.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/reader.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/sample.yaml
+5 −4 python/fate_client/pipeline/component_define/fate/sshe_linr.yaml
+5 −4 python/fate_client/pipeline/component_define/fate/sshe_lr.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/statistics.yaml
+1 −1 python/fate_client/pipeline/component_define/fate/union.yaml
+1 −1 python/fate_client/pipeline/components/fate/__init__.py
+0 −35 python/fate_client/pipeline/components/fate/dataframe_io_test.py
+4 −5 python/fate_client/pipeline/components/fate/dataframe_transformer.py
+1 −1 python/fate_client/pipeline/entity/dag.py
+5 −0 python/fate_client/pipeline/scheduler/dag_parser.py
+2 −2 python/setup.py
2 changes: 1 addition & 1 deletion fate_flow
Submodule fate_flow updated 74 files
+9 −15 RELEASE.md
+1 −8 bin/init_env.sh
+0 −11 bin/service.sh
+31 −39 conf/service_conf.yaml
+122 −0 doc/data_access.md
+121 −0 doc/data_access.zh.md
+46 −76 doc/fate_flow.md
+37 −66 doc/fate_flow.zh.md
+ doc/images/fate_arch.png
+ doc/images/fate_flow_arch.png
+ doc/images/fate_flow_component_registry.png
+ doc/images/fate_flow_logical_arch.png
+ doc/images/fate_flow_resource_process.png
+ doc/images/flow_cluster.png
+ doc/images/muti_protocol.png
+ doc/images/open_flow.png
+ doc/images/open_flow/pipeline_unionpay_lr.png
+ doc/images/open_flow/pipeline_unionpay_sbt.png
+ doc/images/open_flow/upload_data.png
+ doc/images/schedule_for_component.png
+ doc/images/upload_data.png
+495 −0 doc/job_scheduling.md
+498 −0 doc/job_scheduling.zh.md
+147 −0 doc/provider_register.md
+145 −0 doc/provider_register.zh.md
+266 −142 doc/quick_start.md
+17 −120 doc/quick_start.zh.md
+87 −12 doc/swagger/swagger.yaml
+28 −59 doc/system_conf.md
+27 −63 doc/system_conf.zh.md
+1 −1 examples/bfia/fate/component_define/sbt算法描述.json
+10 −18 examples/bfia/fate/job/dataframe_transformer.yaml
+17 −15 examples/bfia/fate/job/psi_lr.yaml
+18 −16 examples/bfia/fate/job/psi_sbt.yaml
+48 −0 examples/bfia/fate/pipeline/test_dataframe_transformer.py
+58 −0 examples/bfia/fate/pipeline/test_lr.py
+58 −0 examples/bfia/fate/pipeline/test_sbt.py
+3 −3 examples/bfia/fate/register/fate_components.json
+75 −0 examples/bfia/unionpay/pipeline/test_unionpay_lr.py
+77 −0 examples/bfia/unionpay/pipeline/test_unionpay_sbt.py
+1 −1 examples/lr/train_lr.yaml
+95 −0 proto/generate_proto_buffer.sh
+0 −87 proto/osx/osx.proto
+0 −40 proto/proto_generate.sh
+4 −4 python/fate_flow/adapter/bfia/bridge/job.py
+20 −8 python/fate_flow/adapter/bfia/container/wraps/wraps.py
+2 −2 python/fate_flow/adapter/bfia/examples/job/fate/fate_components.json
+1 −1 python/fate_flow/adapter/bfia/examples/job/fate/fate_psi_sbt.json
+1 −1 python/fate_flow/adapter/bfia/examples/job/fate/sbt算法描述.json
+29 −36 python/fate_flow/adapter/bfia/translator/dsl_translator.py
+31 −7 python/fate_flow/adapter/bfia/wheels/job.py
+2 −1 python/fate_flow/apps/__init__.py
+1 −1 python/fate_flow/apps/desc.py
+1 −1 python/fate_flow/commands/server_cli.py
+9 −17 python/fate_flow/controller/job.py
+13 −18 python/fate_flow/controller/parser.py
+2 −1 python/fate_flow/controller/task.py
+2 −1 python/fate_flow/engine/backend/_eggroll_deepspeed.py
+1 −0 python/fate_flow/engine/devices/deepspeed.py
+5 −1 python/fate_flow/engine/devices/local.py
+1 −3 python/fate_flow/fate_flow_server.py
+1 −1 python/fate_flow/hub/components_wraps/fate/_wraps.py
+9 −3 python/fate_flow/manager/service/worker_manager.py
+0 −20 python/fate_flow/proto/osx/__init__.py
+0 −133 python/fate_flow/proto/osx/osx_pb2.py
+0 −158 python/fate_flow/proto/osx/osx_pb2_grpc.py
+0 −35 python/fate_flow/utils/grpc_utils.py
+3 −33 python/ofx/api/models/fate_flow/resource.py
+0 −20 python/ofx/api/proto/osx/__init__.py
+0 −133 python/ofx/api/proto/osx/osx_pb2.py
+0 −158 python/ofx/api/proto/osx/osx_pb2_grpc.py
+0 −23 python/ofx/api/utils/grpc_utils.py
+3 −4 python/requirements-eggroll.txt
+13 −16 python/setup.py
2 changes: 1 addition & 1 deletion fate_test

0 comments on commit 1fdcab3

Please sign in to comment.