Drop CUDA 9.2 support for gpu_mod build on Windows.

98228a1c · hhakim · 3d736c93 · 98228a1c · 98228a1c · 98228a1c
Commit 98228a1c authored 2 years ago by hhakim
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,15 +144,6 @@ pkg_macos:
          #- cmake -G "MinGW Makefiles" -DCMAKE_CUDA_COMPILER="E:/NVIDIA GPU Computing Toolkit/CUDA/v9.2/bin/nvcc.exe" .. #-DCUDA_HOST_COMPILER="E:/TDM-GCC-64/bin/g++.exe" ..
        - cmake --build . --config %BUILD_CONFIG%
        - move %BUILD_CONFIG%\gm.dll .
-        - cd ..
-        - set CUDA_PATH=%CUDA_PATH_V9_2%
-        - set CUDA_PATH_V11_4=
-        - if NOT EXIST build-cu9.2 (mkdir build-cu9.2) else (rmdir /S /Q build-cu9.2 & mkdir build-cu9.2)
-        - cd build-cu9.2
-        - cmake -G "Visual Studio 14 Win64" ..
-          #- cmake -G "MinGW Makefiles" -DCMAKE_CUDA_COMPILER="E:/NVIDIA GPU Computing Toolkit/CUDA/v9.2/bin/nvcc.exe" .. #-DCUDA_HOST_COMPILER="E:/TDM-GCC-64/bin/g++.exe" ..
-        - cmake --build . --config %BUILD_CONFIG%
-        - move %BUILD_CONFIG%\gm.dll .
        - cd ..\..

 pkg_win:
@@ -585,20 +576,11 @@ pkg_linux_purepy_release_openblaso:
          #- cmake -G "MinGW Makefiles" -DCMAKE_CUDA_COMPILER="E:/NVIDIA GPU Computing Toolkit/CUDA/v9.2/bin/nvcc.exe" .. #-DCUDA_HOST_COMPILER="E:/TDM-GCC-64/bin/g++.exe" ..
        - cmake --build . --config %BUILD_CONFIG%
        - move %BUILD_CONFIG%\gm.dll .
-        - cd ..
-        - set CUDA_PATH=%CUDA_PATH_V9_2%
-        - set CUDA_PATH_V11_4=
-        - if NOT EXIST build-cu9.2 (mkdir build-cu9.2) else (rmdir /S /Q build-cu9.2 & mkdir build-cu9.2)
-        - cd build-cu9.2
-        - cmake -G "Visual Studio 14 Win64" ..
-          #- cmake -G "MinGW Makefiles" -DCMAKE_CUDA_COMPILER="E:/NVIDIA GPU Computing Toolkit/CUDA/v9.2/bin/nvcc.exe" .. #-DCUDA_HOST_COMPILER="E:/TDM-GCC-64/bin/g++.exe" ..
-        - cmake --build . --config %BUILD_CONFIG%
-        - move %BUILD_CONFIG%\gm.dll .
        - cd ..\..
        - if NOT EXIST build (mkdir build) else (rmdir /S /Q build & mkdir build)
        - cd build
        - 'cmake -G "Visual Studio 14 2015" -DBUILD_WRAPPER_MATLAB=OFF -DBUILD_WRAPPER_PYTHON=ON -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%VERSION% -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF  -DUSE_MATIO_STATIC_LIBS=ON -DMATIO_STATIC_LIB_PATH="C:/Users/faust/Downloads/matio-1.5.13/visual_studio/x64/Release/libmatio.lib" -DZ_STATIC_LIB_PATH="C:/Users/faust/Downloads/zlib-1.2.11/contrib/vstudio/vc14/x64/ZlibStatDebug/zlibstat.lib" -DHDF5_STATIC_LIB_PATH="C:/Users/faust/Downloads/hdf5-1.10.3/build/bin/Release/libhdf5.lib" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DEXPERIMENTAL_PKG=%EXPERIMENTAL_PKG% -DUSE_GPU_MOD=ON  -DCMAKE_PREFIX_PATH=../gpu_mod -DBUILD_MULTITHREAD=ON -DBUILD_FLOAT_PYX=ON ..'
-          # explicitely configure distutils (to use the VS configuration we'll tell in next bat script) because by default it uses the most recent VS version but we need to use VS 2015 (because libmatio etc. are compiled with this version)
+          # explicitly configure distutils (to use the VS configuration we'll tell in next bat script) because by default it uses the most recent VS version but we need to use VS 2015 (because libmatio etc. are compiled with this version)
        - set DISTUTILS_USE_SDK=1
        - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat"
        #- make

