mirror of
https://github.com/NVIDIA/cuda-samples.git
synced 2026-01-09 11:27:49 +08:00
Merge branch 'shawnz_bug_fix' into 'master'
Fixed new bug reported during CUDA 13.1 test: 5514725 and 5518076 See merge request cuda-samples/cuda-samples!133
This commit is contained in:
commit
1165d53ddf
@ -52,12 +52,22 @@
|
|||||||
#include <memory.h>
|
#include <memory.h>
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#endif
|
#endif
|
||||||
#include <filesystem>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
inline std::string getSocketFolder() {
|
// Simple filesystem compatibility for GCC 7.x
|
||||||
return std::filesystem::temp_directory_path().string();
|
#if defined(__GNUC__) && __GNUC__ < 8
|
||||||
}
|
#include <cstdlib>
|
||||||
|
#include <string>
|
||||||
|
inline std::string getSocketFolder() {
|
||||||
|
const char* tmpdir = std::getenv("TMPDIR");
|
||||||
|
return tmpdir ? std::string(tmpdir) : "/tmp";
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#include <filesystem>
|
||||||
|
inline std::string getSocketFolder() {
|
||||||
|
return std::filesystem::temp_directory_path().string();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef struct sharedMemoryInfo_st {
|
typedef struct sharedMemoryInfo_st {
|
||||||
void *addr;
|
void *addr;
|
||||||
|
|||||||
@ -79,7 +79,7 @@ if(${OpenGL_FOUND})
|
|||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy
|
COMMAND ${CMAKE_COMMAND} -E copy
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/win64/$<CONFIGURATION>/${GLEW_LIB_NAME}.dll
|
${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/win64/$<CONFIGURATION>/${GLEW_LIB_NAME}.dll
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION >
|
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user