cuda: Allow memory to report as >4gb.

diff --git a/extra/cuda/devices/devices.factor b/extra/cuda/devices/devices.factor
index 5536dcd8977751d7a9687a4fe1cb2cc537b787fe..5706ba783d042bda957a9da8907b2032d20048ce 100644 (file)
--- a/extra/cuda/devices/devices.factor
+++ b/extra/cuda/devices/devices.factor
@@ -37,8 +37,8 @@ IN: cuda.devices
     2array ;
 
 : cuda-device-memory ( n -- bytes )
-    [ { uint } ] dip
-    '[ _ cuDeviceTotalMem cuda-error ] with-out-parameters ;
+    [ { ulonglong } ] dip
+    '[ _ cuDeviceTotalMem_v2 cuda-error ] with-out-parameters ;
 
 : cuda-device-attribute ( attribute n -- n )
     [ { int } ] 2dip

diff --git a/extra/cuda/ffi/ffi.factor b/extra/cuda/ffi/ffi.factor
index c7b1264b836c6d77e8425219347a1a6d88c63eb6..f60ff9806d4a1e0529f23fe47d274d92e90cfdd7 100644 (file)
--- a/extra/cuda/ffi/ffi.factor
+++ b/extra/cuda/ffi/ffi.factor
@@ -308,6 +308,7 @@ FUNCTION: CUresult cuDeviceGetCount ( int* count )
 FUNCTION: CUresult cuDeviceGetName ( char* name, int len, CUdevice dev )
 FUNCTION: CUresult cuDeviceComputeCapability ( int* major, int* minor, CUdevice dev )
 FUNCTION: CUresult cuDeviceTotalMem ( uint* bytes, CUdevice dev )
+FUNCTION: CUresult cuDeviceTotalMem_v2 ( ulonglong* bytes, CUdevice dev )
 FUNCTION: CUresult cuDeviceGetProperties ( CUdevprop* prop, CUdevice dev )
 FUNCTION: CUresult cuDeviceGetAttribute ( int* pi, CUdevice_attribute attrib, CUdevice dev )