diff --git a/CMakeLists.txt b/CMakeLists.txt index d2953a001cd0..7f01413c1a4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,6 +163,7 @@ if(MSVC) add_definitions(-DDMLC_STRICT_CXX11) add_definitions(-DNOMINMAX) set(CMAKE_C_FLAGS "/MP") + # report an accurate value for recent C++ language standards support set(CMAKE_CXX_FLAGS "/Zc:__cplusplus") set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} /bigobj") else() diff --git a/ci/build_windows.py b/ci/build_windows.py index 7412a733bc90..0215a1908d2e 100755 --- a/ci/build_windows.py +++ b/ci/build_windows.py @@ -171,7 +171,7 @@ def windows_build(args): logging.info("Using vcvars environment:\n{}".format(args.vcvars)) path = args.output - + # cuda thrust + VS is flaky so try multiple times if fail MAXIMUM_TRY = 5 build_try = 0 @@ -197,7 +197,7 @@ def windows_build(args): t0 = int(time.time()) ret = call(cmd, shell=True) - + if ret != 0: build_try += 1 logging.info("{} build(s) have failed".format(build_try)) @@ -226,7 +226,7 @@ def windows_package(args): for dll in dlls: logging.info("packing dll: %s", dll) shutil.copy(dll, pkgdir_lib) - + os.chdir(get_mxnet_root()) logging.info('packing python bindings') copy_tree('python', j(pkgdir, 'python')) @@ -234,7 +234,7 @@ def windows_package(args): copy_tree('include', j(pkgdir, 'include')) logging.info("Compressing package: %s", pkgfile) check_call(['7z', 'a', pkgfile, pkgdir]) - + def nix_build(args): path = args.output diff --git a/ci/windows/test_py3_gpu.ps1 b/ci/windows/test_py3_gpu.ps1 index 7a829273ee9c..6286bc0a3c82 100644 --- a/ci/windows/test_py3_gpu.ps1 +++ b/ci/windows/test_py3_gpu.ps1 @@ -25,15 +25,6 @@ $env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home') $env:PATH+=[io.path]::combine($pwd.Path,"windows_package\lib") -echo "Printing env vars" -echo $env:MXNET_LIBRARY_PATH -echo $env:PYTHONPATH -echo $env:MXNET_HOME -echo $env:PATH -Get-ChildItem -Path (join-path $pwd.Path windows_package\lib) -Invoke-RestMethod -uri http://169.254.169.254/latest/meta-data/instance-type -echo "All printed" - C:\Python37\Scripts\pip install -r tests\requirements.txt C:\Python37\Scripts\pip install -e $env:PYTHONPATH