From 4ccd80c17797c91239ed66e0d18d83c9763ef293 Mon Sep 17 00:00:00 2001
From: likun104 <likun104@huawei.com>
Date: Thu, 19 Aug 2021 11:08:38 +0800
Subject: [PATCH 1/2] add new package for compiler

---
 build.sh | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 3e4df13..a4a2a87 100644
--- a/build.sh
+++ b/build.sh
@@ -249,7 +249,45 @@ generate_package()
   tar -cf parser_lib.tar fwkacllib acllib atc
 }
 
+# generate output package in tar form, including ut/st libraries/executables for cann
+generate_package_for_cann()
+{
+  cd "${BASEPATH}"
+
+  PARSER_LIB_PATH="lib"
+  CMPL_PATH="compiler/lib64"
+
+  COMMON_LIB=("libgraph.so" "libregister.so" "liberror_manager.so")
+  PARSER_LIB=("lib_caffe_parser.so" "libfmk_onnx_parser.so" "libfmk_parser.so" "libparser_common.so")
+
+  rm -rf ${OUTPUT_PATH:?}/${CMPL_PATH}/
+
+  mk_dir "${OUTPUT_PATH}/${CMPL_PATH}"
+
+  find output/ -name parser_lib.tar -exec rm {} \;
+
+  cd "${OUTPUT_PATH}"
+
+  for lib in "${PARSER_LIB[@]}";
+  do
+    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${CMPL_PATH} \;
+  done
+
+  for lib in "${COMMON_LIB[@]}";
+  do
+    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${CMPL_PATH} \;
+  done
+
+  find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libc_sec.so" -exec cp -f {} ${OUTPUT_PATH}/${CMPL_PATH} \;
+
+  tar -cf parser_lib.tar compiler
+}
+
 if [[ "X$ENABLE_PARSER_UT" = "Xoff" && "X$ENABLE_PARSER_ST" = "Xoff" ]]; then
-  generate_package
+  if [[ "X$ALL_IN_ONE_ENABLE" = "X1" ]]; then
+    generate_package_for_cann
+  else
+    generate_package
+  fi
 fi
 echo "---------------- Parser package archive generated ----------------"

From d5f4b6da74094526fcc78c07ff73d1e714ad2af9 Mon Sep 17 00:00:00 2001
From: likun104 <likun104@huawei.com>
Date: Tue, 17 Aug 2021 18:20:17 +0800
Subject: [PATCH 2/2] add new package for compiler

---
 CMakeLists.txt | 13 +++++++++----
 build.sh       | 12 ++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c0aa4b..a413ea3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,10 +50,15 @@ if (ENABLE_OPEN_SRC)
             set(ASCEND_DIR /usr/local/Ascend)
         endif()
 
-        set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64)
-
-        find_module(slog libalog.so ${ASCEND_ATC_DIR})
-        find_module(static_mmpa libmmpa.a ${ASCEND_ATC_DIR})
+        if(DEFINED ENV{ALL_IN_ONE_ENABLE})
+            set(ASCEND_COMPILER_DIR ${ASCEND_DIR}/compiler/lib64)
+            find_module(slog libalog.so ${ASCEND_COMPILER_DIR})
+            find_module(static_mmpa libmmpa.a ${ASCEND_COMPILER_DIR})
+        else()
+            set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64)
+            find_module(slog libalog.so ${ASCEND_ATC_DIR})
+            find_module(static_mmpa libmmpa.a ${ASCEND_ATC_DIR})
+        endif()
     endif()
 
     if (NOT DEFINED METADEF_DIR)
diff --git a/build.sh b/build.sh
index a4a2a87..586bf99 100644
--- a/build.sh
+++ b/build.sh
@@ -255,14 +255,14 @@ generate_package_for_cann()
   cd "${BASEPATH}"
 
   PARSER_LIB_PATH="lib"
-  CMPL_PATH="compiler/lib64"
+  COMPILER_PATH="compiler/lib64"
 
   COMMON_LIB=("libgraph.so" "libregister.so" "liberror_manager.so")
   PARSER_LIB=("lib_caffe_parser.so" "libfmk_onnx_parser.so" "libfmk_parser.so" "libparser_common.so")
 
-  rm -rf ${OUTPUT_PATH:?}/${CMPL_PATH}/
+  rm -rf ${OUTPUT_PATH:?}/${COMPILER_PATH}/
 
-  mk_dir "${OUTPUT_PATH}/${CMPL_PATH}"
+  mk_dir "${OUTPUT_PATH}/${COMPILER_PATH}"
 
   find output/ -name parser_lib.tar -exec rm {} \;
 
@@ -270,15 +270,15 @@ generate_package_for_cann()
 
   for lib in "${PARSER_LIB[@]}";
   do
-    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${CMPL_PATH} \;
+    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${COMPILER_PATH} \;
   done
 
   for lib in "${COMMON_LIB[@]}";
   do
-    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${CMPL_PATH} \;
+    find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${COMPILER_PATH} \;
   done
 
-  find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libc_sec.so" -exec cp -f {} ${OUTPUT_PATH}/${CMPL_PATH} \;
+  find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libc_sec.so" -exec cp -f {} ${OUTPUT_PATH}/${COMPILER_PATH} \;
 
   tar -cf parser_lib.tar compiler
 }