[arrayfire] 05/29: Return CUDA Driver version on windows too

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Mon Oct 19 17:48:52 UTC 2015


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository arrayfire.

commit 254458f6a6a02066180a751d378fe609865cabda
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Sep 30 18:51:00 2015 -0400

    Return CUDA Driver version on windows too
---
 src/backend/cuda/driver.cpp   | 2 +-
 src/backend/cuda/platform.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/cuda/driver.cpp b/src/backend/cuda/driver.cpp
index b1f03e2..809b792 100644
--- a/src/backend/cuda/driver.cpp
+++ b/src/backend/cuda/driver.cpp
@@ -50,7 +50,7 @@ int nvDriverVersion(char *result, int len)
 #else
     snprintf(result, len, "%.2f", 0.0);
 #endif
-    return 1;
+    return 0;
 }
 
 #else
diff --git a/src/backend/cuda/platform.cpp b/src/backend/cuda/platform.cpp
index c4aef2b..45d32ba 100644
--- a/src/backend/cuda/platform.cpp
+++ b/src/backend/cuda/platform.cpp
@@ -229,7 +229,8 @@ string getDriverVersion()
     char driverVersion[1024] = {" ",};
     int x = nvDriverVersion(driverVersion, sizeof(driverVersion));
     if (x != 1) {
-        #if !defined(OS_MAC) && !defined(__arm__)  // HACK Mac OSX 10.7 needs new method for fetching driver
+        // Windows, OSX, Tegra Need a new way to fetch driver
+        #if !defined(OS_WIN) && !defined(OS_MAC) && !defined(__arm__)
         throw runtime_error("Invalid driver");
         #endif
         int driver = 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git



More information about the debian-science-commits mailing list