Merge branch 'LinuxCuda' of https://github.com/FedyuninV/neoml into L…

…inuxCuda
FedyuninV · Jun 22, 2020 · 7f3ecb1 · 7f3ecb1
2 parents 0f56b4f + d083a57
commit 7f3ecb1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Build/build.sh b/Build/build.sh
@@ -117,9 +117,8 @@ if [[ $FINE_CMAKE_BUILD_TARGET == "IOS" ]]; then
 elif [[ $FINE_CMAKE_BUILD_TARGET == "Linux" && $FINE_CMAKE_BUILD_ARCH == "x86" ]]; then
 	cmake -DUSE_FINE_OBJECTS=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_CONFIG} -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_C_FLAGS=-m32 ${ROOT}/NeoML/NeoML
 elif [[ $FINE_CMAKE_BUILD_TARGET == "Linux" && $FINE_CMAKE_BUILD_ARCH == "x86_64" ]]; then
-	export PATH=$PATH:$ROOT/ThirdParty/CUDA/Linux/nvcc/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOT/ThirdParty/CUDA/Linux/nvcc/lib64
-	export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$ROOT/ThirdParty/CUDA/Linux/nvcc/include
+	export PATH=$ROOT/ThirdParty/CUDA/Linux/nvcc/bin:$PATH
+	export LD_LIBRARY_PATH=$ROOT/ThirdParty/CUDA/Linux/nvcc/lib64:$LD_LIBRARY_PATH
 	cmake -DUSE_FINE_OBJECTS=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_CONFIG} ${ROOT}/NeoML/NeoML
 elif [[ $FINE_CMAKE_BUILD_TARGET == "Darwin" ]]; then
 	cmake -DUSE_FINE_OBJECTS=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_CONFIG} ${ROOT}/NeoML/NeoML

diff --git a/NeoMathEngine/src/CMakeLists.txt b/NeoMathEngine/src/CMakeLists.txt
@@ -192,6 +192,7 @@ if((WIN32 OR LINUX) AND CMAKE_SIZEOF_VOID_P EQUAL 8)
                 GPU/CUDA/Kernels/CudaVectorMathKernels.h
         )
         target_include_directories(${PROJECT_NAME} PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GPU/CUDA>)
+        target_include_directories(${PROJECT_NAME} PRIVATE $<BUILD_INTERFACE:${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}>)
         source_group("GPU\\CUDA" REGULAR_EXPRESSION "GPU\/CUDA\/[A-Za-z0-9_]+\.(h|cpp|cu)")
         source_group("GPU\\CUDA\\Kernels" REGULAR_EXPRESSION "GPU\/CUDA\/Kernels\/.+")
     else()

diff --git a/Sources.txt b/Sources.txt
@@ -4,7 +4,7 @@ git;https://tfs/HQ/Tools_Libs/_git/FineObjects13
 get;FineObjects;/;FineObjects13-master 13.0.123.0
 
 git;https://tfs/HQ/ThirdParty/_git/CUDA
-get;ThirdParty/CUDA;/;CUDA v10.2 1.0.2.0
+get;ThirdParty/CUDA;/;CUDA v10.2 1.0.3.0
 
 git;https://tfs/HQ/ThirdParty/_git/Vulkan
 get;ThirdParty/Vulkan;/;Vulkan SDK 1.1.130 1.0.2.0