From 67f53f1a5a0f205eea40881fb2b0c34b5012227c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cem=20G=C3=B6kmen?= Date: Wed, 2 Oct 2024 13:14:19 -0700 Subject: [PATCH 1/4] Fix missing rename behavior in old glibc versions --- omnigibson/install.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/omnigibson/install.py b/omnigibson/install.py index 47da07619..3f4a6a60e 100644 --- a/omnigibson/install.py +++ b/omnigibson/install.py @@ -83,7 +83,8 @@ def _rename_if_necessary(filename: Path): the filename suggests not - so we apply this hacky workaround. This allows pip to try to install them. """ if platform.system() == "Linux" and _is_glibc_older(): - return filename.with_name(filename.name.replace("manylinux_2_34", "manylinux_2_31")) + new_filename = filename.with_name(filename.name.replace("manylinux_2_34", "manylinux_2_31")) + shutil.move(filename, new_filename) return filename From 5211bd1220ff4464a6e50d88ed4f19e32984078c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cem=20G=C3=B6kmen?= Date: Wed, 2 Oct 2024 13:15:40 -0700 Subject: [PATCH 2/4] Actually fix it --- omnigibson/install.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/omnigibson/install.py b/omnigibson/install.py index 3f4a6a60e..5d819dcde 100644 --- a/omnigibson/install.py +++ b/omnigibson/install.py @@ -82,9 +82,13 @@ def _rename_if_necessary(filename: Path): This is permissible because the manylinux wheels are compatible with older GLIBC versions even though the filename suggests not - so we apply this hacky workaround. This allows pip to try to install them. """ + # Rename the file if the system's GLIBC version is older than the one used in the NVIDIA PyPI packages if platform.system() == "Linux" and _is_glibc_older(): new_filename = filename.with_name(filename.name.replace("manylinux_2_34", "manylinux_2_31")) shutil.move(filename, new_filename) + return new_filename + + # If the file is not renamed, return the original filename return filename From 4cdbb330d5b6b415d3226ae1da6261ce2aac552a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cem=20G=C3=B6kmen?= Date: Wed, 2 Oct 2024 13:20:19 -0700 Subject: [PATCH 3/4] Add no install datasets flag --- omnigibson/install.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/omnigibson/install.py b/omnigibson/install.py index 5d819dcde..eec12a267 100644 --- a/omnigibson/install.py +++ b/omnigibson/install.py @@ -283,7 +283,9 @@ def attempt_pip_install(): @click.command() @click.option( - "--install-datasets", default=True, help="Install the OmniGibson dataset and assets after installing Isaac Sim" + "--install-datasets/--no-install-datasets", + default=True, + help="Install the OmniGibson dataset and assets after installing Isaac Sim", ) @click.option( "--launcher-install/--pip-install", From 15aacc5a43be28cdbd4fa2ba506b435deb898050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cem=20G=C3=B6kmen?= Date: Wed, 2 Oct 2024 13:23:50 -0700 Subject: [PATCH 4/4] Unfold argument documentation --- docs/getting_started/installation.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/getting_started/installation.md b/docs/getting_started/installation.md index e5c233ff5..d9d4d9f7c 100644 --- a/docs/getting_started/installation.md +++ b/docs/getting_started/installation.md @@ -78,11 +78,11 @@ There are three ways to setup **`OmniGibson`**, all built upon different ways of 3. Run the installation script to install Isaac Sim as well as **`OmniGibson`** dataset and assets: - ```{.shell .annotate} - python -m omnigibson.install # (1)! + ```shell + python -m omnigibson.install ``` - 1. You can apply additional flag `--no-install-datasets` to skip dataset install. + You can apply additional flag `--no-install-datasets` to skip dataset install. If this step fails, we recommend considering the [source installation](#__tabbed_1_3) method. @@ -207,11 +207,11 @@ There are three ways to setup **`OmniGibson`**, all built upon different ways of 4. Run the installation script to hook the environment up to Isaac Sim as well as **`OmniGibson`** dataset and assets: - ```{.shell .annotate} - python -m omnigibson.install --launcher-install # (1)! + ```shell + python -m omnigibson.install --launcher-install ``` - 1. You can specify your Isaac Sim install location using the argument `--isaac-sim-path` if it differs from the default. You can also apply additional flag `--no-install-datasets` to skip dataset install. + You can specify your Isaac Sim install location using the argument `--isaac-sim-path` if it differs from the default. You can also apply additional flag `--no-install-datasets` to skip dataset install. !!! note "What does this do?"