Skip to content

Commit

Permalink
Merge pull request FederatedAI#1809 from FederatedAI/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
dylan-fan authored Sep 4, 2020
2 parents 9a6d252 + 3079930 commit bdda535
Show file tree
Hide file tree
Showing 31 changed files with 1,658 additions and 69 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ matrix:
- env: OS='centos:7'

script:
- wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/standalone-fate-master-1.4.3.tar.gz
- tar -xzf standalone-fate-master-1.4.3.tar.gz
- cd standalone-fate-master-1.4.3
- wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/standalone-fate-master-1.4.4.tar.gz
- tar -xzf standalone-fate-master-1.4.4.tar.gz
- cd standalone-fate-master-1.4.4
- sed -i.bak "s/sh service.sh/bash service.sh/g" init.sh
- source init.sh init
- ls -alh
Expand Down
6 changes: 6 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Release 1.4.4
## Major Features and Improvements
> FATE-Flow
* Task Executor supports monkey patch
* Add forward API

# Release 1.4.3
## Major Features and Improvements
> FederatedML
Expand Down
8 changes: 4 additions & 4 deletions cluster-deploy/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

## 3. Build
```bash
git clone https://github.com/FederatedAI/FATE.git -b v1.4.3 --depth=1
git clone https://github.com/FederatedAI/FATE.git -b v1.4.4 --depth=1
cd FATE/cluster-deploy
bash build.sh release
```
Expand All @@ -22,13 +22,13 @@ The **release** is the version tag, which you can modify.

## 4. Output
```bash
ls -l FATE_install_1.4.3-release.tar.gz
ls -l FATE_install_1.4.4-release.tar.gz
```

## 5. Check packages
```bash
tar xzf FATE_install_1.4.3-release.tar.gz
ls -lrt FATE_install_1.4.3
tar xzf FATE_install_1.4.4-release.tar.gz
ls -lrt FATE_install_1.4.4
```
You can see the following package:
- bin
Expand Down
10 changes: 5 additions & 5 deletions cluster-deploy/doc/Fate-allinone_deployment_guide_install_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ Swap: 131071 0 131071

```
cd /data/projects/
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-cluster-install-1.4.3-release-c7-u18.tar.gz
tar xzf fate-cluster-install-1.4.3-release-c7-u18.tar.gz
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-cluster-install-1.4.4-release-c7-u18.tar.gz
tar xzf fate-cluster-install-1.4.4-release-c7-u18.tar.gz
```

## 5.2 部署前检查
Expand Down Expand Up @@ -292,7 +292,7 @@ vi fate-cluster-install/allInone/conf/setup.conf
| 配置项 | 配置项值 | 说明 |
| ---------------- | --------------------------------------------- | ------------------------------------------------------------ |
| roles | 默认:"host" "guest" | 部署的角色,有HOST端、GUEST端 |
| version | 默认:1.4.3 | Fate 版本号 |
| version | 默认:1.4.4 | Fate 版本号 |
| pbase | 默认: /data/projects | 项目根目录 |
| lbase | 默认:/data/logs | 保持默认不要修改 |
| ssh_user | 默认:app | ssh连接目标机器的用户,也是部署后文件的属主 |
Expand Down Expand Up @@ -321,7 +321,7 @@ vi fate-cluster-install/allInone/conf/setup.conf
#to install role
roles=( "host" "guest" )
version="1.4.3"
version="1.4.4"
#project base
pbase="/data/projects"
Expand Down Expand Up @@ -377,7 +377,7 @@ basemodules=( "base" "java" "python" "eggroll" "fate" )
#to install role
roles=( "host" )
version="1.4.3"
version="1.4.4"
#project base
pbase="/data/projects"
Expand Down
10 changes: 5 additions & 5 deletions cluster-deploy/doc/Fate-allinone_deployment_guide_install_zh.rst
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ ssh app@192.168.0.2
::

cd /data/projects/
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-cluster-install-1.4.3-release-c7-u18.tar.gz
tar xzf fate-cluster-install-1.4.3-release-c7-u18.tar.gz
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-cluster-install-1.4.4-release-c7-u18.tar.gz
tar xzf fate-cluster-install-1.4.4-release-c7-u18.tar.gz

5.2 部署前检查
--------------
Expand Down Expand Up @@ -314,7 +314,7 @@ ssh app@192.168.0.2
+======================+=================================================+==============================================================================+
| roles | 默认:"host" "guest" | 部署的角色,有HOST端、GUEST端 |
+----------------------+-------------------------------------------------+------------------------------------------------------------------------------+
| version | 默认:1.4.3 | Fate 版本号 |
| version | 默认:1.4.4 | Fate 版本号 |
+----------------------+-------------------------------------------------+------------------------------------------------------------------------------+
| pbase | 默认: /data/projects | 项目根目录 |
+----------------------+-------------------------------------------------+------------------------------------------------------------------------------+
Expand Down Expand Up @@ -366,7 +366,7 @@ ssh app@192.168.0.2
#to install role
roles=( "host" "guest" )

version="1.4.3"
version="1.4.4"
#project base
pbase="/data/projects"

Expand Down Expand Up @@ -421,7 +421,7 @@ ssh app@192.168.0.2
#to install role
roles=( "host" )

version="1.4.3"
version="1.4.4"
#project base
pbase="/data/projects"

Expand Down
2 changes: 1 addition & 1 deletion cluster-deploy/doc/Fate-exchange_deployment_guide_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ fi
```
cd /data/projects/install
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/jdk-8u192-linux-x64.tar.gz
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.3-release.tar.gz
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.4-release.tar.gz
```

## 5.2 操作系统参数检查
Expand Down
2 changes: 1 addition & 1 deletion cluster-deploy/doc/Fate-exchange_deployment_guide_zh.rst
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ ufw status

cd /data/projects/install
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/jdk-8u192-linux-x64.tar.gz
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.3-release.tar.gz
wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.4-release.tar.gz

5.2 操作系统参数检查
--------------------
Expand Down
Loading

0 comments on commit bdda535

Please sign in to comment.