common/ofi: Fix #2519

guserav · guserav · commit 8a67a95c993d · 2019-08-12T16:17:59.000-07:00
As discussed in #2519 the common component does not depend on libfabric yet. This commit introduces this dependency by just calling fi_version(). Signed-off-by: guserav <erik.zeiske@hpe.com>
diff --git a/opal/mca/common/ofi/common_ofi.c b/opal/mca/common/ofi/common_ofi.c
@@ -19,5 +19,9 @@
 
 int mca_common_ofi_register_mca_variables(void)
 {
-    return OPAL_SUCCESS;
+    if (fi_version() >= FI_VERSION(1,0)) {
+        return OPAL_SUCCESS;
+    } else {
+        return OPAL_ERROR;
+    }
 }
diff --git a/opal/mca/common/ofi/common_ofi.h b/opal/mca/common/ofi/common_ofi.h
@@ -12,6 +12,7 @@
 
 #ifndef OPAL_MCA_COMMON_OFI_H
 #define OPAL_MCA_COMMON_OFI_H
+#include <rdma/fabric.h>
 
 OPAL_DECLSPEC int mca_common_ofi_register_mca_variables(void);
 

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,9 @@`
`19`	`19`
`20`	`20`	`int mca_common_ofi_register_mca_variables(void)`
`21`	`21`	`{`
`22`		`- return OPAL_SUCCESS;`
	`22`	`+ if (fi_version() >= FI_VERSION(1,0)) {`
	`23`	`+ return OPAL_SUCCESS;`
	`24`	`+ } else {`
	`25`	`+ return OPAL_ERROR;`
	`26`	`+ }`
`23`	`27`	`}`