From ad76104f2afc47cf78f81440f31bbd3735562a6e Mon Sep 17 00:00:00 2001
From: taoxudonghaha <justsheldon@163.com>
Date: Thu, 7 Jan 2021 21:11:39 +0800
Subject: [PATCH] modify atc install

---
 build.sh                  | 10 ++++--
 ge/offline/CMakeLists.txt | 66 ---------------------------------------
 metadef                   |  2 +-
 parser                    |  2 +-
 4 files changed, 9 insertions(+), 71 deletions(-)

diff --git a/build.sh b/build.sh
index 71a733d1..b0d1f50f 100644
--- a/build.sh
+++ b/build.sh
@@ -162,10 +162,10 @@ build_graphengine()
   TARGET=${COMMON_TARGET}
   if [ "x${PLATFORM}" = "xtrain" ]
   then
-    TARGET="ge_runner ge_local_engine ge_local_opskernel_builder host_cpu_engine host_cpu_opskernel_builder ${TARGET}"
+    TARGET="ge_runner ge_local_engine ge_local_opskernel_builder host_cpu_engine host_cpu_opskernel_builder fwk_atc.bin ${TARGET}"
   elif [ "x${PLATFORM}" = "xinference" ]
   then
-    TARGET="ge_compiler atc_ge_local_engine atc_ge_local_opskernel_builder atc_host_cpu_engine atc_host_cpu_opskernel_builder atc opensrc_ascendcl ${TARGET}"
+    TARGET="ge_compiler atc_ge_local_engine atc_ge_local_opskernel_builder atc_host_cpu_engine atc_host_cpu_opskernel_builder atc_atc.bin opensrc_ascendcl ${TARGET}"
   elif [ "X$ENABLE_GE_UT" = "Xon" ]
   then
     TARGET="ut_libgraph ut_libge_multiparts_utest ut_libge_others_utest ut_libge_kernel_utest ut_libge_distinct_load_utest"
@@ -244,6 +244,7 @@ generate_package()
   FWK_PATH="fwkacllib/lib64"
   ATC_PATH="atc/lib64"
   ATC_BIN_PATH="atc/bin"
+  FWK_BIN_PATH="fwkacllib/bin"
   NNENGINE_PATH="plugin/nnengine/ge_config"
   OPSKERNEL_PATH="plugin/opskernel"
 
@@ -256,6 +257,7 @@ generate_package()
   rm -rf ${OUTPUT_PATH:?}/${ACL_PATH}/
   rm -rf ${OUTPUT_PATH:?}/${ATC_PATH}/
   rm -rf ${OUTPUT_PATH:?}/${ATC_BIN_PATH}/
+  rm -rf ${OUTPUT_PATH:?}/${FWK_BIN_PATH}/
 
   mk_dir "${OUTPUT_PATH}/${FWK_PATH}/${NNENGINE_PATH}"
   mk_dir "${OUTPUT_PATH}/${FWK_PATH}/${OPSKERNEL_PATH}"
@@ -263,6 +265,7 @@ generate_package()
   mk_dir "${OUTPUT_PATH}/${ATC_PATH}/${OPSKERNEL_PATH}"
   mk_dir "${OUTPUT_PATH}/${ACL_PATH}"
   mk_dir "${OUTPUT_PATH}/${ATC_BIN_PATH}"
+  mk_dir "${OUTPUT_PATH}/${FWK_BIN_PATH}"
  
   cd "${OUTPUT_PATH}"
 
@@ -301,7 +304,8 @@ generate_package()
     find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH} \;
   done
 
-  find ./bin -name atc -exec cp {} "${OUTPUT_PATH}/${ATC_BIN_PATH}" \;
+  find ./lib/atclib -name atc.bin -exec cp {} "${OUTPUT_PATH}/${ATC_BIN_PATH}" \;
+  find ./lib/fwkacl -name atc.bin -exec cp {} "${OUTPUT_PATH}/${FWK_BIN_PATH}" \;
   find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "libascendcl.so" -exec cp -f {} ${OUTPUT_PATH}/${ACL_PATH} \;
   
   if [ "x${PLATFORM}" = "xtrain" ]
diff --git a/ge/offline/CMakeLists.txt b/ge/offline/CMakeLists.txt
index d195e06f..3f8d43dc 100644
--- a/ge/offline/CMakeLists.txt
+++ b/ge/offline/CMakeLists.txt
@@ -15,68 +15,6 @@ set(SRC_LIST
     "../ir_build/atc_ir_common.cc"
 )
 
-############ atc ############
-add_executable(atc ${SRC_LIST} ${PROTO_HDRS})
-
-target_compile_options(atc PRIVATE
-    -Werror
-    -O2
-    -Wno-deprecated-declarations
-    -fno-common
-)
-
-target_compile_definitions(atc PRIVATE
-    PROTOBUF_INLINE_NOT_IN_HEADERS=0
-    COMPILE_OMG_PACKAGE
-    google=ascend_private
-    LOG_CPP
-)
-
-target_include_directories(atc PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-    ${GE_CODE_DIR}
-    ${GE_CODE_DIR}/ge
-    ${GE_CODE_DIR}/inc/external
-    ${GE_CODE_DIR}/common/inc/external
-    ${GE_CODE_DIR}/common/inc/external/graph
-    ${GE_CODE_DIR}/inc
-    ${GE_CODE_DIR}/inc/framework
-    ${METADEF_DIR}/inc
-    ${METADEF_DIR}/inc/graph
-    ${METADEF_DIR}/inc/register
-    ${METADEF_DIR}/inc/external
-    ${METADEF_DIR}/inc/external/graph
-    ${METADEF_DIR}/inc/external/register
-    ${PARSER_DIR}
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
-    #### yellow zone ####
-    ${GE_CODE_DIR}/../inc
-    ${GE_CODE_DIR}/../inc/common
-    #### blue zone ####
-    ${GE_CODE_DIR}/third_party/fwkacllib/inc
-    ${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain
-)
-
-target_link_libraries(atc PRIVATE
-    $<BUILD_INTERFACE:intf_pub>
-    ascend_protobuf
-    ge_common
-    register
-    c_sec
-    graph
-    error_manager
-    ge_compiler
-    parser_common
-    gflags
-    json
-    runtime_compile
-    slog
-    static_mmpa
-    -lrt
-    -ldl
-)
-
 ############ atc_atc.bin ############
 add_executable(atc_atc.bin ${SRC_LIST} ${PROTO_HDRS})
 
@@ -215,10 +153,6 @@ set_target_properties(fwk_atc.bin PROPERTIES
 set(INSTALL_BASE_DIR "")
 set(INSTALL_LIBRARY_DIR lib)
 
-install(TARGETS atc OPTIONAL
-    LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
-)
-
 install(TARGETS atc_atc.bin OPTIONAL
     RUNTIME DESTINATION ${INSTALL_LIBRARY_DIR}/atclib
 )
diff --git a/metadef b/metadef
index f08320a6..4b54fc3c 160000
--- a/metadef
+++ b/metadef
@@ -1 +1 @@
-Subproject commit f08320a6d699f5b537bf66da572bf225b9cd330e
+Subproject commit 4b54fc3ce1c961606aadd0e4568598ef1d96e1d7
diff --git a/parser b/parser
index b2df31dc..8ba13b54 160000
--- a/parser
+++ b/parser
@@ -1 +1 @@
-Subproject commit b2df31dc5810283e2e483df5ba9517e2ece132a0
+Subproject commit 8ba13b54160440e13e7c10d5d1f04c98d91e27c7