Detect messenger architecture at runtime

ovidner · ovidner · commit 4b2137c5c382 · 2021-09-29T20:11:38.000+02:00
diff --git a/pymatbridge/pymatbridge.py b/pymatbridge/pymatbridge.py
@@ -36,6 +36,8 @@
 
 from numpy import ndarray, generic, float64, frombuffer, asfortranarray
 
+from pymatbridge.messenger.make import get_messenger_dir
+
 try:
     from scipy.sparse import spmatrix
 except ImportError:
@@ -110,6 +112,7 @@ def decode_pymat(dct):
     return dct
 
 MATLAB_FOLDER = '%s/matlab' % os.path.realpath(os.path.dirname(__file__))
+MESSENGER_FOLDER = '%s/messenger/%s' % (os.path.realpath(os.path.dirname(__file__)), get_messenger_dir())
 
 
 class _Session(object):
@@ -182,6 +185,7 @@ def _preamble_code(self):
         # Matlab (e.g. isrow)
         return ["old_warning_state = warning('off','all');",
                 "addpath(genpath('%s'));" % MATLAB_FOLDER,
+                "addpath('%s');" % MESSENGER_FOLDER,
                 "warning(old_warning_state);",
                 "clear('old_warning_state');",
                 "cd('%s');" % os.getcwd()]
diff --git a/setup.py b/setup.py
@@ -3,9 +3,6 @@
 
 import os
 import sys
-import shutil
-import glob
-
 
 # BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
 # update it when the contents of directories change.
@@ -19,13 +16,6 @@
 else:
     import __builtin__ as builtins
 builtins.__PYMATBRIDGE_SETUP__ = True
-# Find the messenger binary file(s) and copy it to /matlab folder.
-from pymatbridge.messenger.make import get_messenger_dir
-messenger_dir = get_messenger_dir()
-
-for f in glob.glob("./pymatbridge/messenger/%s/messenger.*" % messenger_dir):
-    shutil.copy(f, "./pymatbridge/matlab")
-
 try:
     from setuptools import setup
 except ImportError:
