GOSTSec/ccminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/ccminer synced 2025-01-31 00:44:15 +00:00
Code Issues Releases Wiki Activity

nvml: force 64bits types for mem sizes

Browse Source 
size_t can be a bit... imprevisible on x86
This commit is contained in:
Tanguy Pruvot 2016-09-28 00:31:13 +02:00
parent 5a0b779434
commit f84c83afe5
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cuda.cpp
View File

@ -218,16 +218,18 @@ void cuda_reset_device(int thr_id, bool *init)
int cuda_available_memory(int thr_id) int cuda_available_memory(int thr_id)
{ {
int dev_id = device_map[thr_id % MAX_GPUS]; int dev_id = device_map[thr_id % MAX_GPUS];
size_t mtotal = 0, mfree = 0;
#if defined(_WIN32) && defined(USE_WRAPNVML) #if defined(_WIN32) && defined(USE_WRAPNVML)
uint64_t tot64 = 0, free64 = 0;
// cuda (6.5) one can crash on pascal and dont handle 8GB // cuda (6.5) one can crash on pascal and dont handle 8GB
nvapiMemGetInfo(dev_id, &mfree, &mtotal); nvapiMemGetInfo(dev_id, &free64, &tot64);
return (int) (free64 / (1024 * 1024));
#else #else
size_t mtotal = 0, mfree = 0;
cudaSetDevice(dev_id); cudaSetDevice(dev_id);
cudaDeviceSynchronize(); cudaDeviceSynchronize();
cudaMemGetInfo(&mfree, &mtotal); cudaMemGetInfo(&mfree, &mtotal);
#endif
return (int) (mfree / (1024 * 1024)); return (int) (mfree / (1024 * 1024));
#endif
} }
// Check (and reset) last cuda error, and report it in logs // Check (and reset) last cuda error, and report it in logs
@ -252,9 +254,9 @@ int cuda_gpu_info(struct cgpu_info *gpu)
{ {
cudaDeviceProp props; cudaDeviceProp props;
if (cudaGetDeviceProperties(&props, gpu->gpu_id) == cudaSuccess) { if (cudaGetDeviceProperties(&props, gpu->gpu_id) == cudaSuccess) {
gpu->gpu_clock = props.clockRate; gpu->gpu_clock = (uint32_t) props.clockRate;
gpu->gpu_memclock = props.memoryClockRate; gpu->gpu_memclock = (uint32_t) props.memoryClockRate;
gpu->gpu_mem = (props.totalGlobalMem / 1024); // kB gpu->gpu_mem = (uint64_t) (props.totalGlobalMem / 1024); // kB
#if defined(_WIN32) && defined(USE_WRAPNVML) #if defined(_WIN32) && defined(USE_WRAPNVML)
// required to get mem size > 4GB (size_t too small for bytes on 32bit) // required to get mem size > 4GB (size_t too small for bytes on 32bit)
nvapiMemGetInfo(gpu->gpu_id, &gpu->gpu_memfree, &gpu->gpu_mem); // kB nvapiMemGetInfo(gpu->gpu_id, &gpu->gpu_memfree, &gpu->gpu_mem); // kB

10
miner.h
View File

@ -367,10 +367,10 @@ struct cgpu_info {
uint16_t gpu_fan; uint16_t gpu_fan;
uint16_t gpu_fan_rpm; uint16_t gpu_fan_rpm;
uint16_t gpu_arch; uint16_t gpu_arch;
int gpu_clock; uint32_t gpu_clock;
int gpu_memclock; uint32_t gpu_memclock;
size_t gpu_mem; uint64_t gpu_mem;
size_t gpu_memfree; uint64_t gpu_memfree;
uint32_t gpu_power; uint32_t gpu_power;
double gpu_vddc; double gpu_vddc;
int16_t gpu_pstate; int16_t gpu_pstate;
@ -383,7 +383,7 @@ struct cgpu_info {
char gpu_sn[64]; char gpu_sn[64];
char gpu_desc[64]; char gpu_desc[64];
float intensity; double intensity;
uint32_t throughput; uint32_t throughput;
}; };

6
nvml.cpp
View File

@ -1657,15 +1657,15 @@ int nvapi_set_memclock(unsigned int devNum, uint32_t clock)
} }
// Replacement for WIN32 CUDA 6.5 on pascal // Replacement for WIN32 CUDA 6.5 on pascal
int nvapiMemGetInfo(int dev_id, size_t *free, size_t *total) int nvapiMemGetInfo(int dev_id, uint64_t *free, uint64_t *total)
{ {
NvAPI_Status ret = NVAPI_OK; NvAPI_Status ret = NVAPI_OK;
NV_DISPLAY_DRIVER_MEMORY_INFO mem = { 0 }; NV_DISPLAY_DRIVER_MEMORY_INFO mem = { 0 };
mem.version = NV_DISPLAY_DRIVER_MEMORY_INFO_VER; mem.version = NV_DISPLAY_DRIVER_MEMORY_INFO_VER;
unsigned int devNum = nvapi_dev_map[dev_id % MAX_GPUS]; unsigned int devNum = nvapi_dev_map[dev_id % MAX_GPUS];
if ((ret = NvAPI_GPU_GetMemoryInfo(phys[devNum], &mem)) == NVAPI_OK) { if ((ret = NvAPI_GPU_GetMemoryInfo(phys[devNum], &mem)) == NVAPI_OK) {
*total = mem.dedicatedVideoMemory;// mem.availableDedicatedVideoMemory; *total = (uint64_t) mem.dedicatedVideoMemory;// mem.availableDedicatedVideoMemory;
*free = mem.curAvailableDedicatedVideoMemory; *free = (uint64_t) mem.curAvailableDedicatedVideoMemory;
} }
return (int) ret; return (int) ret;
} }

2
nvml.h
View File

@ -231,7 +231,7 @@ unsigned int nvapi_devnum(int dev_id);
int nvapi_devid(unsigned int devNum); int nvapi_devid(unsigned int devNum);
// cuda Replacement for 6.5 compat // cuda Replacement for 6.5 compat
int nvapiMemGetInfo(int dev_id, size_t *free, size_t *total); int nvapiMemGetInfo(int dev_id, uint64_t *free, uint64_t *total);
#endif #endif
#endif /* USE_WRAPNVML */ #endif /* USE_WRAPNVML */