From c59dadce0b5e504b3adef750ee1037e92094ad38 Mon Sep 17 00:00:00 2001 From: Michael Goin Date: Tue, 23 May 2023 14:48:12 -0400 Subject: [PATCH 1/3] Require `torchvision<0.14` rather than `torchvision<=0.13` --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 64825bebef..e4f2cf416e 100644 --- a/setup.py +++ b/setup.py @@ -130,11 +130,11 @@ def _parse_requirements_file(file_path): "onnxruntime>=1.7.0", ] _image_classification_deps = [ - "torchvision>=0.3.0,<=0.13", + "torchvision>=0.3.0,<0.14", "opencv-python<=4.6.0.66", ] _yolo_integration_deps = [ - "torchvision>=0.3.0,<=0.13", + "torchvision>=0.3.0,<0.14", "opencv-python<=4.6.0.66", ] _openpifpaf_integration_deps = [ From 0e97b98db96975261bfaa4b5230168ec7df150a0 Mon Sep 17 00:00:00 2001 From: Michael Goin Date: Tue, 23 May 2023 15:57:52 -0400 Subject: [PATCH 2/3] Update test_engine_mocking.py --- tests/utils/test_engine_mocking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/test_engine_mocking.py b/tests/utils/test_engine_mocking.py index 04ef3c0c66..76061b2434 100644 --- a/tests/utils/test_engine_mocking.py +++ b/tests/utils/test_engine_mocking.py @@ -38,7 +38,7 @@ def test_mock_engine_calls(engine_mock: MagicMock): engine_mock.assert_called_once_with( os.path.join( os.path.expanduser("~"), - ".cache/sparsezoo/84774c96-ab7d-4b3b-ab8c-2509d7bfcb09/model.onnx", + ".cache/sparsezoo/neuralmagic/resnet_v1-50-imagenet-pruned85.4block_quantized/model.onnx", ), 3, 1, From 7862a76d539c135ac8ef5bf6afc19a3388b60ecc Mon Sep 17 00:00:00 2001 From: Michael Goin Date: Tue, 23 May 2023 16:08:47 -0400 Subject: [PATCH 3/3] Update test_engine_mocking.py --- tests/utils/test_engine_mocking.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/utils/test_engine_mocking.py b/tests/utils/test_engine_mocking.py index 76061b2434..cce1f65be6 100644 --- a/tests/utils/test_engine_mocking.py +++ b/tests/utils/test_engine_mocking.py @@ -38,7 +38,8 @@ def test_mock_engine_calls(engine_mock: MagicMock): engine_mock.assert_called_once_with( os.path.join( os.path.expanduser("~"), - ".cache/sparsezoo/neuralmagic/resnet_v1-50-imagenet-pruned85.4block_quantized/model.onnx", + ".cache/sparsezoo/neuralmagic/", + "resnet_v1-50-imagenet-pruned85.4block_quantized/model.onnx", ), 3, 1,