From 13157268aa9bafaf01083bdc33f079ecaf65e10e Mon Sep 17 00:00:00 2001 From: Avin0323 Date: Fri, 5 Mar 2021 17:45:26 +0800 Subject: [PATCH 1/5] Optimize compilation with Ninja, notest, test=windows_ci, test=windows_op --- CMakeLists.txt | 7 +++++++ cmake/cuda.cmake | 1 + paddle/scripts/paddle_build.bat | 1 + 3 files changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f24513d605c49b..992c3f1c4fa332 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,13 @@ if(WIN32) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /bigobj") + if("${CMAKE_GENERATOR}" STREQUAL "Ninja") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Zc:inline") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zc:inline") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Zc:inline") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zc:inline") + endif() + if (MSVC_STATIC_CRT) message(STATUS "Use static C runtime time, refer to https://docs.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=vs-2019") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd") diff --git a/cmake/cuda.cmake b/cmake/cuda.cmake index 2f4f5449f482d7..d7c1080882c7c7 100644 --- a/cmake/cuda.cmake +++ b/cmake/cuda.cmake @@ -222,6 +222,7 @@ set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-extended-lambda") if(WIN32) set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler \"/wd4244 /wd4267 /wd4819 \"") set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler /bigobj") + set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler /Zc:inline") if(CMAKE_BUILD_TYPE STREQUAL "Debug") # match the cl's _ITERATOR_DEBUG_LEVEL set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler \"-g -G -D_DEBUG\"") diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index 5d095e99c3d1f4..93d0fd63698487 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -31,6 +31,7 @@ wmic process where name="op_function_generator.exe" call terminate taskkill /f /im python.exe 2>NUL rem ------initialize common variable------ +set GENERATOR="Ninja" if not defined GENERATOR set GENERATOR="Visual Studio 14 2015 Win64" if not defined BRANCH set BRANCH=develop if not defined WITH_TENSORRT set WITH_TENSORRT=ON From 42321a9bda678a64831395171586fdadded7b068 Mon Sep 17 00:00:00 2001 From: Avin0323 Date: Fri, 5 Mar 2021 17:54:49 +0800 Subject: [PATCH 2/5] no cache on windows ci, notest, test=windows_ci, test=windows_op --- paddle/scripts/paddle_build.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index 93d0fd63698487..16c3f5758e1bce 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -32,6 +32,8 @@ taskkill /f /im python.exe 2>NUL rem ------initialize common variable------ set GENERATOR="Ninja" +set WITH_TPCACHE=OFF +set WITH_CACHE=OFF if not defined GENERATOR set GENERATOR="Visual Studio 14 2015 Win64" if not defined BRANCH set BRANCH=develop if not defined WITH_TENSORRT set WITH_TENSORRT=ON From 423263d3ff85d705751ef7ecb93c6788a46b783a Mon Sep 17 00:00:00 2001 From: Avin0323 Date: Mon, 8 Mar 2021 11:11:51 +0800 Subject: [PATCH 3/5] delete /Zc:inline compiled in NVCC, notest, test=windows_ci, test=windows_op --- cmake/cuda.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/cuda.cmake b/cmake/cuda.cmake index d7c1080882c7c7..2f4f5449f482d7 100644 --- a/cmake/cuda.cmake +++ b/cmake/cuda.cmake @@ -222,7 +222,6 @@ set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-extended-lambda") if(WIN32) set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler \"/wd4244 /wd4267 /wd4819 \"") set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler /bigobj") - set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler /Zc:inline") if(CMAKE_BUILD_TYPE STREQUAL "Debug") # match the cl's _ITERATOR_DEBUG_LEVEL set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler \"-g -G -D_DEBUG\"") From 2e7f9843fb4ef5e9a9673c578e906b5c70ef3fef Mon Sep 17 00:00:00 2001 From: Avin0323 Date: Tue, 9 Mar 2021 23:07:30 +0800 Subject: [PATCH 4/5] fix test_warpctc_op, notest, test=windows_ci --- cmake/external/warpctc.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/external/warpctc.cmake b/cmake/external/warpctc.cmake index 0ee3e2116a94b6..e633cae540196b 100644 --- a/cmake/external/warpctc.cmake +++ b/cmake/external/warpctc.cmake @@ -49,12 +49,12 @@ ExternalProject_Add( BUILD_ALWAYS 1 CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} - -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} - -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} - -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} - -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} + -DCMAKE_C_FLAGS=$ + -DCMAKE_C_FLAGS_DEBUG=$ + -DCMAKE_C_FLAGS_RELEASE=$ + -DCMAKE_CXX_FLAGS=$ + -DCMAKE_CXX_FLAGS_RELEASE=$ + -DCMAKE_CXX_FLAGS_DEBUG=$ -DCMAKE_INSTALL_PREFIX=${WARPCTC_INSTALL_DIR} -DWITH_GPU=${WITH_GPU} -DWITH_OMP=${USE_OMP} From 61a689d40f398063614b10bb2b92a19908f82e41 Mon Sep 17 00:00:00 2001 From: Avin0323 Date: Wed, 10 Mar 2021 09:56:38 +0800 Subject: [PATCH 5/5] remove test code, test=develop --- paddle/scripts/paddle_build.bat | 3 --- 1 file changed, 3 deletions(-) diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index 16c3f5758e1bce..5d095e99c3d1f4 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -31,9 +31,6 @@ wmic process where name="op_function_generator.exe" call terminate taskkill /f /im python.exe 2>NUL rem ------initialize common variable------ -set GENERATOR="Ninja" -set WITH_TPCACHE=OFF -set WITH_CACHE=OFF if not defined GENERATOR set GENERATOR="Visual Studio 14 2015 Win64" if not defined BRANCH set BRANCH=develop if not defined WITH_TENSORRT set WITH_TENSORRT=ON