From 22d40a3474a2e251bf145e9ed76afa81e8b28512 Mon Sep 17 00:00:00 2001 From: Benjamin Fineran Date: Wed, 8 Feb 2023 11:17:57 -0500 Subject: [PATCH] [cherry-pick] install extra option for torch_all (#1368) (#1369) * install extra option for torch_all * add torchtext, remove tensorboard as a torch dep * move tensorboard deps to dev deps to run tests --- setup.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 2af58e53395..1a306bc89f1 100644 --- a/setup.py +++ b/setup.py @@ -63,10 +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", + "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 = [ @@ -99,6 +102,8 @@ "flaky~=3.7.0", "sphinx-rtd-theme", "docutils<0.17", + "tensorboard>=1.0,<2.9", + "tensorboardX>=1.0", ] @@ -123,6 +128,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,