From 7831b9a07a02cbd94daa6e95a30d8e4f21655005 Mon Sep 17 00:00:00 2001
From: fairwarning <zhaoguangcan@huawei.com>
Date: Fri, 9 Jul 2021 17:10:12 +0800
Subject: [PATCH 1/2] modify build apex package method

---
 README.zh.md             | 37 ++++++++++++++++++++++------
 build/build.sh           | 52 ----------------------------------------
 dist/.gitkeep            |  0
 scripts/gen.sh           | 21 ++++++++++++++++
 {build => scripts}/mv.sh |  0
 5 files changed, 51 insertions(+), 59 deletions(-)
 delete mode 100644 build/build.sh
 delete mode 100644 dist/.gitkeep
 create mode 100644 scripts/gen.sh
 rename {build => scripts}/mv.sh (100%)

diff --git a/README.zh.md b/README.zh.md
index 27fdf43..69a5a20 100644
--- a/README.zh.md
+++ b/README.zh.md
@@ -1,21 +1,44 @@
-# Ascend 910 版本apex安装使用说明
+# Ascend apex
 
 
 ## 生成全量代码及编译
-1、请确保npu版本的pytorch可以正常使用；
 
-2、进入到build目录，执行
+注：以下描述中的“根目录”指“Ascend apex的根目录”
+
+**获取原生apex源代码**
+
+从github上获取源代码，在根目录下执行
+```
+git clone https://github.com/NVIDIA/apex.git
+```
+进入源代码目录，切换至commitid为4ef930c1c884fdca5f472ab2ce7cb9b505d26c1a的分支
+```
+cd apex
+git checkout 4ef930c1c884fdca5f472ab2ce7cb9b505d26c1a
+cd ..
+```
+
+**生成适配昇腾AI处理器的apex代码**
+
+进入到scripts目录，执行
 ```
-bash build.sh
+bash gen.sh
 ```
-会在当前根目录下apex-npu目录中生成npu适配全量代码，同时在dist目录中生成whl包。执行
+会在根目录下apex目录中生成npu适配全量代码
+
+**编译apex的二进制包**
+
+1、请确保npu版本的pytorch可以正常使用（否则会影响apex的编译）；
+
+2、进入到根目录下apex目录，执行
 ```
-bash build.sh gen
+python3 setup.py --cpp_ext --npu_float_status bdist_wheel
 ```
-只生成全量代码。
+生成的二进制包在当前的dist目录下
 
 
 ## 安装
+
 进入dist目录，执行以下命令：
 ```
 pip3 uninstall apex
diff --git a/build/build.sh b/build/build.sh
deleted file mode 100644
index ddddbe0..0000000
--- a/build/build.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-CUR_DIR=$(dirname $(readlink -f $0))
-ROOT_DIR=$CUR_DIR/..
-APEX_DIR=$ROOT_DIR/apex-npu
-APEX_PKG=apex.tar.gz
-
-function main()
-{
-    cd $ROOT_DIR || exit
-    # get ori apex
-    if [ -f $ROOT_DIR/$APEX_PKG ];then
-        echo "detect $APEX_PKG exist, skip download"
-    else
-        wget https://ascend-ptadapter.obs.cn-north-4.myhuaweicloud.com/pytorch-v1.5.0/$APEX_PKG --no-check-certificate
-    fi
-
-    if [ $? != 0 ]; then
-        echo "Failed to wget source code of apex, check network."
-        exit 1
-    fi
-
-    # mkdir apex
-    if [ -d $APEX_DIR ];then
-        echo "$APEX_DIR exists, if nothing to backup, please remove it"
-        exit 1
-    fi
-
-    # unpack
-    tar -xf $APEX_PKG
-    mv apex $APEX_DIR
-
-    echo "download and unpack $APEX_PKG success"
-
-    # patch
-    cp $ROOT_DIR/patch/npu.patch $APEX_DIR
-    cd $APEX_DIR || exit
-    patch -p1 <npu.patch
-    rm -rf npu.patch
-    cp -r $ROOT_DIR/src/* $APEX_DIR
-    cp -r $ROOT_DIR/tests/* $APEX_DIR/tests
-    
-    if [[ $1 = "gen" ]];then
-        exit 0
-    fi
-    # build
-    python3 setup.py --cpp_ext --npu_float_status bdist_wheel
-    cp $APEX_DIR/dist/apex-* $ROOT_DIR/dist
-}
-
-main "$@"
-
diff --git a/dist/.gitkeep b/dist/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/scripts/gen.sh b/scripts/gen.sh
new file mode 100644
index 0000000..5c29023
--- /dev/null
+++ b/scripts/gen.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+CUR_DIR=$(dirname $(readlink -f $0))
+ROOT_DIR=$CUR_DIR/..
+APEX_DIR=$ROOT_DIR/apex
+
+function main()
+{
+    cd $ROOT_DIR || exit
+
+    # patch
+    cp $ROOT_DIR/patch/npu.patch $APEX_DIR
+    cd $APEX_DIR || exit
+    patch -p1 <npu.patch
+    rm -rf npu.patch
+    cp -r $ROOT_DIR/src/* $APEX_DIR
+    cp -r $ROOT_DIR/tests/* $APEX_DIR/tests
+}
+
+main "$@"
+
diff --git a/build/mv.sh b/scripts/mv.sh
similarity index 100%
rename from build/mv.sh
rename to scripts/mv.sh
-- 
Gitee


From 9a0b7c51f2c79b77ee6a96f4b810f29a877c503b Mon Sep 17 00:00:00 2001
From: fairwarning <zhaoguangcan@huawei.com>
Date: Sat, 10 Jul 2021 15:24:29 +0800
Subject: [PATCH 2/2] add reviewers

---
 OWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OWNERS b/OWNERS
index 8c69af9..008b155 100644
--- a/OWNERS
+++ b/OWNERS
@@ -7,3 +7,5 @@ reviewers:
 - junqiang521
 - ascendzyj
 - zhou_sinan
+- shibo19
+- li_chao10
-- 
Gitee