Merge branch 'og-develop' into fix-profiler

README.md

@@ -19,7 +19,7 @@
 
 - [08/04/23] **v0.2.0**: More assets! 600 pre-sampled tasks, 7 new scenes, and many new objects 📈 [[release notes]](https://github.com/StanfordVL/OmniGibson/releases/tag/v0.2.0)
 
-- [04/10/22] **v0.1.0**: Significantly improved stability, performance, and ease of installation :wrench: [[release notes]](https://github.com/StanfordVL/OmniGibson/releases/tag/v0.1.0)
+- [04/10/23] **v0.1.0**: Significantly improved stability, performance, and ease of installation :wrench: [[release notes]](https://github.com/StanfordVL/OmniGibson/releases/tag/v0.1.0)
 
 -------
 

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?"
 

omnigibson/__init__.py

@@ -28,7 +28,7 @@
 
 nest_asyncio.apply()
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 
 root_path = os.path.dirname(os.path.realpath(__file__))
 

omnigibson/install.py

@@ -82,8 +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():
-        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 new_filename
+
+    # If the file is not renamed, return the original filename
     return filename
 
 
@@ -278,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",

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name="omnigibson",
-    version="1.1.0",
+    version="1.1.1",
     author="Stanford University",
     long_description_content_type="text/markdown",
     long_description=long_description,