This is an automated email from the ASF dual-hosted git repository. areusch pushed a commit to branch areusch/freeze-dependencies in repository https://gitbox.apache.org/repos/asf/tvm.git
commit bf7142c485cfd442f26c8deb43a605e25c475a05 Author: Andrew Reusch <[email protected]> AuthorDate: Fri Jul 1 11:26:00 2022 -0700 TODO Remove torch from tvmc build deps. --- docker/python/build/poetry.lock | 26 +++++++++++++------------- docker/python/build/pyproject.toml | 11 ++++++++--- python/gen_requirements.py | 8 -------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/docker/python/build/poetry.lock b/docker/python/build/poetry.lock index 3d58a35c4e..91c6c5f6f9 100644 --- a/docker/python/build/poetry.lock +++ b/docker/python/build/poetry.lock @@ -680,7 +680,7 @@ reference = "custom-pypi" [[package]] name = "imagesize" -version = "1.3.0" +version = "1.4.1" description = "Getting image size from png/jpeg/jpeg2000/gif file" category = "dev" optional = false @@ -1604,7 +1604,7 @@ reference = "custom-pypi" [[package]] name = "setuptools-scm" -version = "7.0.3" +version = "7.0.4" description = "the blessed package to manage your versions by scm tags" category = "dev" optional = false @@ -2265,7 +2265,7 @@ reference = "custom-pypi" [[package]] name = "typing-extensions" -version = "4.2.0" +version = "4.3.0" description = "Backported and Experimental Type Hints for Python 3.7+" category = "dev" optional = false @@ -2384,24 +2384,24 @@ reference = "custom-pypi" ethosu = ["ethos-u-vela"] gpu = [] importer-caffe = ["numpy", "protobuf", "scikit-image", "six"] -importer-caffe2 = ["future", "torch"] +importer-caffe2 = [] importer-coreml = ["coremltools"] importer-darknet = ["opencv-python"] importer-keras = ["keras", "tensorflow", "tensorflow-estimator"] importer-mxnet = ["mxnet"] importer-oneflow = ["flowvision", "oneflow"] -importer-onnx = ["future", "onnx", "onnxoptimizer", "onnxruntime", "torch", "torchvision"] +importer-onnx = ["onnx", "onnxoptimizer", "onnxruntime"] importer-paddle = ["paddlepaddle"] importer-pytorch = ["future", "torch", "torchvision"] importer-tensorflow = ["tensorflow", "tensorflow-estimator"] importer-tflite = ["tensorflow", "tensorflow-estimator", "tflite"] -tvmc = ["ethos-u-vela", "future", "onnx", "onnxoptimizer", "onnxruntime", "paddlepaddle", "tensorflow", "tflite", "torch", "torchvision", "xgboost"] +tvmc = ["ethos-u-vela", "onnx", "onnxoptimizer", "onnxruntime", "paddlepaddle", "tensorflow", "tflite", "xgboost"] xgboost = ["future", "xgboost"] [metadata] lock-version = "1.1" python-versions = ">=3.7, <3.9" -content-hash = "559f23b1fa6c5181fb8c7b856d1d7ee65405586e089871ed7de5f0fc1e6080e4" +content-hash = "4f217aa27b418c2bbf2b04466bdb69e0a6c663af532ea464ad6323caa840a753" [metadata.files] absl-py = [ @@ -2652,8 +2652,8 @@ imageio = [ {file = "imageio-2.19.3.tar.gz", hash = "sha256:0c9df80e42f2ee68bea92001e7fcf612aa149910efe040eb757f5ce323250ae1"}, ] imagesize = [ - {file = "imagesize-1.3.0-py2.py3-none-any.whl", hash = "sha256:1db2f82529e53c3e929e8926a1fa9235aa82d0bd0c580359c67ec31b2fddaa8c"}, - {file = "imagesize-1.3.0.tar.gz", hash = "sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"}, + {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"}, + {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"}, ] importlib-metadata = [ {file = "importlib_metadata-4.12.0-py3-none-any.whl", hash = "sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23"}, @@ -3386,8 +3386,8 @@ setuptools = [ {file = "setuptools-62.6.0.tar.gz", hash = "sha256:990a4f7861b31532871ab72331e755b5f14efbe52d336ea7f6118144dd478741"}, ] setuptools-scm = [ - {file = "setuptools_scm-7.0.3-py3-none-any.whl", hash = "sha256:7934c856b042199eb44e1523b46abb881726b7d61b3c9b41a756e4ffb4adf73b"}, - {file = "setuptools_scm-7.0.3.tar.gz", hash = "sha256:cf8ab8e235bed840cd4559b658af0d8e8a70896a191bbc510ee914ec5325332d"}, + {file = "setuptools_scm-7.0.4-py3-none-any.whl", hash = "sha256:53a6f51451a84d891ca485cec700a802413bbc5e76ee65da134e54c733a6e44d"}, + {file = "setuptools_scm-7.0.4.tar.gz", hash = "sha256:c27bc1f48593cfc9527251f1f0fc41ce282ea57bbc7fd5a1ea3acb99325fab4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -3617,8 +3617,8 @@ typed-ast = [ {file = "typed_ast-1.4.3.tar.gz", hash = "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65"}, ] typing-extensions = [ - {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"}, - {file = "typing_extensions-4.2.0.tar.gz", hash = "sha256:f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376"}, + {file = "typing_extensions-4.3.0-py3-none-any.whl", hash = "sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02"}, + {file = "typing_extensions-4.3.0.tar.gz", hash = "sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6"}, ] urllib3 = [ {file = "urllib3-1.26.9-py2.py3-none-any.whl", hash = "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"}, diff --git a/docker/python/build/pyproject.toml b/docker/python/build/pyproject.toml index a579046942..da23f2d670 100644 --- a/docker/python/build/pyproject.toml +++ b/docker/python/build/pyproject.toml @@ -68,6 +68,11 @@ name = "torch" url = "http://download.pytorch.org/whl/cpu"; secondary = true +[[tool.poetry.source]] +name = "torch-arm" +url = "https://torch.kmtea.eu/whl/stable.html"; +secondary = true + [[tool.poetry.source]] name = "tensorflow-aarch64" url = "https://snapshots.linaro.org/ldcg/python/tensorflow-manylinux/43/tensorflow-aarch64"; @@ -138,7 +143,7 @@ gpu = [] importer-caffe = ["numpy", "protobuf", "scikit-image", "six"] # Requirements for the Caffe2 importer -importer-caffe2 = ["future", "torch"] +importer-caffe2 = [] # Requirements for the CoreML importer importer-coreml = ["coremltools"] @@ -153,7 +158,7 @@ importer-keras = ["keras", "tensorflow", "tensorflow-estimator"] importer-oneflow = ["flowvision", "oneflow"] # Requirements for the ONNX importer -importer-onnx = ["future", "onnx", "onnxoptimizer", "onnxruntime", "torch", "torchvision"] +importer-onnx = ["onnx", "onnxoptimizer", "onnxruntime"] # Requirements for the mxnet importer importer-mxnet = ["mxnet"] @@ -171,7 +176,7 @@ importer-tensorflow = ["tensorflow", "tensorflow-estimator"] importer-tflite = ["tensorflow", "tensorflow-estimator", "tflite"] # Requirements for the tvmc command-line tool -tvmc = ["ethos-u-vela", "future", "onnx", "onnxoptimizer", "onnxruntime", "paddlepaddle", "tensorflow", "tflite", "torch", "torchvision", "xgboost"] +tvmc = ["ethos-u-vela", "onnx", "onnxoptimizer", "onnxruntime", "paddlepaddle", "tensorflow", "tflite", "xgboost"] # Requirements for XGBoost autotuning xgboost = ["future", "xgboost"] diff --git a/python/gen_requirements.py b/python/gen_requirements.py index 8fe144a50d..7523956a96 100755 --- a/python/gen_requirements.py +++ b/python/gen_requirements.py @@ -111,8 +111,6 @@ REQUIREMENTS_BY_PIECE: RequirementsByPieceType = [ ( "Requirements for the Caffe2 importer", [ - "future", # Hidden dependency of torch. - "torch", ], ), ), @@ -137,12 +135,9 @@ REQUIREMENTS_BY_PIECE: RequirementsByPieceType = [ ( "Requirements for the ONNX importer", [ - "future", # Hidden dependency of torch. "onnx", "onnxoptimizer", "onnxruntime", - "torch", - "torchvision", ], ), ), @@ -184,15 +179,12 @@ REQUIREMENTS_BY_PIECE: RequirementsByPieceType = [ "Requirements for the tvmc command-line tool", [ "ethos-u-vela", - "future", # Hidden dependency of torch. "onnx", "onnxoptimizer", "onnxruntime", "paddlepaddle", "tensorflow", "tflite", - "torch", - "torchvision", "xgboost", ], ),
