From d9bbdbc8e9f0d0f0621fdf2f9db14b2801a5d27f Mon Sep 17 00:00:00 2001
From: Jon Soifer <soiferj@gmail.com>
Date: Thu, 5 Sep 2019 16:42:29 -0700
Subject: [PATCH] [PYTHON/FFI] Search PATH for DLLs (#3888)

* Search PATH for DLLs

* Fix lint issue
---
 python/tvm/_ffi/libinfo.py | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/python/tvm/_ffi/libinfo.py b/python/tvm/_ffi/libinfo.py
index 68c372b..a8ef9cf 100644
--- a/python/tvm/_ffi/libinfo.py
+++ b/python/tvm/_ffi/libinfo.py
@@ -19,6 +19,25 @@ from __future__ import absolute_import
 import sys
 import os
 
+def split_env_var(env_var, split):
+    """Splits environment variable string.
+
+    Parameters
+    ----------
+    env_var : str
+        Name of environment variable.
+
+    split : str
+        String to split env_var on.
+
+    Returns
+    -------
+    splits : list(string)
+        If env_var exists, split env_var. Otherwise, empty list.
+    """
+    if os.environ.get(env_var, None):
+        return [p.strip() for p in os.environ[env_var].split(split)]
+    return []
 
 def find_lib_path(name=None, search_path=None, optional=False):
     """Find dynamic library files.
@@ -50,10 +69,14 @@ def find_lib_path(name=None, search_path=None, optional=False):
     if os.environ.get('TVM_LIBRARY_PATH', None):
         dll_path.append(os.environ['TVM_LIBRARY_PATH'])
 
-    if sys.platform.startswith('linux') and os.environ.get('LD_LIBRARY_PATH', None):
-        dll_path.extend([p.strip() for p in os.environ['LD_LIBRARY_PATH'].split(":")])
-    elif sys.platform.startswith('darwin') and os.environ.get('DYLD_LIBRARY_PATH', None):
-        dll_path.extend([p.strip() for p in os.environ['DYLD_LIBRARY_PATH'].split(":")])
+    if sys.platform.startswith('linux'):
+        dll_path.extend(split_env_var('LD_LIBRARY_PATH', ':'))
+        dll_path.extend(split_env_var('PATH', ':'))
+    elif sys.platform.startswith('darwin'):
+        dll_path.extend(split_env_var('DYLD_LIBRARY_PATH', ':'))
+        dll_path.extend(split_env_var('PATH', ':'))
+    elif sys.platform.startswith('win32'):
+        dll_path.extend(split_env_var('PATH', ';'))
 
     # Pip lib directory
     dll_path.append(os.path.join(ffi_dir, ".."))
-- 
2.7.4