From 8981013bb5bc6c70dd1431d3437be387162b0d1d Mon Sep 17 00:00:00 2001
From: taoxiangdong <taoxiangdong1@huawei.com>
Date: Mon, 26 Oct 2020 23:31:06 +0800
Subject: [PATCH 1/4] update build.sh

---
 build.sh | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 655cd78..8af47a3 100644
--- a/build.sh
+++ b/build.sh
@@ -86,6 +86,8 @@ checkopts()
 }
 checkopts "$@"
 
+git submodule update --init metadef
+
 mk_dir() {
     local create_dir="$1"  # the target to make
 
@@ -152,12 +154,40 @@ generate_package()
   cd "${BASEPATH}"
 
   PARSER_LIB_PATH="lib"
+  ACL_PATH="acllib/lib64"
+  FWK_PATH="fwkacllib/lib64"
+  ATC_PATH="atc/lib64"
+
+  COMMON_LIB=("libgraph.so" "libregister.so")
+  PARSER_LIB=("lib_caffe_parser.so" "libfmk_onnx_parser.so" "libfmk_parser.so" "libparser_common.so")
+
+  rm -rf ${OUTPUT_PATH:?}/${FWK_PATH}/
+  rm -rf ${OUTPUT_PATH:?}/${ACL_PATH}/
+  rm -rf ${OUTPUT_PATH:?}/${ATC_PATH}/
+  
+  mk_dir "${OUTPUT_PATH}/${FWK_PATH}"
+  mk_dir "${OUTPUT_PATH}/${ATC_PATH}"
+  mk_dir "${OUTPUT_PATH}/${ACL_PATH}"
 
   find output/ -name parser_lib.tar -exec rm {} \;
  
   cd "${OUTPUT_PATH}"
 
-  tar -cf parser_lib.tar "${PARSER_LIB_PATH}"
+  for lib in "${PARSER_LIB[@]}";
+  do
+    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH} \;
+    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ACL_PATH} \;
+  done
+
+  for lib in "${COMMON_LIB[@]}";
+  do
+    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH} \;
+    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ATC_LIB} \;
+  done
+
+  find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libc_sec.so" -exec cp -f {} ${OUTPUT_PATH}/${ATC_LIB} \;
+  
+  tar -cf parser_lib.tar fwkacllib acllib atc
 }
 
 if [[ "X$ENABLE_GE_UT" = "Xoff" ]]; then

From 01eaba8d78f2ddc6a7d2e605e1ffd7d61a1dead3 Mon Sep 17 00:00:00 2001
From: taoxiangdong <taoxiangdong1@huawei.com>
Date: Tue, 27 Oct 2020 01:23:12 +0800
Subject: [PATCH 2/4] update build.shH

---
 build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 8af47a3..6365423 100644
--- a/build.sh
+++ b/build.sh
@@ -164,7 +164,7 @@ generate_package()
   rm -rf ${OUTPUT_PATH:?}/${FWK_PATH}/
   rm -rf ${OUTPUT_PATH:?}/${ACL_PATH}/
   rm -rf ${OUTPUT_PATH:?}/${ATC_PATH}/
-  
+
   mk_dir "${OUTPUT_PATH}/${FWK_PATH}"
   mk_dir "${OUTPUT_PATH}/${ATC_PATH}"
   mk_dir "${OUTPUT_PATH}/${ACL_PATH}"
@@ -182,10 +182,11 @@ generate_package()
   for lib in "${COMMON_LIB[@]}";
   do
     find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH} \;
-    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ATC_LIB} \;
+    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH} \;
   done
 
-  find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libc_sec.so" -exec cp -f {} ${OUTPUT_PATH}/${ATC_LIB} \;
+  find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libc_sec.so" -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH} \;
+  find ${OUTPUT_PATH}/${METADEF_LIB_PATH} -maxdepth 1 -name "libregister.a" -exec cp -f {} ${OUTPUT_PATH}/${ACL_PATH} \;
   
   tar -cf parser_lib.tar fwkacllib acllib atc
 }

From f974b22449977fedc8c88e3ebe2ac114471a4ffd Mon Sep 17 00:00:00 2001
From: taoxiangdong <taoxiangdong1@huawei.com>
Date: Tue, 27 Oct 2020 12:41:50 +0800
Subject: [PATCH 3/4] update build.sh

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 6365423..a4d09e1 100644
--- a/build.sh
+++ b/build.sh
@@ -186,8 +186,8 @@ generate_package()
   done
 
   find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libc_sec.so" -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH} \;
-  find ${OUTPUT_PATH}/${METADEF_LIB_PATH} -maxdepth 1 -name "libregister.a" -exec cp -f {} ${OUTPUT_PATH}/${ACL_PATH} \;
-  
+  find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libregister.a" -exec cp -f {} ${OUTPUT_PATH}/${ACL_PATH} \;
+
   tar -cf parser_lib.tar fwkacllib acllib atc
 }
 

From 06b4e6949c53e94d683e0770cced8cb07687151a Mon Sep 17 00:00:00 2001
From: taoxiangdong <taoxiangdong1@huawei.com>
Date: Tue, 27 Oct 2020 15:06:53 +0800
Subject: [PATCH 4/4] update metadef submodule

---
 metadef | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadef b/metadef
index ae80e9e..a75b33c 160000
--- a/metadef
+++ b/metadef
@@ -1 +1 @@
-Subproject commit ae80e9e2369458d468c16fd95bb970922ff3a084
+Subproject commit a75b33c637a304d02cc0f073d2e5ea163a71f8dd