Merge pull request #11071 from wckzhang/querycuda

janjust · web-flow · commit 4dae1421f1c1 · 2022-12-01T15:08:14.000-06:00
mpiext/cuda: Properly return CUDA status
diff --git a/ompi/mpiext/cuda/c/mpiext_cuda.c b/ompi/mpiext/cuda/c/mpiext_cuda.c
@@ -20,13 +20,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "opal/constants.h"
-#include "opal/runtime/opal_params.h"
+#include "opal/mca/accelerator/base/base.h"
 #include "ompi/mpiext/cuda/c/mpiext_cuda_c.h"
 
 /* If CUDA-aware support is configured in, return 1. Otherwise, return 0.
  * This API may be extended to return more features in the future. */
 int MPIX_Query_cuda_support(void)
 {
-    return opal_built_with_cuda_support && opal_cuda_runtime_initialized;
+    return 0 == strcmp(opal_accelerator_base_selected_component.base_version.mca_component_name, "cuda");
 }

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,12 @@`
`20`	`20`	`#include <stdio.h>`
`21`	`21`	`#include <string.h>`
`22`	`22`
`23`		`-#include "opal/constants.h"`
`24`		`-#include "opal/runtime/opal_params.h"`
	`23`	`+#include "opal/mca/accelerator/base/base.h"`
`25`	`24`	`#include "ompi/mpiext/cuda/c/mpiext_cuda_c.h"`
`26`	`25`
`27`	`26`	`/* If CUDA-aware support is configured in, return 1. Otherwise, return 0.`
`28`	`27`	`* This API may be extended to return more features in the future. */`
`29`	`28`	`int MPIX_Query_cuda_support(void)`
`30`	`29`	`{`
`31`		`- return opal_built_with_cuda_support && opal_cuda_runtime_initialized;`
	`30`	`+ return 0 == strcmp(opal_accelerator_base_selected_component.base_version.mca_component_name, "cuda");`
`32`	`31`	`}`