test=develop, fix the bug of tensorrt package can't compile on windows (#24860)

* test=develop, fix a bug

* test=develop, remove the macro of PADDLE_DLL_INFERENCE
revert-24981-add_device_attr_for_regulization
silingtong123 5 years ago committed by GitHub
parent 71fb62c298
commit fc4435174b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -48,6 +48,7 @@ if(WIN32)
SET(CMAKE_C_RESPONSE_FILE_LINK_FLAG "@")
SET(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "@")
add_definitions(-DPADDLE_DLL_INFERENCE)
# set definition for the dll export
if (NOT MSVC)
message(FATAL "Windows build only support msvc. Which was binded by the nvcc compiler of NVIDIA.")

@ -17,10 +17,6 @@ if(WITH_TESTING)
include(tests/test.cmake) # some generic cmake function for inference
endif()
if(WIN32)
add_definitions(-DPADDLE_DLL_INFERENCE)
endif()
# TODO(panyx0718): Should this be called paddle_fluid_inference_api_internal?
cc_library(paddle_fluid_api
SRCS io.cc

@ -17,7 +17,11 @@
#if defined(_WIN32)
#ifndef PD_INFER_DECL
#ifdef PADDLE_DLL_INFERENCE
#ifndef PADDLE_ON_INFERENCE
#define PD_INFER_DECL
#else
#define PD_INFER_DECL __declspec(dllexport)
#endif // PADDLE_ON_INFERENCE
#else
#define PD_INFER_DECL __declspec(dllimport)
#endif // PADDLE_DLL_INFERENCE

Loading…
Cancel
Save