Linux build fixes

Martin Winter · Martin Winter · commit e3e209a7f9c7 · 2021-05-03T07:39:13.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
+build
diff --git a/15_GraphAPI/src/main.cu b/15_GraphAPI/src/main.cu
@@ -86,7 +86,7 @@ cudaGraphExec_t buildGraphForParallelTasks(unsigned int numTasks)
 
 	// Create a node for each kernel in the graph, with grid config and parameters
 	std::vector<cudaGraphNode_t> nodes(numTasks);
-	cudaKernelNodeParams params = { busy, {1,1,1}, {1,1,1}, 0, nullptr, nullptr };
+	cudaKernelNodeParams params = { reinterpret_cast<void*>(busy), {1,1,1}, {1,1,1}, 0, nullptr, nullptr };
 
 	// Add them to the graph. This simple setup has no dependencies, passing nullptr
 	for (int i = 0; i < numTasks; i++)
diff --git a/16_TensorCores/CMakeLists.txt b/16_TensorCores/CMakeLists.txt
@@ -15,7 +15,11 @@ if(${ITS_ARCH_FOUND})
 		../shared/include/utility.h
 	)
 	target_include_directories(16_TensorCores PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
-	target_link_libraries(16_TensorCores cublas.lib)
+	if (MSVC)
+		target_link_libraries(16_TensorCores cublas.lib)
+	else()
+		target_link_libraries(16_TensorCores cublas)
+	endif()
 else()
 	message("Not building sample 16 - CMAKE_CUDA_ARCHITECTURES do not include ITS support (>=70)")
 	message("To define more than one architecture, separate them with semicolon (e.g., 60;70)")
diff --git a/shared/include/utility.h b/shared/include/utility.h
@@ -5,6 +5,7 @@
 #include <random>
 #include <iostream>
 #include <vector>
+#include <algorithm>
 #include <cuda_runtime_api.h>
 #include <mma.h>
 
