Skip to content

Commit 7691654

Browse files
authored
mtgpu: enable VMM (#9597)
Signed-off-by: Xiaodong Ye <[email protected]>
1 parent ea9c32b commit 7691654

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ggml/src/ggml-cuda.cu

+6-6
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static ggml_cuda_device_info ggml_cuda_init() {
187187
for (int id = 0; id < info.device_count; ++id) {
188188
int device_vmm = 0;
189189

190-
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM) && !defined(GGML_USE_MUSA)
190+
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM)
191191
CUdevice device;
192192
CU_CHECK(cuDeviceGet(&device, id));
193193
CU_CHECK(cuDeviceGetAttribute(&device_vmm, CU_DEVICE_ATTRIBUTE_VIRTUAL_MEMORY_MANAGEMENT_SUPPORTED, device));
@@ -199,7 +199,7 @@ static ggml_cuda_device_info ggml_cuda_init() {
199199
alloc_prop.location.id = id;
200200
CU_CHECK(cuMemGetAllocationGranularity(&info.devices[id].vmm_granularity, &alloc_prop, CU_MEM_ALLOC_GRANULARITY_RECOMMENDED));
201201
}
202-
#endif // !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM) && !defined(GGML_USE_MUSA)
202+
#endif // !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM)
203203
info.devices[id].vmm = !!device_vmm;
204204

205205
cudaDeviceProp prop;
@@ -335,7 +335,7 @@ struct ggml_cuda_pool_leg : public ggml_cuda_pool {
335335
};
336336

337337
// pool with virtual memory
338-
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM) && !defined(GGML_USE_MUSA)
338+
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM)
339339
struct ggml_cuda_pool_vmm : public ggml_cuda_pool {
340340
static const size_t CUDA_POOL_VMM_MAX_SIZE = 1ull << 35; // 32 GB
341341

@@ -429,14 +429,14 @@ struct ggml_cuda_pool_vmm : public ggml_cuda_pool {
429429
GGML_ASSERT(ptr == (void *) (pool_addr + pool_used));
430430
}
431431
};
432-
#endif // !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM) && !defined(GGML_USE_MUSA)
432+
#endif // !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM)
433433

434434
std::unique_ptr<ggml_cuda_pool> ggml_backend_cuda_context::new_pool_for_device(int device) {
435-
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM) && !defined(GGML_USE_MUSA)
435+
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM)
436436
if (ggml_cuda_info().devices[device].vmm) {
437437
return std::unique_ptr<ggml_cuda_pool>(new ggml_cuda_pool_vmm(device));
438438
}
439-
#endif // !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM) && !defined(GGML_USE_MUSA)
439+
#endif // !defined(GGML_USE_HIPBLAS) && !defined(GGML_CUDA_NO_VMM)
440440
return std::unique_ptr<ggml_cuda_pool>(new ggml_cuda_pool_leg(device));
441441
}
442442

0 commit comments

Comments
 (0)