From 3125cdfd3030cb8f390af357822786b2b281c5ad Mon Sep 17 00:00:00 2001
From: "W. Michael Brown" <brownw@ornl.gov>
Date: Sun, 12 Dec 2010 18:14:06 -0500
Subject: [PATCH] Fixing CUDA version for new device query functions.

---
 lib/gpu/geryon/nvc_device.h | 4 ++--
 lib/gpu/geryon/nvd_device.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/gpu/geryon/nvc_device.h b/lib/gpu/geryon/nvc_device.h
index e5c2d801d0..c06ceffa71 100644
--- a/lib/gpu/geryon/nvc_device.h
+++ b/lib/gpu/geryon/nvc_device.h
@@ -13,7 +13,7 @@
     copyright            : (C) 2009 by W. Michael Brown
     email                : brownw@ornl.gov
  ***************************************************************************/
- 
+
 /* -----------------------------------------------------------------------
    Copyright (2009) Sandia Corporation.  Under the terms of Contract
    DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
@@ -290,7 +290,7 @@ inline void UCL_Device::print_all(std::ostream &out) {
     else
       out << "Unknown\n";
     #endif
-    #if CUDART_VERSION >= 3000
+    #if CUDART_VERSION >= 3010
     out << "  Concurrent kernel execution:                   ";
     if (_properties[i].concurrentKernels)
       out << "Yes\n";
diff --git a/lib/gpu/geryon/nvd_device.h b/lib/gpu/geryon/nvd_device.h
index b407c1ede3..6b70964ba1 100644
--- a/lib/gpu/geryon/nvd_device.h
+++ b/lib/gpu/geryon/nvd_device.h
@@ -20,7 +20,7 @@
    certain rights in this software.  This software is distributed under 
    the Simplified BSD License.
    ----------------------------------------------------------------------- */
- 
+
 #ifndef NVD_DEVICE
 #define NVD_DEVICE
 
@@ -233,7 +233,7 @@ inline UCL_Device::UCL_Device() {
                       &_properties.back().canMapHostMemory, 
                       CU_DEVICE_ATTRIBUTE_CAN_MAP_HOST_MEMORY, dev));
     #endif
-    #if CUDA_VERSION >= 3000
+    #if CUDA_VERSION >= 3010
     CU_SAFE_CALL_NS(cuDeviceGetAttribute(
                       &_properties.back().concurrentKernels, 
                       CU_DEVICE_ATTRIBUTE_CONCURRENT_KERNELS, dev));
@@ -339,7 +339,7 @@ inline void UCL_Device::print_all(std::ostream &out) {
     else
       out << "No\n";
     #endif
-    #if CUDA_VERSION >= 3000
+    #if CUDA_VERSION >= 3010
     out << "  Concurrent kernel execution:                   ";
     if (_properties[i].concurrentKernels)
       out << "Yes\n";