Merge remote-tracking branch 'origin/main'

# Conflicts: # setup.py # setup_conda_env.sh
StanfordVL · Dec 15, 2022 · 92876ae · 92876ae
2 parents 7056d50 + 0931da8
commit 92876ae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
         "trimesh",
         "h5py",
         "cryptography",
-        "bddl>=0.0.3",
+        "bddl>=3.0.0",
         "opencv-python",
         "nest_asyncio",
     ],

diff --git a/setup_conda_env.sh b/setup_conda_env.sh
@@ -12,23 +12,30 @@ rm -r "${ISAAC_SIM_PATH}/exts/omni.isaac.ml_archive/pip_prebundle/gym*"
 # Create a conda environment with python 3.7
 conda create -y -n omnigibson python=3.7
 
+# Now activate the omnigibson environment
+conda activate omnigibson
+
+mkdir -p ${CONDA_PREFIX}/etc/conda/activate.d
+mkdir -p ${CONDA_PREFIX}/etc/conda/deactivate.d
+touch ${CONDA_PREFIX}/etc/conda/activate.d/env_vars.sh
+touch ${CONDA_PREFIX}/etc/conda/deactivate.d/env_vars.sh
 # We add some preprocessing information so that the Isaac Sim paths are linked to this environment upon startup
 # See https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#macos-and-linux for reference
-CONDA_ACT_FILE="${CONDA_PREFIX}/etc/conda/activate.d"
-echo "#!/bin/sh" > ${CONDA_ACT_FILE}
+CONDA_ACT_FILE="${CONDA_PREFIX}/etc/conda/activate.d/env_vars.sh"
+echo '#!/bin/sh' > ${CONDA_ACT_FILE}
 echo "export LD_LIBRARY_PATH_OLD=\$LD_LIBRARY_PATH" >> ${CONDA_ACT_FILE}
 echo "export PYTHONPATH_OLD=\$PYTHONPATH" >> ${CONDA_ACT_FILE}
 echo "source ${ISAAC_SIM_PATH}/setup_conda_env.sh" >> ${CONDA_ACT_FILE}
 
-CONDA_DEACT_FILE="${CONDA_PREFIX}/etc/conda/deactivate.d"
-echo "#!/bin/sh" > ${CONDA_DEACT_FILE}
+CONDA_DEACT_FILE="${CONDA_PREFIX}/etc/conda/deactivate.d/env_vars.sh"
+echo '#!/bin/sh' > ${CONDA_DEACT_FILE}
 echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH_OLD" >> ${CONDA_DEACT_FILE}
 echo "export PYTHONPATH=\$PYTHONPATH_OLD" >> ${CONDA_DEACT_FILE}
 echo "unset ISAAC_PATH" >> ${CONDA_DEACT_FILE}
 echo "unset CARB_APP_PATH" >> ${CONDA_DEACT_FILE}
 echo "unset LD_LIBRARY_PATH_OLD" >> ${CONDA_DEACT_FILE}
 echo "unset PYTHONPATH_OLD" >> ${CONDA_DEACT_FILE}
 
-# Now activate the omnigibson environment and install omnigibson!
-conda activate omnigibson
+# Install omnigibson!
 pip install -e .
+