From 3138e7aaaddbe42f9e40ebc5f52d72ef03706ae7 Mon Sep 17 00:00:00 2001 From: winter-wang <78149749+winter-wang@users.noreply.github.com> Date: Wed, 5 Jul 2023 14:07:23 +0800 Subject: [PATCH] [IR]test ir dynamic library. (#55113) --- CMakeLists.txt | 4 +--- paddle/ir/CMakeLists.txt | 5 +---- paddle/ir/core/dll_decl.h | 12 +++++------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c7ed763c2f..42019395dbb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -705,9 +705,7 @@ else() endif() if(NOT WITH_SHARED_IR) - if(WIN32) - add_definitions(-DIR_API=) - endif() + add_definitions(-DSTATIC_IR) endif() if(WITH_STRIP) diff --git a/paddle/ir/CMakeLists.txt b/paddle/ir/CMakeLists.txt index 6536a2fe018..e82c944fb9f 100644 --- a/paddle/ir/CMakeLists.txt +++ b/paddle/ir/CMakeLists.txt @@ -1,3 +1,4 @@ +add_definitions(-DIR_LIBRARY) set_property(GLOBAL PROPERTY IR_TARGETS "") set_property(GLOBAL PROPERTY IR_MODULES "") function(ir_library TARGET_NAME) @@ -33,10 +34,6 @@ function(ir_library TARGET_NAME) endif() endfunction() -if(WITH_SHARED_IR) - add_definitions(-DIR_DLL_EXPORT) -endif() - add_subdirectory(core) add_subdirectory(pass) add_subdirectory(pattern_rewrite) diff --git a/paddle/ir/core/dll_decl.h b/paddle/ir/core/dll_decl.h index d0be0eff305..10fed4fe45c 100644 --- a/paddle/ir/core/dll_decl.h +++ b/paddle/ir/core/dll_decl.h @@ -13,15 +13,13 @@ // limitations under the License. #pragma once - +#define IR_API #if defined(_WIN32) -#ifndef IR_API -#ifdef IR_DLL_EXPORT +#ifndef STATIC_IR +#ifdef IR_LIBRARY #define IR_API __declspec(dllexport) #else #define IR_API __declspec(dllimport) -#endif // IR_DLL_EXPORT -#endif // IR_API -#else -#define IR_API +#endif // IR_LIBRARY +#endif // STATIC_IR #endif // _WIN32 -- GitLab