Skip to content
This repository was archived by the owner on Sep 13, 2024. It is now read-only.

Add auto resolve mechanism #38

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add auto resolve mechanism #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f16494
Add auto resolve mechanism
peterjc123 Nov 3, 2018
6e41c07
Merge branch 'master' into add_build_feature
peterjc123 Nov 15, 2018
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
23 changes: 23 additions & 0 deletions auto.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,29 @@ IF NOT "%CUDA_PATH_V8_0%"=="" IF "%CUDA_PATH_V8_0%"=="%CUDA_PATH%" (
)
)


IF "%CUDA_PATH_V8_0%"=="%CUDA_PATH%" (
set CUDA_VERSION=80
set CUDA_VERSION_STR=8.0
)
IF "%CUDA_PATH_V9_0%"=="%CUDA_PATH%" (
set CUDA_VERSION=90
set CUDA_VERSION_STR=9.0
)
IF "%CUDA_PATH_V9_1%"=="%CUDA_PATH%" (
set CUDA_VERSION=91
set CUDA_VERSION_STR=9.1
)
IF "%CUDA_PATH_V9_2%"=="%CUDA_PATH%" (
set CUDA_VERSION=92
set CUDA_VERSION_STR=9.2
)
IF "%CUDA_PATH_V10_0%"=="%CUDA_PATH%" (
set CUDA_VERSION=100
set CUDA_VERSION_STR=10.0
)


:optcheck

call internal\check_opts.bat
Expand Down
31 changes: 21 additions & 10 deletions cuda100.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,30 @@ REM Check for optional components

set NO_CUDA=
set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
set CUDA_VERSION=100
set CUDA_VERSION_STR=10.0

IF "%NVTOOLSEXT_PATH%"=="" (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
set NO_CUDA=1
goto optcheck
IF "%CUDA_PATH_V10_0%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat cuda100
IF ERRORLEVEL 1 goto eof
) ELSE (
echo CUDA 10.0 not found
goto eof
)
)

IF "%CUDA_PATH_V10_0%"=="" (
echo CUDA 9.2 not found, disabling it
set NO_CUDA=1
) ELSE (
set "CUDA_PATH=%CUDA_PATH_V10_0%"
set "PATH=%CUDA_PATH_V10_0%\bin;%PATH%"
set "CUDA_PATH=%CUDA_PATH_V10_0%"
set "PATH=%CUDA_PATH_V10_0%\bin;%PATH%"

IF "%NVTOOLSEXT_PATH%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat nvtx
IF ERRORLEVEL 1 goto eof
) ELSE (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed
goto eof
)
)

:optcheck
Expand Down
33 changes: 33 additions & 0 deletions cuda80.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ REM Check for optional components

set NO_CUDA=
set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
set CUDA_VERSION=80
set CUDA_VERSION_STR=8.0

IF "%NVTOOLSEXT_PATH%"=="" (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
Expand All @@ -39,6 +41,37 @@ IF "%CUDA_PATH_V8_0%"=="" (
)
)

IF "%CUDA_PATH_V8_0%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat cuda80
IF ERRORLEVEL 1 goto eof
) ELSE (
echo CUDA 8.0 not found
goto eof
)
)

set "CUDA_PATH=%CUDA_PATH_V8_0%"
set "PATH=%CUDA_PATH_V8_0%\bin;%PATH%"

IF "%VS140COMNTOOLS%"=="" (
echo CUDA 8 found, but VS2015 not found
goto eof
) ELSE (
set CMAKE_GENERATOR=Visual Studio 14 2015 Win64
set "CUDAHOSTCXX=%VS140COMNTOOLS%\..\..\VC\bin\amd64\cl.exe"
)

IF "%NVTOOLSEXT_PATH%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat nvtx
IF ERRORLEVEL 1 goto eof
) ELSE (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed
goto eof
)
)

:optcheck

call internal\check_opts.bat
Expand Down
31 changes: 21 additions & 10 deletions cuda90.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,30 @@ REM Check for optional components

set NO_CUDA=
set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
set CUDA_VERSION=90
set CUDA_VERSION_STR=9.0

IF "%NVTOOLSEXT_PATH%"=="" (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
set NO_CUDA=1
goto optcheck
IF "%CUDA_PATH_V9_0%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat cuda90
IF ERRORLEVEL 1 goto eof
) ELSE (
echo CUDA 9.0 not found
goto eof
)
)

IF "%CUDA_PATH_V9_0%"=="" (
echo CUDA 9 not found, disabling it
set NO_CUDA=1
) ELSE (
set "CUDA_PATH=%CUDA_PATH_V9_0%"
set "PATH=%CUDA_PATH_V9_0%\bin;%PATH%"
set "CUDA_PATH=%CUDA_PATH_V9_0%"
set "PATH=%CUDA_PATH_V9_0%\bin;%PATH%"

IF "%NVTOOLSEXT_PATH%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat nvtx
IF ERRORLEVEL 1 goto eof
) ELSE (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed
goto eof
)
)

:optcheck
Expand Down
31 changes: 21 additions & 10 deletions cuda91.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,30 @@ REM Check for optional components

set NO_CUDA=
set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
set CUDA_VERSION=91
set CUDA_VERSION_STR=9.1

IF "%NVTOOLSEXT_PATH%"=="" (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
set NO_CUDA=1
goto optcheck
IF "%CUDA_PATH_V9_1%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat cuda91
IF ERRORLEVEL 1 goto eof
) ELSE (
echo CUDA 9.1 not found
goto eof
)
)

IF "%CUDA_PATH_V9_1%"=="" (
echo CUDA 9.1 not found, disabling it
set NO_CUDA=1
) ELSE (
set "CUDA_PATH=%CUDA_PATH_V9_1%"
set "PATH=%CUDA_PATH_V9_1%\bin;%PATH%"
set "CUDA_PATH=%CUDA_PATH_V9_1%"
set "PATH=%CUDA_PATH_V9_1%\bin;%PATH%"

IF "%NVTOOLSEXT_PATH%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat nvtx
IF ERRORLEVEL 1 goto eof
) ELSE (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed
goto eof
)
)

:optcheck
Expand Down
31 changes: 21 additions & 10 deletions cuda92.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,30 @@ REM Check for optional components

set NO_CUDA=
set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
set CUDA_VERSION=92
set CUDA_VERSION_STR=9.2

IF "%NVTOOLSEXT_PATH%"=="" (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
set NO_CUDA=1
goto optcheck
IF "%CUDA_PATH_V9_2%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat cuda92
IF ERRORLEVEL 1 goto eof
) ELSE (
echo CUDA 9.2 not found
goto eof
)
)

IF "%CUDA_PATH_V9_2%"=="" (
echo CUDA 9.2 not found, disabling it
set NO_CUDA=1
) ELSE (
set "CUDA_PATH=%CUDA_PATH_V9_2%"
set "PATH=%CUDA_PATH_V9_2%\bin;%PATH%"
set "CUDA_PATH=%CUDA_PATH_V9_2%"
set "PATH=%CUDA_PATH_V9_2%\bin;%PATH%"

IF "%NVTOOLSEXT_PATH%"=="" (
IF %AUTO_RESOLVE_VALUE% GEQ 1 (
call internal\auto_resolve.bat nvtx
IF ERRORLEVEL 1 goto eof
) ELSE (
echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed
goto eof
)
)

:optcheck
Expand Down
Loading