change gpu_index to device_id

Former-commit-id: 6993e98e19e31f942ffee5833b593a59cffa94a7
This commit is contained in:
fishpenguin 2019-11-02 11:26:08 +08:00
parent 63033ebc1f
commit 2f28f053d2

View File

@ -590,18 +590,18 @@ Config::CheckCacheConfigGpuCacheCapacity(const std::string& value) {
return Status(SERVER_INVALID_ARGUMENT, msg); return Status(SERVER_INVALID_ARGUMENT, msg);
} else { } else {
uint64_t gpu_cache_capacity = std::stoi(value) * GB; uint64_t gpu_cache_capacity = std::stoi(value) * GB;
int gpu_index; int device_id;
Status s = GetResourceConfigIndexBuildDevice(gpu_index); Status s = GetResourceConfigIndexBuildDevice(device_id);
if (!s.ok()) { if (!s.ok()) {
return s; return s;
} }
if (gpu_index == server::CPU_DEVICE_ID) if (device_id == server::CPU_DEVICE_ID)
return Status::OK(); return Status::OK();
size_t gpu_memory; size_t gpu_memory;
if (!ValidationUtil::GetGpuMemory(gpu_index, gpu_memory).ok()) { if (!ValidationUtil::GetGpuMemory(device_id, gpu_memory).ok()) {
std::string msg = "Fail to get GPU memory for GPU device: " + std::to_string(gpu_index); std::string msg = "Fail to get GPU memory for GPU device: " + std::to_string(device_id);
return Status(SERVER_UNEXPECTED_ERROR, msg); return Status(SERVER_UNEXPECTED_ERROR, msg);
} else if (gpu_cache_capacity >= gpu_memory) { } else if (gpu_cache_capacity >= gpu_memory) {
std::string msg = "Invalid gpu cache capacity: " + value + std::string msg = "Invalid gpu cache capacity: " + value +