From 431427c2bbb33ab16fd06540b9b3d9bf4d9df487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BA=B7?= <liukang73@hisilicon.com>
Date: Fri, 28 Jan 2022 10:55:52 +0800
Subject: [PATCH] allinone

---
 CMakeLists.txt | 12 +++---------
 build.sh       | 50 ++------------------------------------------------
 2 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b31aa6c..5f81f8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,15 +50,9 @@ if (ENABLE_OPEN_SRC)
             set(ASCEND_DIR /usr/local/Ascend)
         endif()
 
-        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()
+        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})
     endif()
 
     if (NOT DEFINED METADEF_DIR)
diff --git a/build.sh b/build.sh
index ef512f6..2cb2ef7 100644
--- a/build.sh
+++ b/build.sh
@@ -215,50 +215,8 @@ if [[ "X$ENABLE_PARSER_ST" = "Xon" ]]; then
     genhtml coverage.info
 fi
 
-# generate output package in tar form, including ut/st libraries/executables
-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" "liberror_manager.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}"
-
-  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}/${ATC_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_PATH} \;
-  done
-
-  find ${OUTPUT_PATH}/${PARSER_LIB_PATH} -maxdepth 1 -name "libc_sec.so" -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH} \;
-
-  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()
+generate_package()
 {
   cd "${BASEPATH}"
 
@@ -292,10 +250,6 @@ generate_package_for_cann()
 }
 
 if [[ "X$ENABLE_PARSER_UT" = "Xoff" && "X$ENABLE_PARSER_ST" = "Xoff" ]]; then
-  if [[ "X$ALL_IN_ONE_ENABLE" = "X1" ]]; then
-    generate_package_for_cann
-  else
-    generate_package
-  fi
+  generate_package
 fi
 echo "---------------- Parser package archive generated ----------------"