Merge pull request #444 from radical-cybertools/fix/anvil_netface

Enable Anvil Infiniband interface

Author: andre-merzky

src/radical/utils/config.py

@@ -441,6 +441,7 @@ class DefaultConfig(Config, metaclass=DefaultConfigMeta):
         'report_dir' : str,
         'profile'    : bool,
         'profile_dir': str,
+        'iface'      : list,
     }
 
     # --------------------------------------------------------------------------

src/radical/utils/configs/utils_default.json

@@ -7,6 +7,7 @@
     "report_tgt" : "${RADICAL_DEFAULT_REPORT_TGT:stderr}",
     "report_dir" : "${RADICAL_DEFAULT_REPORT_DIR:$PWD}",
     "profile"    : "${RADICAL_DEFAULT_PROFILE:TRUE}",
-    "profile_dir": "${RADICAL_DEFAULT_PROFILE_DIR:$PWD}"
+    "profile_dir": "${RADICAL_DEFAULT_PROFILE_DIR:$PWD}",
+    "iface"      : "${RADICAL_DEFAULT_IFACE}"
 }
 

src/radical/utils/host.py

@@ -10,7 +10,8 @@
 
 from functools import reduce
 
-from .misc import as_list, ru_open
+from .misc   import as_list, ru_open
+from .config import DefaultConfig
 
 
 # ------------------------------------------------------------------------------
@@ -31,17 +32,10 @@ def get_hostname():
 
 # ------------------------------------------------------------------------------
 #
-_hostip = None
-
-
 def get_hostip(req=None, log=None):
     """Look up the IP address for a given requested interface name.
     If interface is not given, do some magic."""
 
-    global _hostip                                       # pylint: disable=W0603
-    if _hostip:
-        return _hostip
-
     AF_INET = netifaces.AF_INET
 
     # We create an ordered preference list, consisting of:
@@ -52,11 +46,14 @@ def get_hostip(req=None, log=None):
     # Then this list is traversed, we check if the interface exists and has an
     # IP address.  The first match is used.
 
+    if not req:
+        req = DefaultConfig().get('iface')
+
     req = as_list(req)
 
     white_list = [
         'ens1f1',   # amarel
-      # 'ib0',      # infiniband
+        'ib0',      # infiniband   # NOTE: unusable on Amarel, use `req` there!
         'hsn0',     # Frontier (HPE Cray EX)
         'ipogif0',  # Cray's
         'br0',      # SuperMIC
@@ -105,7 +102,6 @@ def get_hostip(req=None, log=None):
             log.debug('check iface %s: ip is %s', iface, ip)
 
         if ip:
-            _hostip = ip
             return ip
 
     return '127.0.0.1'

src/radical/utils/profile.py

@@ -180,7 +180,6 @@ def __init__(self, name, ns=None, path=None):
 
         ru_def = DefaultConfig()
 
-
         if not ns:
             ns = name