Merge pull request #13016 from bosilca/v4.1/fix/13005

jsquyres · web-flow · commit 31f6f4d472a4 · 2025-01-08T17:40:22.000-05:00
Protect against using CUDA without VMM support.
diff --git a/opal/mca/common/cuda/common_cuda.c b/opal/mca/common/cuda/common_cuda.c
@@ -1818,6 +1818,7 @@ static int mca_common_cuda_check_mpool(CUdeviceptr dbuf, CUmemorytype *mem_type,
 
 static int mca_common_cuda_get_primary_context(CUdevice dev_id, CUcontext *pctx)
 {
+#if OPAL_CUDA_VMM_SUPPORT
     CUresult result;
     unsigned int flags;
     int active;
@@ -1831,7 +1832,7 @@ static int mca_common_cuda_get_primary_context(CUdevice dev_id, CUcontext *pctx)
         result = cuFunc.cuDevicePrimaryCtxRetain(pctx, dev_id);
         return OPAL_SUCCESS;
     }
-
+#endif  /* OPAL_CUDA_VMM_SUPPORT */
     return OPAL_ERROR;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1818,6 +1818,7 @@ static int mca_common_cuda_check_mpool(CUdeviceptr dbuf, CUmemorytype *mem_type,`
`1818`	`1818`
`1819`	`1819`	`static int mca_common_cuda_get_primary_context(CUdevice dev_id, CUcontext *pctx)`
`1820`	`1820`	`{`
	`1821`	`+#if OPAL_CUDA_VMM_SUPPORT`
`1821`	`1822`	`CUresult result;`
`1822`	`1823`	`unsigned int flags;`
`1823`	`1824`	`int active;`
`@@ -1831,7 +1832,7 @@ static int mca_common_cuda_get_primary_context(CUdevice dev_id, CUcontext *pctx)`
`1831`	`1832`	`result = cuFunc.cuDevicePrimaryCtxRetain(pctx, dev_id);`
`1832`	`1833`	`return OPAL_SUCCESS;`
`1833`	`1834`	`}`
`1834`		`-`
	`1835`	`+#endif /* OPAL_CUDA_VMM_SUPPORT */`
`1835`	`1836`	`return OPAL_ERROR;`
`1836`	`1837`	`}`
`1837`	`1838`