diff --git a/.github/poetry/cpu/poetry.lock b/.github/poetry/cpu/poetry.lock index ba820f34..15b27c76 100644 --- a/.github/poetry/cpu/poetry.lock +++ b/.github/poetry/cpu/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.1 and should not be changed by hand. [[package]] name = "absl-py" @@ -889,6 +889,69 @@ files = [ [package.extras] protobuf = ["grpcio-tools (>=1.62.1)"] +[[package]] +name = "gym-aloha" +version = "0.1.0" +description = "A gym environment for ALOHA" +optional = true +python-versions = "^3.10" +files = [] +develop = false + +[package.dependencies] +dm-control = "1.0.14" +gymnasium = "^0.29.1" +mujoco = "^2.3.7" + +[package.source] +type = "git" +url = "git@github.com:huggingface/gym-aloha.git" +reference = "HEAD" +resolved_reference = "c636f05ba0d1760df94537da84c860be1487e17f" + +[[package]] +name = "gym-pusht" +version = "0.1.0" +description = "A gymnasium environment for PushT." +optional = true +python-versions = "^3.10" +files = [] +develop = false + +[package.dependencies] +gymnasium = "^0.29.1" +opencv-python = "^4.9.0.80" +pygame = "^2.5.2" +pymunk = "^6.6.0" +scikit-image = "^0.22.0" +shapely = "^2.0.3" + +[package.source] +type = "git" +url = "git@github.com:huggingface/gym-pusht.git" +reference = "HEAD" +resolved_reference = "6c9893504f670ff069d0f759a733e971ea1efdbf" + +[[package]] +name = "gym-xarm" +version = "0.1.0" +description = "A gym environment for xArm" +optional = true +python-versions = "^3.10" +files = [] +develop = false + +[package.dependencies] +gymnasium = "^0.29.1" +gymnasium-robotics = "^1.2.4" +mujoco = "^2.3.7" + +[package.source] +type = "git" +url = "git@github.com:huggingface/gym-xarm.git" +reference = "HEAD" +resolved_reference = "08ddd5a9400783a6898bbf3c3014fc5da3961b9d" + [[package]] name = "gymnasium" version = "0.29.1" @@ -2988,31 +3051,6 @@ numpy = "*" packaging = "*" protobuf = ">=3.20" -[[package]] -name = "tensordict" -version = "0.4.0+b4c91e8" -description = "" -optional = false -python-versions = "*" -files = [] -develop = false - -[package.dependencies] -cloudpickle = "*" -numpy = "*" -torch = ">=2.1.0" - -[package.extras] -checkpointing = ["torchsnapshot-nightly"] -h5 = ["h5py (>=3.8)"] -tests = ["pytest", "pytest-benchmark", "pytest-instafail", "pytest-rerunfailures", "pyyaml"] - -[package.source] -type = "git" -url = "https://github.com/pytorch/tensordict" -reference = "HEAD" -resolved_reference = "b4c91e8828c538ca0a50d8383fd99311a9afb078" - [[package]] name = "termcolor" version = "2.4.0" @@ -3091,40 +3129,6 @@ type = "legacy" url = "https://download.pytorch.org/whl/cpu" reference = "torch-cpu" -[[package]] -name = "torchrl" -version = "0.4.0+13bef42" -description = "" -optional = false -python-versions = "*" -files = [] -develop = false - -[package.dependencies] -cloudpickle = "*" -numpy = "*" -packaging = "*" -tensordict = ">=0.4.0" -torch = ">=2.1.0" - -[package.extras] -all = ["ale-py", "atari-py", "dm_control", "git", "gym", "gym[accept-rom-license]", "gymnasium", "h5py", "huggingface_hub", "hydra-core (>=1.1)", "hydra-submitit-launcher", "minari", "moviepy", "mujoco", "pandas", "pettingzoo (>=1.24.1)", "pillow", "pygame", "pytest", "pytest-instafail", "pyyaml", "requests", "scikit-learn", "scipy", "tensorboard", "torchsnapshot", "torchvision", "tqdm", "vmas (>=1.2.10)", "wandb"] -atari = ["ale-py", "atari-py", "gym", "gym[accept-rom-license]", "pygame"] -checkpointing = ["torchsnapshot"] -dm-control = ["dm_control"] -gym-continuous = ["gymnasium", "mujoco"] -marl = ["pettingzoo (>=1.24.1)", "vmas (>=1.2.10)"] -offline-data = ["h5py", "huggingface_hub", "minari", "pandas", "pillow", "requests", "scikit-learn", "torchvision", "tqdm"] -rendering = ["moviepy"] -tests = ["pytest", "pytest-instafail", "pyyaml", "scipy"] -utils = ["git", "hydra-core (>=1.1)", "hydra-submitit-launcher", "tensorboard", "tqdm", "wandb"] - -[package.source] -type = "git" -url = "https://github.com/pytorch/rl" -reference = "13bef426dcfa5887c6e5034a6e9697993fa92c37" -resolved_reference = "13bef426dcfa5887c6e5034a6e9697993fa92c37" - [[package]] name = "torchvision" version = "0.17.1+cpu" @@ -3330,4 +3334,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "8800bb8b24312d17b765cd2ce2799f49436171dd5fbf1bec3b07f853cfa9befd" +content-hash = "32cd6caa01276a90b37cb177204e5b1511e92838f3f0268391034042d56f3bd6" diff --git a/.github/poetry/cpu/pyproject.toml b/.github/poetry/cpu/pyproject.toml index e84b93c9..d310da47 100644 --- a/.github/poetry/cpu/pyproject.toml +++ b/.github/poetry/cpu/pyproject.toml @@ -39,8 +39,6 @@ scikit-image = "^0.22.0" numba = "^0.59.0" mpmath = "^1.3.0" torch = {version = "^2.2.1", source = "torch-cpu"} -tensordict = {git = "https://github.com/pytorch/tensordict"} -torchrl = {git = "https://github.com/pytorch/rl", rev = "13bef426dcfa5887c6e5034a6e9697993fa92c37"} mujoco = "^2.3.7" opencv-python = "^4.9.0.80" diffusers = "^0.26.3" @@ -53,7 +51,12 @@ huggingface-hub = "^0.21.4" gymnasium-robotics = "^1.2.4" gymnasium = "^0.29.1" cmake = "^3.29.0.1" - +gym-pusht = { git = "git@github.com:huggingface/gym-pusht.git", optional = true} +gym-xarm = { git = "git@github.com:huggingface/gym-xarm.git", optional = true} +gym-aloha = { git = "git@github.com:huggingface/gym-aloha.git", optional = true} +# gym-pusht = { path = "../gym-pusht", develop = true, optional = true} +# gym-xarm = { path = "../gym-xarm", develop = true, optional = true} +# gym-aloha = { path = "../gym-aloha", develop = true, optional = true} [tool.poetry.group.dev.dependencies] pre-commit = "^3.6.2" diff --git a/poetry.lock b/poetry.lock index e5105b75..95c9f31e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3255,31 +3255,6 @@ numpy = "*" packaging = "*" protobuf = ">=3.20" -[[package]] -name = "tensordict" -version = "0.4.0+b4c91e8" -description = "" -optional = false -python-versions = "*" -files = [] -develop = false - -[package.dependencies] -cloudpickle = "*" -numpy = "*" -torch = ">=2.1.0" - -[package.extras] -checkpointing = ["torchsnapshot-nightly"] -h5 = ["h5py (>=3.8)"] -tests = ["pytest", "pytest-benchmark", "pytest-instafail", "pytest-rerunfailures", "pyyaml"] - -[package.source] -type = "git" -url = "https://github.com/pytorch/tensordict" -reference = "HEAD" -resolved_reference = "b4c91e8828c538ca0a50d8383fd99311a9afb078" - [[package]] name = "termcolor" version = "2.4.0" @@ -3380,40 +3355,6 @@ typing-extensions = ">=4.8.0" opt-einsum = ["opt-einsum (>=3.3)"] optree = ["optree (>=0.9.1)"] -[[package]] -name = "torchrl" -version = "0.4.0+13bef42" -description = "" -optional = false -python-versions = "*" -files = [] -develop = false - -[package.dependencies] -cloudpickle = "*" -numpy = "*" -packaging = "*" -tensordict = ">=0.4.0" -torch = ">=2.1.0" - -[package.extras] -all = ["ale-py", "atari-py", "dm_control", "git", "gym", "gym[accept-rom-license]", "gymnasium", "h5py", "huggingface_hub", "hydra-core (>=1.1)", "hydra-submitit-launcher", "minari", "moviepy", "mujoco", "pandas", "pettingzoo (>=1.24.1)", "pillow", "pygame", "pytest", "pytest-instafail", "pyyaml", "requests", "scikit-learn", "scipy", "tensorboard", "torchsnapshot", "torchvision", "tqdm", "vmas (>=1.2.10)", "wandb"] -atari = ["ale-py", "atari-py", "gym", "gym[accept-rom-license]", "pygame"] -checkpointing = ["torchsnapshot"] -dm-control = ["dm_control"] -gym-continuous = ["gymnasium", "mujoco"] -marl = ["pettingzoo (>=1.24.1)", "vmas (>=1.2.10)"] -offline-data = ["h5py", "huggingface_hub", "minari", "pandas", "pillow", "requests", "scikit-learn", "torchvision", "tqdm"] -rendering = ["moviepy"] -tests = ["pytest", "pytest-instafail", "pyyaml", "scipy"] -utils = ["git", "hydra-core (>=1.1)", "hydra-submitit-launcher", "tensorboard", "tqdm", "wandb"] - -[package.source] -type = "git" -url = "https://github.com/pytorch/rl" -reference = "13bef426dcfa5887c6e5034a6e9697993fa92c37" -resolved_reference = "13bef426dcfa5887c6e5034a6e9697993fa92c37" - [[package]] name = "torchvision" version = "0.17.1" @@ -3657,4 +3598,4 @@ xarm = ["gym-xarm"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "cb450ac7186e004536d75409edd42cd96062f7b1fd47822a5460d12eab8762f9" +content-hash = "bf4627c62a45764931729ce373f1038fe289b6caebb01e66d878f6f278c54518" diff --git a/pyproject.toml b/pyproject.toml index e78a502d..a549e66f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,8 +39,6 @@ scikit-image = "^0.22.0" numba = "^0.59.0" mpmath = "^1.3.0" torch = "^2.2.1" -tensordict = {git = "https://github.com/pytorch/tensordict"} -torchrl = {git = "https://github.com/pytorch/rl", rev = "13bef426dcfa5887c6e5034a6e9697993fa92c37"} mujoco = "^2.3.7" opencv-python = "^4.9.0.80" diffusers = "^0.26.3"