From dcb51ea48b05be2e8003a0dc94dea0dd96ee9a5a Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 7 Feb 2023 13:06:06 -0500 Subject: [PATCH 1/3] install extra option for torch_all --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 2af58e53395..9d070a7c057 100644 --- a/setup.py +++ b/setup.py @@ -67,6 +67,7 @@ "tensorboardX>=1.0", "gputils", ] +_pytorch_all_deps = _pytorch_deps + ["torchvision>=0.3.0,<=0.13", "torchaudio<=0.12"] _pytorch_vision_deps = _pytorch_deps + ["torchvision>=0.3.0,<=0.13"] _tensorflow_v1_deps = ["tensorflow<2.0.0", "tensorboard<2.0.0", "tf2onnx>=1.0.0,<1.6"] _tensorflow_v1_gpu_deps = [ @@ -123,6 +124,7 @@ def _setup_extras() -> Dict: "deepsparse-ent": _deepsparse_ent_deps, "onnxruntime": _onnxruntime_deps, "torch": _pytorch_deps, + "torch_all": _pytorch_all_deps, "torchvision": _pytorch_vision_deps, "tf_v1": _tensorflow_v1_deps, "tf_v1_gpu": _tensorflow_v1_gpu_deps, From 8a66b9931343137786e827e8311438bd7b7bd390 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 7 Feb 2023 14:47:46 -0500 Subject: [PATCH 2/3] add torchtext, remove tensorboard as a torch dep --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 9d070a7c057..48947033ce8 100644 --- a/setup.py +++ b/setup.py @@ -63,11 +63,13 @@ _onnxruntime_deps = ["onnxruntime>=1.0.0"] _pytorch_deps = [ "torch>=1.1.0,<=1.12.1", - "tensorboard>=1.0,<2.9", - "tensorboardX>=1.0", "gputils", ] -_pytorch_all_deps = _pytorch_deps + ["torchvision>=0.3.0,<=0.13", "torchaudio<=0.12"] +_pytorch_all_deps = _pytorch_deps + [ + "torchvision>=0.3.0,<=0.13", + "torchaudio<=0.12", + "torchvision>=0.3.0,<=0.13", +] _pytorch_vision_deps = _pytorch_deps + ["torchvision>=0.3.0,<=0.13"] _tensorflow_v1_deps = ["tensorflow<2.0.0", "tensorboard<2.0.0", "tf2onnx>=1.0.0,<1.6"] _tensorflow_v1_gpu_deps = [ From 4631f3e8f5f338cd66ff0f4e20f06b7474a5e14d Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 7 Feb 2023 14:58:40 -0500 Subject: [PATCH 3/3] move tensorboard deps to dev deps to run tests --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 48947033ce8..1a306bc89f1 100644 --- a/setup.py +++ b/setup.py @@ -102,6 +102,8 @@ "flaky~=3.7.0", "sphinx-rtd-theme", "docutils<0.17", + "tensorboard>=1.0,<2.9", + "tensorboardX>=1.0", ]