diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-04 02:46:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-04 02:46:34 +0300 |
commit | eeb621566af3c6737393d87ef33237fc96d06d87 (patch) | |
tree | 36a4d1bd54142368148fb3a82c932f874c011fc1 /extern | |
parent | 1bc0cd00713a573bed76ab35b6ae0cc0e9edc307 (diff) | |
parent | 36c1122b96ca550a541f9cea9ed2673319c7467b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'extern')
-rw-r--r-- | extern/cuew/include/cuew.h | 1 | ||||
-rw-r--r-- | extern/cuew/src/cuew.c | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/extern/cuew/include/cuew.h b/extern/cuew/include/cuew.h index 0eace96bc3f..f5009d4f2c7 100644 --- a/extern/cuew/include/cuew.h +++ b/extern/cuew/include/cuew.h @@ -1323,6 +1323,7 @@ int cuewInit(void); const char *cuewErrorString(CUresult result); const char *cuewCompilerPath(void); int cuewCompilerVersion(void); +int cuewNvrtcVersion(void); #ifdef __cplusplus } diff --git a/extern/cuew/src/cuew.c b/extern/cuew/src/cuew.c index 962059bfcce..b68dc597049 100644 --- a/extern/cuew/src/cuew.c +++ b/extern/cuew/src/cuew.c @@ -329,7 +329,7 @@ int cuewInit(void) { #ifdef _WIN32 /* Expected in c:/windows/system or similar, no path needed. */ const char *cuda_paths[] = {"nvcuda.dll", NULL}; - const char *nvrtc_paths[] = {"nvrtc.dll", NULL}; + const char *nvrtc_paths[] = {"nvrtc64_80.dll", "nvrtc64_90.dll", "nvrtc64_91.dll", NULL}; #elif defined(__APPLE__) /* Default installation path. */ const char *cuda_paths[] = {"/usr/local/cuda/lib/libcuda.dylib", NULL}; @@ -766,6 +766,15 @@ const char *cuewCompilerPath(void) { return NULL; } +int cuewNvrtcVersion(void) { + int major, minor; + if (nvrtcVersion) { + nvrtcVersion(&major, &minor); + return 10 * major + minor; + } + return 0; +} + int cuewCompilerVersion(void) { const char *path = cuewCompilerPath(); const char *marker = "Cuda compilation tools, release "; |