--- a/wrapper/matlab/CMakeLists.txt
+++ b/wrapper/matlab/CMakeLists.txt
@@ -105,7 +105,7 @@ endforeach()
 file(GLOB CPP_MEXTOOLS_FILES "${FAUST_MATLAB_TOOLS_SRC_DIR}/*.cpp")
 include_directories(${FAUST_MATLAB_TOOLS_SRC_DIR} ${MATLAB_INCLUDE_DIR})
 if(USE_GPU_MOD)
-	include_directories(${FAUST_SRC_LINEAR_OPERATOR_GPU2_DIR} ${GPU_MOD_INCLUDE_DIR} ${GPU_MOD_INCLUDE_DIR}/../build-cu9.2)
+	include_directories(${FAUST_SRC_LINEAR_OPERATOR_GPU2_DIR} ${GPU_MOD_INCLUDE_DIR} ${GPU_MOD_INCLUDE_DIR}/../build-cu11.4)
 endif()
 add_library(${FAUST_MEXTOOLS_TARGET} OBJECT ${CPP_MEXTOOLS_FILES})
 target_compile_definitions(${FAUST_MEXTOOLS_TARGET} PRIVATE MATLAB_DEFAULT_RELEASE=R2018a) #R2017b) # for complex (deprecated) separate complex API

--- a/wrapper/python/CMakeLists.txt
+++ b/wrapper/python/CMakeLists.txt
@@ -57,7 +57,6 @@ else() # in fact this is only for WIN32 MINGW
 	string(REGEX REPLACE "^lib" "" MATIO_LIB_NAME ${MATIO_LIB_NAME})
 	set(FAUST_PYTHON_LIBS "${FAUST_PYTHON_LIBS},'${MATIO_LIB_NAME}'")
 	set(FAUST_PYTHON_LIB_DIR "${FAUST_PYTHON_LIB_DIR},'${MATIO_LIB_DIR}'")
-
 endif()

 set(PROC_LIST CPU)
@@ -187,13 +186,20 @@ if(USE_OPENBLASO AND UNIX)
 endif()

 if(USE_GPU_MOD)
-	set(FAUST_PYTHON_INCLUDE_DIR "${FAUST_PYTHON_INCLUDE_DIR}, '${GPU_MOD_INCLUDE_DIR}', '${GPU_MOD_INCLUDE_DIR}/../build-cu9.2/', '${FAUST_SRC_LINEAR_OPERATOR_GPU2_DIR}'")
+	set(FAUST_PYTHON_INCLUDE_DIR "${FAUST_PYTHON_INCLUDE_DIR}, '${GPU_MOD_INCLUDE_DIR}', '${GPU_MOD_INCLUDE_DIR}/../build-cu11.4/', '${FAUST_SRC_LINEAR_OPERATOR_GPU2_DIR}'")
 	set(FAUST_SETUP_PY_CFLAGS "${FAUST_SETUP_PY_CFLAGS}, '-DUSE_GPU_MOD'")

 	set(GPU_MOD_LIB_PPATH ${FAUST_PYTHON_BIN_DIR}/pyfaust/lib)
 	get_filename_component(GPU_MOD_EXT ${GPU_MOD_LIB} LAST_EXT)
 	get_filename_component(GPU_MOD_NAME ${GPU_MOD_LIB} NAME_WLE)
-	foreach(CUDA_CONF IN ITEMS 9.2 11.4)
+	# TODO: used versions of CUDA and include dir should be CMake variables
+	if(WIN32)
+		# do not support CUDA 9.2 on Windows (require too old version VS <= 2017)
+		CUDA_VERSIONS=11.4
+	else()
+		CUDA_VERSIONS=9.2;11.4
+	endif()
+	foreach(CUDA_CONF IN LISTS CUDA_VERSIONS)
 		set(GPU_MOD_BUILD_DIR ${GPU_MOD_INCLUDE_DIR}/../build-cu${CUDA_CONF})
 		if(NOT EXISTS ${GPU_MOD_BUILD_DIR})
 			message(WARNING "the gpu_mod build directory ${GPU_MOD_BUILD_DIR} must exist and the library compiled in order to support CUDA ${CUDA_CONF} in the pyfaust wrapper.")