Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CI] Add Windows GPU to Jenkins CI pipeline #4463

Merged
merged 12 commits into from
May 14, 2019
Merged

[CI] Add Windows GPU to Jenkins CI pipeline #4463

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b4545ea
Fix #4462: Use /MT flag consistently for MSVC target
hcho3 May 13, 2019
87ea097
First attempt at Windows CI
hcho3 May 13, 2019
ccaa967
Distinguish stages in Linux and Windows pipelines
hcho3 May 13, 2019
8ec24c2
Try running CMake in Windows pipeline
hcho3 May 13, 2019
cbe6329
Add build step
hcho3 May 13, 2019
ec3a148
Specify full path of msbuild
hcho3 May 13, 2019
8450f05
Use CMD (bat) instead of Git Bash
hcho3 May 13, 2019
13400a3
Eschew vcvarsall.bat
hcho3 May 13, 2019
38cb8cb
Chain conda activate with Python wheel build command
hcho3 May 13, 2019
7ab6efe
Split commands to detect failure
hcho3 May 13, 2019
28dc21b
Try running MSBuild up to three times
hcho3 May 14, 2019
8077abb
Add back add_dependencies(), per @RAMitchell's suggestion
hcho3 May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ if (MSVC)
endif (MSVC)

set_default_configuration_release()
msvc_use_static_runtime()

#-- Options
option(BUILD_C_DOC "Build documentation for C APIs using Doxygen." OFF)
Expand Down Expand Up @@ -67,6 +66,7 @@ if (USE_CUDA)
endif (USE_CUDA)

# dmlc-core
msvc_use_static_runtime()
add_subdirectory(${PROJECT_SOURCE_DIR}/dmlc-core)
set_target_properties(dmlc PROPERTIES
CXX_STANDARD 11
Expand Down Expand Up @@ -214,3 +214,8 @@ if (GOOGLE_TEST)
PROPERTIES
PASS_REGULAR_EXPRESSION ".*test-rmse:0.087.*")
endif (GOOGLE_TEST)

# For MSVC: Call msvc_use_static_runtime() once again to completely
# replace /MD with /MT. See https://github.com/dmlc/xgboost/issues/4462
# for issues caused by mixing of /MD and /MT flags
msvc_use_static_runtime()
9 changes: 9 additions & 0 deletions cmake/Utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ endfunction(auto_source_group)
function(msvc_use_static_runtime)
if(MSVC)
set(variables
CMAKE_C_FLAGS_DEBUG
CMAKE_C_FLAGS_MINSIZEREL
CMAKE_C_FLAGS_RELEASE
CMAKE_C_FLAGS_RELWITHDEBINFO
CMAKE_CXX_FLAGS_DEBUG
CMAKE_CXX_FLAGS_MINSIZEREL
CMAKE_CXX_FLAGS_RELEASE
Expand All @@ -29,6 +33,7 @@ function(msvc_use_static_runtime)
endif()
endforeach()
set(variables
CMAKE_CUDA_FLAGS
CMAKE_CUDA_FLAGS_DEBUG
CMAKE_CUDA_FLAGS_MINSIZEREL
CMAKE_CUDA_FLAGS_RELEASE
Expand All @@ -39,6 +44,10 @@ function(msvc_use_static_runtime)
string(REGEX REPLACE "-MD" "-MT" ${variable} "${${variable}}")
set(${variable} "${${variable}}" PARENT_SCOPE)
endif()
if(${variable} MATCHES "/MD")
string(REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
set(${variable} "${${variable}}" PARENT_SCOPE)
endif()
endforeach()
endif()
endfunction(msvc_use_static_runtime)
Expand Down
8 changes: 7 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if (USE_CUDA)
$<$<COMPILE_LANGUAGE:CUDA>:--expt-extended-lambda>
$<$<COMPILE_LANGUAGE:CUDA>:--expt-relaxed-constexpr>
$<$<COMPILE_LANGUAGE:CUDA>:-lineinfo>
$<$<COMPILE_LANGUAGE:CUDA>:--std=c++11>
$<$<AND:$<NOT:$<CXX_COMPILER_ID:MSVC>>,$<COMPILE_LANGUAGE:CUDA>>:--std=c++11>
hcho3 marked this conversation as resolved.
Show resolved Hide resolved
$<$<COMPILE_LANGUAGE:CUDA>:${GEN_CODE}>)

if (USE_NCCL)
Expand Down Expand Up @@ -113,4 +113,10 @@ if (USE_OPENMP)
set(LINKED_LIBRARIES_PRIVATE "${LINKED_LIBRARIES_PRIVATE};${SRC_LIBS}" PARENT_SCOPE)
endif (OpenMP_CXX_FOUND OR OPENMP_FOUND)
endif (USE_OPENMP)

# For MSVC: Call msvc_use_static_runtime() once again to completely
# replace /MD with /MT. See https://github.com/dmlc/xgboost/issues/4462
# for issues caused by mixing of /MD and /MT flags
msvc_use_static_runtime()

#-- End object library