!646 parser 仓对外头文件回退

Merge pull request !646 from xujiuxu/master

CMakeLists.txt

@@ -253,7 +253,6 @@ install(TARGETS _caffe_parser parser_common fmk_onnx_parser fmk_parser parser_he
 install(FILES   ${PARSER_DIR}/inc/external/parser/onnx_parser.h
                 ${PARSER_DIR}/inc/external/parser/caffe_parser.h
                 ${PARSER_DIR}/inc/external/parser/tensorflow_parser.h
-                ${PARSER_DIR}/inc/external/parser/parser_common.h
         DESTINATION ${INSTALL_INCLUDE_DIR}/parser/external/parser COMPONENT opensdk EXCLUDE_FROM_ALL
 )
 

inc/external/parser/caffe_parser.h

@@ -17,6 +17,20 @@
 #ifndef INC_EXTERNAL_ACL_GRAPH_CAFFE_H_
 #define INC_EXTERNAL_ACL_GRAPH_CAFFE_H_
 
+#if defined(_MSC_VER)
+#ifdef FUNC_VISIBILITY
+#define PARSER_FUNC_VISIBILITY _declspec(dllexport)
+#else
+#define PARSER_FUNC_VISIBILITY
+#endif
+#else
+#ifdef FUNC_VISIBILITY
+#define PARSER_FUNC_VISIBILITY __attribute__((visibility("default")))
+#else
+#define PARSER_FUNC_VISIBILITY
+#endif
+#endif
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -24,7 +38,6 @@
 #include "graph/ascend_string.h"
 #include "graph/ge_error_codes.h"
 #include "graph/graph.h"
-#include "parser_common.h"
 
 namespace ge {
 PARSER_FUNC_VISIBILITY graphStatus aclgrphParseCaffe(const char *model_file, const char *weights_file,

inc/external/parser/onnx_parser.h

@@ -17,11 +17,24 @@
 #ifndef INC_EXTERNAL_PARSER_ONNX_PARSER_H_
 #define INC_EXTERNAL_PARSER_ONNX_PARSER_H_
 
+#if defined(_MSC_VER)
+#ifdef FUNC_VISIBILITY
+#define PARSER_FUNC_VISIBILITY _declspec(dllexport)
+#else
+#define PARSER_FUNC_VISIBILITY
+#endif
+#else
+#ifdef FUNC_VISIBILITY
+#define PARSER_FUNC_VISIBILITY __attribute__((visibility("default")))
+#else
+#define PARSER_FUNC_VISIBILITY
+#endif
+#endif
+
 #include <map>
 #include "graph/ascend_string.h"
 #include "graph/ge_error_codes.h"
 #include "graph/graph.h"
-#include "parser_common.h"
 
 namespace ge {
 PARSER_FUNC_VISIBILITY graphStatus aclgrphParseONNX(const char *model_file,

inc/external/parser/parser_common.h

@@ -1,34 +0,0 @@
-/**
- * Copyright (c) Huawei Technologies Co., Ltd. 2020~2022. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INC_EXTERNAL_ACL_PARSER_COMMON_H_
-#define INC_EXTERNAL_ACL_PARSER_COMMON_H_
-
-#if defined(_MSC_VER)
-#ifdef FUNC_VISIBILITY
-#define PARSER_FUNC_VISIBILITY _declspec(dllexport)
-#else
-#define PARSER_FUNC_VISIBILITY
-#endif
-#else
-#ifdef FUNC_VISIBILITY
-#define PARSER_FUNC_VISIBILITY __attribute__((visibility("default")))
-#else
-#define PARSER_FUNC_VISIBILITY
-#endif
-#endif
-
-#endif  // INC_EXTERNAL_ACL_PARSER_COMMON_H_

inc/external/parser/tensorflow_parser.h

@@ -17,15 +17,27 @@
 #ifndef INC_EXTERNAL_ACL_PARSER_TENSORFLOW_H_
 #define INC_EXTERNAL_ACL_PARSER_TENSORFLOW_H_
 
+#if defined(_MSC_VER)
+#ifdef FUNC_VISIBILITY
+#define PARSER_FUNC_VISIBILITY _declspec(dllexport)
+#else
+#define PARSER_FUNC_VISIBILITY
+#endif
+#else
+#ifdef FUNC_VISIBILITY
+#define PARSER_FUNC_VISIBILITY __attribute__((visibility("default")))
+#else
+#define PARSER_FUNC_VISIBILITY
+#endif
+#endif
+
 #include <atomic>
 #include <memory>
 #include <string>
 #include <vector>
-
 #include "graph/ascend_string.h"
 #include "graph/ge_error_codes.h"
 #include "graph/graph.h"
-#include "parser_common.h"
 
 namespace ge {
 PARSER_FUNC_VISIBILITY graphStatus aclgrphParseTensorFlow(const char *model_file, ge::Graph &graph);