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

Merge dev to master #705

Merged
merged 28 commits into from
Oct 13, 2023
Merged

Merge dev to master #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
33aab41
updated GH Action
phile-caci Sep 19, 2023
f1c9812
updated GH Action
phile-caci Sep 19, 2023
76c5215
updated GH Action
phile-caci Sep 19, 2023
bf409f3
updated GH Action
phile-caci Sep 19, 2023
26ee840
updated GH Action
phile-caci Sep 19, 2023
e9645e6
manual bump
phile-caci Sep 19, 2023
e8b8d62
Merge branch 'master' of https://github.com/NextCenturyCorporation/MCS
phile-caci Sep 19, 2023
f5641d3
Merge pull request #698 from NextCenturyCorporation/MCS-1955-MCSDeplo…
phile-caci Sep 22, 2023
c639df2
MCS-1393 Do a Reset action to Initialize each new scene to make multi…
ThomasSchellenbergNextCentury Oct 4, 2023
ba10878
MCS-1393 Fixed broken unit tests.
ThomasSchellenbergNextCentury Oct 4, 2023
4796b62
MCS-1393 Maybe fixing issue with depth map integration test.
ThomasSchellenbergNextCentury Oct 4, 2023
36060f6
MCS-1963 Updates to support Windows.
ThomasSchellenbergNextCentury Oct 6, 2023
6f11ea7
Other updates for testing.
ThomasSchellenbergNextCentury Oct 6, 2023
db4b74b
MCS-1963 Bug fix.
ThomasSchellenbergNextCentury Oct 6, 2023
a21d84d
MCS-1963 Added a try/except to the recorder unit test for Windows sup…
ThomasSchellenbergNextCentury Oct 10, 2023
0bf326a
Merge pull request #700 from NextCenturyCorporation/MCS-1393-determinism
ThomasSchellenbergNextCentury Oct 12, 2023
e2a5b48
Merge pull request #701 from NextCenturyCorporation/support-windows
ThomasSchellenbergNextCentury Oct 13, 2023
7b7cbb4
added windows support to auto downloader
phile-caci Oct 13, 2023
63fc99d
updated file names to be consistent
phile-caci Oct 13, 2023
0c1fb1b
updated file names to be consistent
phile-caci Oct 13, 2023
2c254e4
Merge branch 'development' into MCS-1957_WindowsAutoDownloader
phile-caci Oct 13, 2023
746be57
updates to file commands
phile-caci Oct 13, 2023
204815e
reset version
phile-caci Oct 13, 2023
0fc0d45
Merge pull request #702 from NextCenturyCorporation/MCS-1957_WindowsA…
phile-caci Oct 13, 2023
ac90d01
Fixed some integration tests.
ThomasSchellenbergNextCentury Oct 13, 2023
5b80387
Merge pull request #703 from NextCenturyCorporation/fix-tests-101323
phile-caci Oct 13, 2023
e8cd7e3
Update to new version
Oct 13, 2023
a8a11a1
Merge pull request #704 from NextCenturyCorporation/bump-version-0.7.3
phile-caci Oct 13, 2023
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
2 changes: 1 addition & 1 deletion CPU_Container.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=America/New_York

# --build-arg mcsversion=x.y.z to override default in docker build command
ARG mcsversion=0.7.2
ARG mcsversion=0.7.3
ARG mcs_library_version=master

WORKDIR /mcs
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ENV NVIDIA_DRIVER_CAPABILITIES ${NVIDIA_DRIVER_CAPABILITIES},display
# ENV LANG C.UTF-8

# --build-arg mcsversion=x.y.z to override default in docker build command
ARG mcsversion=0.7.2
ARG mcsversion=0.7.3
ARG mcs_library_version=master

