From fdf5ac4c41f7d26e56654ce75da6fd1060d9ead9 Mon Sep 17 00:00:00 2001 From: phuicy Date: Thu, 20 Dec 2018 09:24:18 +0000 Subject: [PATCH 1/2] Feature: added support for Conda environments. Allow for includes from an anaconda environment for cython builds. --- mujoco_py/builder.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mujoco_py/builder.py b/mujoco_py/builder.py index d5b847b8..8232d7f4 100644 --- a/mujoco_py/builder.py +++ b/mujoco_py/builder.py @@ -199,6 +199,10 @@ def __init__(self, mjpro_path): self.mjpro_path = mjpro_path python_version = str(sys.version_info.major) + str(sys.version_info.minor) self.version = '%s_%s_%s' % (get_version(), python_version, self.build_base()) + #Check if a anaconda environment is being used + extra_include_dirs = "" + if "CONDA_PREFIX" in os.environ: + extra_include_dirs = os.environ["CONDA_PREFIX"] self.extension = Extension( 'mujoco_py.cymj', sources=[join(self.CYMJ_DIR_PATH, "cymj.pyx")], @@ -206,6 +210,7 @@ def __init__(self, mjpro_path): self.CYMJ_DIR_PATH, join(mjpro_path, 'include'), np.get_include(), + extra_include_dirs, ], libraries=['mujoco150'], library_dirs=[join(mjpro_path, 'bin')], From 72bd65e1cbb5a66cb3af1ddc90752f0204abe5f9 Mon Sep 17 00:00:00 2001 From: phuicy Date: Thu, 20 Dec 2018 09:57:40 +0000 Subject: [PATCH 2/2] bugfix: user conda includes not prefix --- mujoco_py/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mujoco_py/builder.py b/mujoco_py/builder.py index 8232d7f4..2274e0bf 100644 --- a/mujoco_py/builder.py +++ b/mujoco_py/builder.py @@ -202,7 +202,7 @@ def __init__(self, mjpro_path): #Check if a anaconda environment is being used extra_include_dirs = "" if "CONDA_PREFIX" in os.environ: - extra_include_dirs = os.environ["CONDA_PREFIX"] + extra_include_dirs = os.environ["CONDA_PREFIX"] + "/include" self.extension = Extension( 'mujoco_py.cymj', sources=[join(self.CYMJ_DIR_PATH, "cymj.pyx")],