Merge pull request #8931 from mwheinz/8929-FI_CONTEXT2

Add support for FI_CONTEXT2 in OFI MTL and BTL.

Author: Michael Heinz

ompi/mca/mtl/ofi/mtl_ofi_component.c

@@ -637,7 +637,7 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
 
     /* Make sure to get a RDM provider that can do the tagged matching
        interface and local communication and remote communication. */
-    hints->mode               = FI_CONTEXT;
+    hints->mode               = FI_CONTEXT | FI_CONTEXT2;
     hints->ep_attr->type      = FI_EP_RDM;
     hints->caps               |= FI_TAGGED | FI_LOCAL_COMM | FI_REMOTE_COMM | FI_DIRECTED_RECV;
     hints->tx_attr->msg_order = FI_ORDER_SAS;

ompi/mca/mtl/ofi/mtl_ofi_request.h

@@ -34,7 +34,7 @@ struct ompi_mtl_ofi_request_t {
     ompi_mtl_ofi_request_type_t type;
 
     /** OFI context */
-    struct fi_context ctx;
+    struct fi_context2 ctx;
 
     /** Completion count used by blocking and/or synchronous operations */
     volatile int completion_count;

opal/mca/btl/ofi/btl_ofi.h

@@ -205,7 +205,7 @@ typedef struct mca_btl_ofi_base_frag_t mca_btl_ofi_base_frag_t;
 OBJ_CLASS_DECLARATION(mca_btl_ofi_base_frag_t);
 
 struct mca_btl_ofi_completion_context_t {
-    struct fi_context ctx;
+    struct fi_context2 ctx;
     void *comp;
 };
 

opal/mca/btl/ofi/btl_ofi_component.c

@@ -311,10 +311,9 @@ static mca_btl_base_module_t **mca_btl_ofi_component_init(int *num_btl_modules,
     /* ask for capabilities */
     /* TODO: catch the caps here. */
     hints.caps = required_caps;
-    hints.mode = FI_CONTEXT;
 
     /* Ask for completion context */
-    hints.mode = FI_CONTEXT;
+    hints.mode = FI_CONTEXT | FI_CONTEXT2;
 
     hints.fabric_attr = &fabric_attr;
     hints.domain_attr = &domain_attr;