WORKDIR /mcs
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Publish to PyPI: [![Publish PyPI](https://github.com/NextCenturyCorporation/MCS/

# MCS Python Package

Python interface for interacting with MCS AI2Thor environment and running scenes. The latest release of the MCS Python library is `0.7.2`. You can find the latest documentation [here](https://nextcenturycorporation.github.io/MCS).
Python interface for interacting with MCS AI2Thor environment and running scenes. The latest release of the MCS Python library is `0.7.3`. You can find the latest documentation [here](https://nextcenturycorporation.github.io/MCS).

- [Quickstart Installation](#quickstart-installation)
- [Usage](#usage)
Expand Down
6 changes: 3 additions & 3 deletions docs/source/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Installation and Setup
=======================

.. _Download and unzip the Mac ZIP: https://github.com/NextCenturyCorporation/MCS/releases/download/0.7.2/MCS-AI2-THOR-Unity-App-v0.7.2-mac.zip
.. _Download and unzip the Linux ZIP: https://github.com/NextCenturyCorporation/MCS/releases/download/0.7.2/MCS-AI2-THOR-Unity-App-v0.7.2-linux.zip
.. _Download and unzip the Mac ZIP: https://github.com/NextCenturyCorporation/MCS/releases/download/0.7.3/MCS-AI2-THOR-Unity-App-v0.7.3-mac.zip
.. _Download and unzip the Linux ZIP: https://github.com/NextCenturyCorporation/MCS/releases/download/0.7.3/MCS-AI2-THOR-Unity-App-v0.7.3-linux.zip

Virtual Environments
------------------------
Expand Down Expand Up @@ -240,7 +240,7 @@ controller_timeout

(int, optional)

Sets the time (in seconds) to allow on controller initialization before timing out. Default 180
Sets the time (in seconds) to allow on controller initialization before timing out. Default 600

terminal_output
^^^^^^^^^^^^^^^
Expand Down
9 changes: 4 additions & 5 deletions integration_tests/additional_integration_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,12 @@ def run_depth_and_segmentation_test(controller, metadata_tier):
for row_idx, pixel_row in enumerate(
output_depth_data[0]["depth_map_list"][0]):
for col_idx, pixel_col in enumerate(pixel_row):

# Need to account for hardware differences
if (not math.isclose(
pixel_col,
step_metadata_0.depth_map_list[0][row_idx][col_idx],
rel_tol=0.00009,
abs_tol=0.00009
rel_tol=0.0009,
abs_tol=0.0009
)):
return (
False,
Expand Down Expand Up @@ -150,8 +149,8 @@ def run_depth_and_segmentation_test(controller, metadata_tier):
if (not math.isclose(
pixel_col,
step_metadata_1.depth_map_list[0][row_idx][col_idx],
rel_tol=0.00009,
abs_tol=0.00009
rel_tol=0.0009,
abs_tol=0.0009
)):
return (
False,
Expand Down
4 changes: 2 additions & 2 deletions integration_tests/data/081.move_into_light_object_intuitive_reset.oracle.outputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@
{
"direction_x": 0.0,
"direction_y": -0.734,
"direction_z": 0.69,
"direction_z": 0.68,
"distance": 0.697,
"held": false,
"id": "testBall",
Expand Down Expand Up @@ -353,7 +353,7 @@
"objects": [
{
"direction_x": 0.0,
"direction_y": -0.72,
"direction_y": -0.73,
"direction_z": 0.69,
"distance": 0.71,
"held": false,
Expand Down
15 changes: 10 additions & 5 deletions integration_tests/data/110.tool_cannot_walk_into.oracle.outputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -48,7 +49,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -79,7 +81,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -110,7 +113,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -141,7 +145,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down
33 changes: 22 additions & 11 deletions integration_tests/data/111.tool_push.oracle.outputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -48,7 +49,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -79,7 +81,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -110,7 +113,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -141,7 +145,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -172,7 +177,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -203,7 +209,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -234,7 +241,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -265,7 +273,8 @@
"rotation_y": 0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -296,7 +305,8 @@
"rotation_y": 0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -327,7 +337,8 @@
"rotation_y": 0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down
21 changes: 14 additions & 7 deletions integration_tests/data/112.tool_move.oracle.outputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -48,7 +49,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -79,7 +81,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -110,7 +113,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -141,7 +145,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -172,7 +177,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down Expand Up @@ -203,7 +209,8 @@
"rotation_y": 0.0,
"shape": "tool",
"texture_color_list": [
"grey"
"grey",
"black"
],
"visible": true
}
Expand Down
Loading
Loading