Merge pull request #5215 from jsquyres/pr/usnic-updates

usNIC updates

Author: jsquyres

opal/mca/btl/usnic/Makefile.am

@@ -25,7 +25,7 @@
 # $HEADER$
 #
 
-AM_CPPFLAGS = -DBTL_IN_OPAL=1 $(opal_ofi_CPPFLAGS) -DOMPI_LIBMPI_NAME=\"$(OMPI_LIBMPI_NAME)\"
+AM_CPPFLAGS = $(opal_ofi_CPPFLAGS) -DOMPI_LIBMPI_NAME=\"$(OMPI_LIBMPI_NAME)\"
 
 EXTRA_DIST = README.txt README.test
 

opal/mca/btl/usnic/README.txt

@@ -290,9 +290,18 @@ November 2014 / SC 2014
 Update February 2015
 
 The usnic BTL code has been unified across master and the v1.8
-branches.  That is, you can copy the code from
-v1.8:ompi/mca/btl/usnic/* to master:opal/mca/btl/usnic*, and then only
-have to make 3 changes in the resulting code in master:
+branches.
+
+   NOTE: As of May 2018, this is no longer true.  This was generally
+   only necessary back when the BTLs were moved from the OMPI layer to
+   the OPAL layer.  Now that the BTLs have been down in OPAL for
+   several years, this tomfoolery is no longer necessary.  This note
+   is kept for historical purposes, just in case someone needs to go
+   back and look at the v1.8 series.
+
+That is, you can copy the code from v1.8:ompi/mca/btl/usnic/* to
+master:opal/mca/btl/usnic*, and then only have to make 3 changes in
+the resulting code in master:
 
 1. Edit Makefile.am: s/ompi/opal/gi
 2. Edit configure.m4: s/ompi/opal/gi

opal/mca/btl/usnic/btl_usnic.h

@@ -12,7 +12,7 @@
  *                         All rights reserved.
  * Copyright (c) 2006      Sandia National Laboratories. All rights
  *                         reserved.
- * Copyright (c) 2011-2016 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011-2019 Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
@@ -36,24 +36,13 @@
 #include "opal/class/opal_hash_table.h"
 #include "opal/mca/event/event.h"
 
-#if BTL_IN_OPAL
 #include "opal/mca/btl/btl.h"
 #include "opal/mca/btl/base/btl_base_error.h"
 #include "opal/mca/btl/base/base.h"
 #include "opal/mca/rcache/rcache.h"
 
 #include "btl_usnic_compat.h"
 
-#if RCACHE_VERSION < 30
-#include "opal/mca/mpool/grdma/mpool_grdma.h"
-#endif
-#else
-#include "ompi/mca/btl/btl.h"
-#include "ompi/mca/btl/base/btl_base_error.h"
-#include "ompi/mca/btl/base/base.h"
-#include "ompi/mca/mpool/grdma/mpool_grdma.h"
-#endif
-
 BEGIN_C_DECLS
 
 /*
@@ -164,16 +153,11 @@ typedef struct opal_btl_usnic_component_t {
     /** list of usnic proc structures */
     opal_list_t usnic_procs;
 
-#if RCACHE_VERSION == 30
     /** memory pool hints */
     char* usnic_mpool_hints;
 
     /** registration cache name */
     char *usnic_rcache_name;
-#else
-    /** name of memory pool */
-    char* usnic_mpool_name;
-#endif
 
     char *if_include;
     char *if_exclude;