Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Docker images to Isaac Sim 4.0.0, add both-version compatibility to kit files #778

Merged
merged 8 commits into from
Jul 9, 2024
Merged

Update Docker images to Isaac Sim 4.0.0, add both-version compatibility to kit files #778

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7848b41
Update Docker images to Isaac Sim 4.0.0
cgokmen Jun 26, 2024
1ec1b13
Change actions base image
cgokmen Jun 27, 2024
9c1f31c
Run tests with stdout enabled
cgokmen Jun 27, 2024
bd61cdb
Revert "Update kit file"
cgokmen Jun 27, 2024
98bd982
Reapply "Update kit file"
cgokmen Jun 27, 2024
d5fcec2
Add both kit files
cgokmen Jul 9, 2024
0a37ec0
Merge branch 'og-develop' into docker-400
cgokmen Jul 9, 2024
52bb0fe
Dont disable transition rules
cgokmen Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions docker/build_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
#!/usr/bin/env bash
set -e -o pipefail

docker build \
-t stanfordvl/omnigibson-dev:latest \
-f docker/dev.Dockerfile \
.

docker build \
-t stanfordvl/omnigibson:latest \
-t stanfordvl/omnigibson:$(sed -ne "s/.*version= *['\"]\([^'\"]*\)['\"] *.*/\1/p" setup.py) \
Expand Down
5 changes: 1 addition & 4 deletions docker/prod.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nvcr.io/nvidia/isaac-sim:2023.1.1
FROM nvcr.io/nvidia/isaac-sim:4.0.0

# Set up all the prerequisites.
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
Expand All @@ -10,9 +10,6 @@ RUN rm -rf /isaac-sim/exts/omni.isaac.ml_archive/pip_prebundle/gym*
RUN rm -rf /isaac-sim/kit/extscore/omni.kit.pip_archive/pip_prebundle/numpy*
RUN /isaac-sim/python.sh -m pip install click~=8.1.3

# Disable the livestream extension getting launched by default in Isaac Sim 2023.1.1
RUN sed -i 's/\"omni.kit.livestream.native.*//g' /isaac-sim/apps/omni.isaac.sim.python.kit

# Mount the data directory
VOLUME ["/data"]
ENV OMNIGIBSON_DATASET_PATH /data/og_dataset
Expand Down
2 changes: 1 addition & 1 deletion omnigibson/macros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def determine_gm_path(default_path, env_var_name):
gm.ENABLE_OBJECT_STATES = True

# Whether to enable transition rules or not
gm.ENABLE_TRANSITION_RULES = True
gm.ENABLE_TRANSITION_RULES = False

# Default settings for the omni UI viewer
gm.DEFAULT_VIEWER_WIDTH = 1280
Expand Down
Loading