Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

32 to 64 bit toolchain for windows-gpu build #17916

Closed
ChaiBapchya wants to merge 12 commits into from
Closed

32 to 64 bit toolchain for windows-gpu build #17916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2e638df
32 to 64 bit toolchain
ChaiBapchya Mar 26, 2020
10b82f8
Removing jom
ChaiBapchya Mar 26, 2020
0f7b5f1
Update build_windows.py
ChaiBapchya Mar 26, 2020
91c14fd
Update build_windows.py
ChaiBapchya Mar 26, 2020
3063167
check if split arch resolves linking errors
ChaiBapchya Mar 27, 2020
f8e1f43
Revert "check if split arch resolves linking errors"
ChaiBapchya Mar 27, 2020
4d70698
Update build_windows.py
ChaiBapchya Mar 27, 2020
0c92929
Update build_windows.py
ChaiBapchya Mar 27, 2020
921e70f
indent fix
ChaiBapchya Mar 27, 2020
0ae2311
Update dmlc-core to include VS2019 fix
ChaiBapchya Mar 27, 2020
a367cb8
Change bat file from x86_64 to 64
ChaiBapchya Mar 28, 2020
88e63f1
try with ninja
ChaiBapchya Mar 28, 2020
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
2 changes: 1 addition & 1 deletion 3rdparty/dmlc-core
Open in desktop
Submodule dmlc-core updated 19 files
+38 −0 .github/workflows/githubci.yml
+0 −87 .travis.yml
+1 −1 README.md
+13 −0 appveyor.yml
+0 −1 cmake/build_config.h.in
+1 −16 doc/Doxyfile
+0 −1 include/dmlc/build_config_default.h
+18 −18 include/dmlc/concurrentqueue.h
+7 −14 scripts/packages.mk
+0 −0 scripts/s390x/Dockerfile
+0 −0 scripts/s390x/build_via_cmake.sh
+1 −1 scripts/s390x/ci_build.sh
+0 −0 scripts/s390x/entrypoint.sh
+0 −32 scripts/setup_nvcc.sh
+9 −5 scripts/test_script.sh
+0 −3 scripts/travis/travis_before_cache.sh
+0 −13 scripts/travis/travis_osx_install.sh
+0 −40 scripts/travis/travis_setup_env.sh
+0 −16 src/build_config.cc
51 changes: 40 additions & 11 deletions ci/build_windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,14 @@

from util import *

# Fix for broken PATH with newline inserted presumably by VS studio installation of SQL server or
# other component which makes visual studio stop working.
os.environ['PATH']=os.environ.get('PATH').replace('\n','')

KNOWN_VCVARS = {
'VS 2015': r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat',
'VS 2017': r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat'
'VS 2017': r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat',
'VS 2019': r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat'
}


Expand All @@ -54,10 +59,14 @@ class BuildFlavour(Enum):

