From d8cb3ddec94e4ce3257e05a066bca4fa47189afe Mon Sep 17 00:00:00 2001 From: Luke Hutton Date: Sun, 2 Apr 2023 15:09:38 +0000 Subject: [PATCH 1/3] [CI] Fix broken model link The path to the `cnn_s_quantized.tflite` model used in some TVMC tests was changed in https://github.com/ARM-software/ML-zoo/pull/56. The link has been updated with the new path. Change-Id: Ic5c31c191d357ab15af5f4ec93fa6b49c1b2e0fc --- tests/python/driver/tvmc/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python/driver/tvmc/conftest.py b/tests/python/driver/tvmc/conftest.py index e0dbeebf9871..43b5aac51088 100644 --- a/tests/python/driver/tvmc/conftest.py +++ b/tests/python/driver/tvmc/conftest.py @@ -242,7 +242,7 @@ def tflite_mobilenet_v1_0_25_128(tmpdir_factory): @pytest.fixture(scope="session") def tflite_cnn_s_quantized(tmpdir_factory): - base_url = "https://github.com/ARM-software/ML-zoo/raw/master/models/keyword_spotting/cnn_small/tflite_int8/" + base_url = "https://github.com/ARM-software/ML-zoo/raw/master/models/keyword_spotting/cnn_small/model_package_tf/model_archive/TFLite/tflite_int8/cnn_s_quantized.tflite" file_to_download = "cnn_s_quantized.tflite" model_file = download_testdata( "{}/{}".format(base_url, file_to_download), file_to_download, module=["tvmc"] From 8866ed297f8eab2cd926bfa7f0e2c08bc35078ee Mon Sep 17 00:00:00 2001 From: Luke Hutton Date: Mon, 3 Apr 2023 09:41:09 +0000 Subject: [PATCH 2/3] remove model name from link Change-Id: I70dc6809f580b311b0b2cf7a91ee82b003ff9e7a --- tests/python/driver/tvmc/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python/driver/tvmc/conftest.py b/tests/python/driver/tvmc/conftest.py index 43b5aac51088..bfe015d1b3d1 100644 --- a/tests/python/driver/tvmc/conftest.py +++ b/tests/python/driver/tvmc/conftest.py @@ -242,7 +242,7 @@ def tflite_mobilenet_v1_0_25_128(tmpdir_factory): @pytest.fixture(scope="session") def tflite_cnn_s_quantized(tmpdir_factory): - base_url = "https://github.com/ARM-software/ML-zoo/raw/master/models/keyword_spotting/cnn_small/model_package_tf/model_archive/TFLite/tflite_int8/cnn_s_quantized.tflite" + base_url = "https://github.com/ARM-software/ML-zoo/raw/master/models/keyword_spotting/cnn_small/model_package_tf/model_archive/TFLite/tflite_int8" file_to_download = "cnn_s_quantized.tflite" model_file = download_testdata( "{}/{}".format(base_url, file_to_download), file_to_download, module=["tvmc"] From 5ddfd8745e53ec57b5e3f4b99e70ba636527e170 Mon Sep 17 00:00:00 2001 From: Luke Hutton Date: Mon, 3 Apr 2023 13:13:57 +0000 Subject: [PATCH 3/3] use same model link that is used in S3 I noticed the same model was used from a different link in the codebase - using this link to avoid duplication and fix S3 error. Change-Id: I84eb33d81c480e6039cd094f61a1f9a4c00e938d --- tests/python/driver/tvmc/conftest.py | 2 +- tests/scripts/request_hook/request_hook.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/python/driver/tvmc/conftest.py b/tests/python/driver/tvmc/conftest.py index bfe015d1b3d1..5f10ebb24aab 100644 --- a/tests/python/driver/tvmc/conftest.py +++ b/tests/python/driver/tvmc/conftest.py @@ -242,7 +242,7 @@ def tflite_mobilenet_v1_0_25_128(tmpdir_factory): @pytest.fixture(scope="session") def tflite_cnn_s_quantized(tmpdir_factory): - base_url = "https://github.com/ARM-software/ML-zoo/raw/master/models/keyword_spotting/cnn_small/model_package_tf/model_archive/TFLite/tflite_int8" + base_url = "https://github.com/ARM-software/ML-zoo/raw/48a22ee22325d15d2371a6df24eb7d67e21dcc97/models/keyword_spotting/cnn_small/tflite_int8" file_to_download = "cnn_s_quantized.tflite" model_file = download_testdata( "{}/{}".format(base_url, file_to_download), file_to_download, module=["tvmc"] diff --git a/tests/scripts/request_hook/request_hook.py b/tests/scripts/request_hook/request_hook.py index a4f7f90287ba..3c193d84ae4c 100644 --- a/tests/scripts/request_hook/request_hook.py +++ b/tests/scripts/request_hook/request_hook.py @@ -81,7 +81,6 @@ "https://gist.githubusercontent.com/zhreshold/4d0b62f3d01426887599d4f7ede23ee5/raw/596b27d23537e5a1b5751d2b0481ef172f58b539/imagenet1000_clsid_to_human.txt": f"{BASE}/2022-10-05/imagenet1000_clsid_to_human.txt", "https://gist.githubusercontent.com/zhreshold/bcda4716699ac97ea44f791c24310193/raw/fa7ef0e9c9a5daea686d6473a62aacd1a5885849/cat.png": f"{BASE}/zhreshold/bcda4716699ac97ea44f791c24310193/raw/fa7ef0e9c9a5daea686d6473a62aacd1a5885849/cat.png", "https://github.com/ARM-software/ML-zoo/raw/48a22ee22325d15d2371a6df24eb7d67e21dcc97/models/keyword_spotting/cnn_small/tflite_int8/cnn_s_quantized.tflite": f"{BASE}/ARM-software/ML-zoo/raw/48a22ee22325d15d2371a6df24eb7d67e21dcc97/models/keyword_spotting/cnn_small/tflite_int8/cnn_s_quantized.tflite", - "https://github.com/ARM-software/ML-zoo/raw/master/models/keyword_spotting/cnn_small/tflite_int8//cnn_s_quantized.tflite": f"{BASE}/ARM-software/ML-zoo/raw/master/models/keyword_spotting/cnn_small/tflite_int8//cnn_s_quantized.tflite", "https://github.com/czh978/models_for_tvm_test/raw/main/tflite_graph_with_postprocess.pb": f"{BASE}/czh978/models_for_tvm_test/raw/main/tflite_graph_with_postprocess.pb", "https://github.com/dmlc/mxnet.js/blob/main/data/cat.png?raw=true": f"{BASE}/dmlc/mxnet.js/blob/main/data/cat.png" + quote("?raw=true"),