Skip to content

Commit 2017f82

Browse files
author
wopeizl
authored
Merge pull request #15654 from wopeizl/1.3/fixci
1.3/fixci
2 parents 74bc55c + d0f57b0 commit 2017f82

File tree

15 files changed

+62
-40
lines changed

15 files changed

+62
-40
lines changed

‎CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,18 @@ message(STATUS "CXX compiler: ${CMAKE_CXX_COMPILER}, version: "
2525
message(STATUS "C compiler: ${CMAKE_C_COMPILER}, version: "
2626
"${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}")
2727
if(WIN32)
28+
set(CMAKE_SUPPRESS_REGENERATION ON)
2829
set(CMAKE_STATIC_LIBRARY_PREFIX lib)
2930
add_definitions("/DGOOGLE_GLOG_DLL_DECL=")
3031
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /bigobj /MTd")
3132
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /bigobj /MT")
3233
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj /MTd")
3334
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /bigobj /MT")
35+
add_compile_options(/wd4068 /wd4129 /wd4244 /wd4267 /wd4297 /wd4530 /wd4577 /wd4819 /wd4838)
36+
set(PADDLE_LINK_FLAGS "/IGNORE:4006 /IGNORE:4098 /IGNORE:4217 /IGNORE:4221")
37+
set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${PADDLE_LINK_FLAGS}")
38+
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${PADDLE_LINK_FLAGS}")
39+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PADDLE_LINK_FLAGS}")
3440
endif(WIN32)
3541

3642
find_package(CUDA QUIET)

‎cmake/configure.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,12 @@ endif()
152152

153153
if (WITH_MKLML AND MKLML_IOMP_LIB)
154154
message(STATUS "Enable Intel OpenMP with ${MKLML_IOMP_LIB}")
155-
set(OPENMP_FLAGS "-fopenmp")
155+
if(WIN32)
156+
# openmp not support well for now on windows
157+
set(OPENMP_FLAGS "")
158+
else(WIN32)
159+
set(OPENMP_FLAGS "-fopenmp")
160+
endif(WIN32)
156161
set(CMAKE_C_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS ${OPENMP_FLAGS})
157162
set(CMAKE_CXX_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS ${OPENMP_FLAGS})
158163
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPENMP_FLAGS}")

‎cmake/cuda.cmake

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -203,25 +203,26 @@ list(APPEND CUDA_NVCC_FLAGS "-w")
203203
list(APPEND CUDA_NVCC_FLAGS "--expt-relaxed-constexpr")
204204

205205
if (NOT WIN32)
206-
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
207-
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})
208-
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
209-
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
210-
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
211-
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
212-
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
213-
# nvcc 9 does not support -Os. Use Release flags instead
214-
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
215-
endif()
206+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
207+
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})
208+
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
209+
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
210+
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
211+
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
212+
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
213+
# nvcc 9 does not support -Os. Use Release flags instead
214+
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
215+
endif()
216216
else(NOT WIN32)
217-
list(APPEND CUDA_NVCC_FLAGS "--compiler-options;/bigobj")
218-
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
219-
list(APPEND CUDA_NVCC_FLAGS "-g -G")
220-
# match the cl's _ITERATOR_DEBUG_LEVEL
221-
list(APPEND CUDA_NVCC_FLAGS "-D_DEBUG")
222-
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
223-
list(APPEND CUDA_NVCC_FLAGS "-O3 -DNDEBUG")
224-
else()
217+
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler \"/wd 4244 /wd 4267 /wd 4819\"")
218+
list(APPEND CUDA_NVCC_FLAGS "--compiler-options;/bigobj")
219+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
220+
list(APPEND CUDA_NVCC_FLAGS "-g -G")
221+
# match the cl's _ITERATOR_DEBUG_LEVEL
222+
list(APPEND CUDA_NVCC_FLAGS "-D_DEBUG")
223+
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
224+
list(APPEND CUDA_NVCC_FLAGS "-O3 -DNDEBUG")
225+
else()
225226
message(FATAL "Windows only support Release or Debug build now. Please set visual studio build type to Release/Debug, x64 build.")
226227
endif()
227228
endif(NOT WIN32)

