Merge pull request #99 from computationalmodelling/test_setup_rpath_linux_osx

Add rpath info to setup.py

Author: rpep

setup.py

@@ -6,6 +6,13 @@
 import os
 import glob
 import re
+import sys
+
+#if sys.platform == 'darwin':
+#    from distutils import sysconfig
+#    vars = sysconfig.get_config_vars()
+#    vars['LDSHARED'] = vars['LDSHARED'].replace('-bundle', '-dynamiclib')
+
 
 
 if 'CC' in os.environ:
@@ -14,8 +21,8 @@
     os.environ["CC"] = "gcc"
     print("Using CC={} (set by setup.py)".format(os.environ['CC']))
 
-
 MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
+print(MODULE_DIR)
 SRC_DIR = os.path.join(MODULE_DIR, "fidimag")
 SUNDIALS_DIR = os.path.join(SRC_DIR, "common", "sundials")
 NEB_DIR = os.path.join(SRC_DIR, "common", "neb")
@@ -113,7 +120,13 @@ def glob_cfiles(path, excludes):
             'sundials_nvecserial', 'sundials_nvecopenmp', 'blas', 'lapack']
 
 com_args = ['-std=c99', '-O3']
-com_link = []
+# rpath is the path relative to the compiled shared object files (e.g. clib.so, etc)
+# which the dynamic linker looks for the linked libraries (e.g. libsundials_*.so) in.
+# We need to set it relatively in order for it to be preserved if the parent directory is moved
+# hence why it is a 'relative'(r) path. Here the relative path is with respect to
+# the fidimag/fidimag/extensions directory.
+RPATH = '../../local/lib'
+com_link = ['-Wl,-rpath,{}'.format(LIB_DIR)]
 lib_paths = [LIB_DIR]
 
 
@@ -122,6 +135,9 @@ def glob_cfiles(path, excludes):
     com_link.append('-openmp')
 else:
     com_args.append('-fopenmp')
+
+
+
     com_link.append('-fopenmp')
 
 
@@ -140,103 +156,103 @@ def glob_cfiles(path, excludes):
               sources=sources,
               include_dirs=com_inc,
               libraries=com_libs,
-	      library_dirs=lib_paths,
+	          library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.common_clib",
               sources=common_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-	      library_dirs=lib_paths,
+	          library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.cvode",
               sources=cvode_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.baryakhtar_clib",
               sources=baryakhtar_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.micro_clib",
               sources=micro_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.nebm_clib",
               sources=nebm_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.nebm_spherical_clib",
               sources=nebm_spherical_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.nebm_geodesic_clib",
               sources=nebm_geodesic_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.nebm_cartesian_clib",
               sources=nebm_cartesian_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.cvode",
               sources=cvode_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.baryakhtar_clib",
               sources=baryakhtar_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.micro_clib",
               sources=micro_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.dipolar",
               sources=dipolar_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-              library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
@@ -254,4 +270,3 @@ def glob_cfiles(path, excludes):
               ],
     ext_modules=cythonize(ext_modules),
 )
-