CMAKE_FLAGS = {
'WIN_CPU': (
'-DCMAKE_C_COMPILER=cl '
'-DCMAKE_CXX_COMPILER=cl '
'-DOpenCV_RUNTIME=vc15 '
'-DOpenCV_ARCH=x64 '
'-DUSE_CUDA=OFF '
'-DUSE_CUDNN=OFF '
'-DENABLE_CUDA_RTC=OFF '
'-DUSE_OPENCV=ON '
'-DUSE_OPENCV=OFF '
'-DUSE_OPENMP=ON '
'-DUSE_BLAS=open '
'-DUSE_LAPACK=ON '
Expand All @@ -67,10 +76,14 @@ class BuildFlavour(Enum):
'-DCMAKE_BUILD_TYPE=Release')

, 'WIN_CPU_MKLDNN': (
'-DCMAKE_C_COMPILER=cl '
'-DCMAKE_CXX_COMPILER=cl '
'-DOpenCV_RUNTIME=vc15 '
'-DOpenCV_ARCH=x64 '
'-DUSE_CUDA=OFF '
'-DUSE_CUDNN=OFF '
'-DENABLE_CUDA_RTC=OFF '
'-DUSE_OPENCV=ON '
'-DUSE_OPENCV=OFF '
'-DUSE_OPENMP=ON '
'-DUSE_BLAS=open '
'-DUSE_LAPACK=ON '
Expand All @@ -80,10 +93,14 @@ class BuildFlavour(Enum):
'-DCMAKE_BUILD_TYPE=Release')

, 'WIN_CPU_MKLDNN_MKL': (
'-DCMAKE_C_COMPILER=cl '
'-DCMAKE_CXX_COMPILER=cl '
'-DOpenCV_RUNTIME=vc15 '
'-DOpenCV_ARCH=x64 '
'-DUSE_CUDA=OFF '
'-DUSE_CUDNN=OFF '
'-DENABLE_CUDA_RTC=OFF '
'-DUSE_OPENCV=ON '
'-DUSE_OPENCV=OFF '
'-DUSE_OPENMP=ON '
'-DUSE_BLAS=mkl '
'-DUSE_LAPACK=ON '
Expand All @@ -93,10 +110,14 @@ class BuildFlavour(Enum):
'-DCMAKE_BUILD_TYPE=Release')

, 'WIN_CPU_MKL': (
'-DCMAKE_C_COMPILER=cl '
'-DCMAKE_CXX_COMPILER=cl '
'-DOpenCV_RUNTIME=vc15 '
'-DOpenCV_ARCH=x64 '
'-DUSE_CUDA=OFF '
'-DUSE_CUDNN=OFF '
'-DENABLE_CUDA_RTC=OFF '
'-DUSE_OPENCV=ON '
'-DUSE_OPENCV=OFF '
'-DUSE_OPENMP=ON '
'-DUSE_BLAS=mkl '
'-DUSE_LAPACK=ON '
Expand All @@ -106,10 +127,14 @@ class BuildFlavour(Enum):
'-DCMAKE_BUILD_TYPE=Release')

, 'WIN_GPU': (
'-DCMAKE_C_COMPILER=cl '
'-DCMAKE_CXX_COMPILER=cl '
'-DOpenCV_RUNTIME=vc15 '
'-DOpenCV_ARCH=x64 '
'-DUSE_CUDA=ON '
'-DUSE_CUDNN=ON '
'-DENABLE_CUDA_RTC=ON '
'-DUSE_OPENCV=ON '
'-DUSE_OPENCV=OFF '
'-DUSE_OPENMP=ON '
'-DUSE_BLAS=open '
'-DUSE_LAPACK=ON '
Expand All @@ -120,10 +145,14 @@ class BuildFlavour(Enum):
'-DCMAKE_BUILD_TYPE=Release')

, 'WIN_GPU_MKLDNN': (
'-DCMAKE_C_COMPILER=cl '
'-DCMAKE_CXX_COMPILER=cl '
'-DOpenCV_RUNTIME=vc15 '
'-DOpenCV_ARCH=x64 '
'-DUSE_CUDA=ON '
'-DUSE_CUDNN=ON '
'-DENABLE_CUDA_RTC=ON '
'-DUSE_OPENCV=ON '
'-DUSE_OPENCV=OFF '
'-DUSE_OPENMP=ON '
'-DUSE_BLAS=open '
'-DUSE_LAPACK=ON '
Expand Down Expand Up @@ -154,15 +183,15 @@ def windows_build(args):

with remember_cwd():
os.chdir(path)
cmd = "\"{}\" && {} -G \"NMake Makefiles JOM\" {} {}".format(
cmd = "\"{}\" && {} -G Ninja -A x64 -T host=x64 {} {}".format(
args.vcvars,
os.path.join(tmpdir, 'cmake-3.16.1-win64-x64', 'bin', 'cmake.exe'),
CMAKE_FLAGS[args.flavour], mxnet_root)
logging.info("Generating project with CMake:\n{}".format(cmd))
check_call(cmd, shell=True)

cmd = "\"{}\" && jom".format(args.vcvars)
logging.info("Building with jom:\n{}".format(cmd))
cmd = "\"{}\" && ninja".format(args.vcvars)
logging.info("Building:\n{}".format(cmd))

t0 = int(time.time())
check_call(cmd, shell=True)
Expand Down Expand Up @@ -233,7 +262,7 @@ def main():

parser.add_argument("--vcvars",
help="vcvars batch file location, typically inside vs studio install dir",
default=KNOWN_VCVARS['VS 2015'],
default=KNOWN_VCVARS['VS 2019'],
type=str)

parser.add_argument("--arch",
Expand Down