Merge 0481072 into 3386a5b

payu/cli.py

@@ -18,6 +18,7 @@
 
 import payu
 import payu.envmod as envmod
+from payu.fsops import is_conda
 from payu.models import index as supported_models
 import payu.subcommands
 from payu.scheduler.pbs import generate_command
@@ -83,9 +84,11 @@ def set_env_vars(init_run=None, n_runs=None, lab_path=None, dir_path=None,
     """Construct the environment variables used by payu for resubmissions."""
     payu_env_vars = {}
 
-    # Setup Python dynamic library link
-    lib_paths = sysconfig.get_config_vars('LIBDIR')
-    payu_env_vars['LD_LIBRARY_PATH'] = ':'.join(lib_paths)
+    if not is_conda():
+        # Setup Python dynamic library link
+        lib_paths = sysconfig.get_config_vars('LIBDIR')
+        payu_env_vars['LD_LIBRARY_PATH'] = ':'.join(lib_paths)
+
     if 'PYTHONPATH' in os.environ:
         payu_env_vars['PYTHONPATH'] = os.environ['PYTHONPATH']
 

payu/fsops.py

@@ -10,6 +10,7 @@
 # Standard library
 import errno
 import os
+import sys
 
 # Extensions
 import yaml
@@ -134,3 +135,9 @@ def check_exe_path(payu_path, pbs_script):
     assert os.path.isfile(pbs_script)
 
     return pbs_script
+
+
+def is_conda():
+    """Return True if python interpreter is in a conda environment"""
+
+    return os.path.exists(os.path.join(sys.prefix, 'conda-meta'))