‎cmake/external/glog.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ SET(GLOG_INCLUDE_DIR "${GLOG_INSTALL_DIR}/include" CACHE PATH "glog include dire
2020

2121
IF(WIN32)
2222
SET(GLOG_LIBRARIES "${GLOG_INSTALL_DIR}/lib/libglog.lib" CACHE FILEPATH "glog library." FORCE)
23+
SET(GLOG_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4530")
2324
ELSE(WIN32)
2425
SET(GLOG_LIBRARIES "${GLOG_INSTALL_DIR}/lib/libglog.a" CACHE FILEPATH "glog library." FORCE)
26+
SET(GLOG_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
2527
ENDIF(WIN32)
2628

2729
INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIR})
@@ -39,7 +41,7 @@ ExternalProject_Add(
3941
UPDATE_COMMAND ""
4042
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
4143
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
42-
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
44+
-DCMAKE_CXX_FLAGS=${GLOG_CMAKE_CXX_FLAGS}
4345
-DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
4446
-DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
4547
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}

‎cmake/external/mkldnn.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ IF(NOT WIN32)
4949
SET(MKLDNN_FLAG "${MKLDNN_FLAG} -Wno-unused-result -Wno-unused-value")
5050
SET(MKLDNN_CFLAG "${CMAKE_C_FLAGS} ${MKLDNN_FLAG}")
5151
SET(MKLDNN_CXXFLAG "${CMAKE_CXX_FLAGS} ${MKLDNN_FLAG}")
52+
ELSE()
53+
SET(MKLDNN_CXXFLAG "${CMAKE_CXX_FLAGS} /EHsc")
5254
ENDIF(NOT WIN32)
5355

5456
ExternalProject_Add(
@@ -61,7 +63,6 @@ ExternalProject_Add(
6163
UPDATE_COMMAND ""
6264
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
6365
CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
64-
CMAKE_ARGS -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
6566
CMAKE_ARGS -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
6667
CMAKE_ARGS -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
6768
CMAKE_ARGS -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}

‎cmake/external/snappy.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ set(SNAPPY_SOURCES_DIR ${THIRD_PARTY_PATH}/snappy)
2020
set(SNAPPY_INSTALL_DIR ${THIRD_PARTY_PATH}/install/snappy)
2121
set(SNAPPY_INCLUDE_DIR "${SNAPPY_INSTALL_DIR}/include" CACHE PATH "snappy include directory." FORCE)
2222

23+
if(WIN32)
24+
SET(SNAPPY_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267")
25+
else()
26+
SET(SNAPPY_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
27+
endif()
28+
2329
ExternalProject_Add(
2430
extern_snappy
2531
GIT_REPOSITORY "https://github.com/google/snappy"
@@ -31,7 +37,7 @@ ExternalProject_Add(
3137
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
3238
-DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
3339
-DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
34-
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
40+
-DCMAKE_CXX_FLAGS=${SNAPPY_CMAKE_CXX_FLAGS}
3541
-DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
3642
-DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
3743
-DCMAKE_INSTALL_PREFIX=${SNAPPY_INSTALL_DIR}

‎cmake/flags.cmake

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@ set(GPU_COMMON_FLAGS
147147
-Wno-error=unused-function # Warnings in Numpy Header.
148148
-Wno-error=array-bounds # Warnings in Eigen::array
149149
)
150-
151-
else(NOT WIN32)
152-
set(COMMON_FLAGS
153-
"/w") #disable all warnings.
154-
set(GPU_COMMON_FLAGS
155-
"/w") #disable all warnings
156150
endif(NOT WIN32)
157151

158152
if (APPLE)
@@ -193,8 +187,7 @@ safe_set_static_flag()
193187
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
194188
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
195189
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
196-
if(${flag_var} MATCHES "/W3")
197-
string(REGEX REPLACE "/W3" "/w" ${flag_var} "${${flag_var}}")
198-
endif(${flag_var} MATCHES "/W3")
190+
string(REGEX REPLACE "(^| )/W[0-9]( |$)" " " ${flag_var} "${${flag_var}}")
191+
set(flag_var "${flag_var} /w")
199192
endforeach(flag_var)
200193
endif(WIN32)

‎paddle/fluid/imperative/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(WITH_PYTHON)
2-
cc_library(layer SRCS layer.cc DEPS proto_desc operator device_context blas)
3-
cc_library(tracer SRCS tracer.cc DEPS proto_desc device_context)
2+
cc_library(layer SRCS layer.cc DEPS proto_desc operator device_context blas pybind)
3+
cc_library(tracer SRCS tracer.cc DEPS proto_desc device_context pybind)
44
cc_library(engine SRCS engine.cc)
55
endif()

‎paddle/fluid/inference/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@ if(WIN32)
5858
sep_library(paddle_fluid_shared SHARED SRCS ${SHARED_INFERENCE_SRCS}
5959
DEPS ${fluid_modules} paddle_fluid_api reset_tensor_array
6060
analysis_config paddle_pass_builder)
61-
target_link_libraries(paddle_fluid_shared shlwapi)
6261
else(WIN32)
6362
cc_library(paddle_fluid_shared SHARED SRCS ${SHARED_INFERENCE_SRCS}
6463
DEPS ${fluid_modules} paddle_fluid_api reset_tensor_array
6564
analysis_config paddle_pass_builder)
6665
endif()
66+
get_property(os_dependency_modules GLOBAL PROPERTY OS_DEPENDENCY_MODULES)
67+
target_link_libraries(paddle_fluid_shared ${os_dependency_modules})
6768

6869
set_target_properties(paddle_fluid_shared PROPERTIES OUTPUT_NAME paddle_fluid)
6970
if(NOT APPLE AND NOT WIN32)

‎paddle/fluid/inference/analysis/ir_passes/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
cc_library(subgraph_detector SRCS subgraph_detector.cc DEPS proto_desc)
2+
if(WITH_TESTING)
3+
add_dependencies(subgraph_detector gtest)
4+
endif()
25

36
if (WITH_GPU AND TENSORRT_FOUND)
47
cc_library(tensorrt_subgraph_pass SRCS tensorrt_subgraph_pass.cc DEPS subgraph_detector tensorrt_op_teller)

0 commit comments

Comments
 (0)