From 1e3d45f685b069eb081179db1bb12522797277dc Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Thu, 10 Aug 2023 09:41:33 +0200 Subject: [PATCH 1/5] fix again tflite dep --- Cargo.toml | 1 + test-rt/test-tflite/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index bf91433fda..b90c7f20c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,6 +102,7 @@ serde_json = "1.0" string-interner = "0.14" tar = "0.4.37" tensorflow = "0.17.0" +tflite = "0.9.7" time = "=0.3.23" time-macros = "=0.2.10" tokenizers = "0.13" diff --git a/test-rt/test-tflite/Cargo.toml b/test-rt/test-tflite/Cargo.toml index 36d94dfd28..227720a4d5 100644 --- a/test-rt/test-tflite/Cargo.toml +++ b/test-rt/test-tflite/Cargo.toml @@ -13,7 +13,7 @@ suite-conv = { path = "../suite-conv" } [dev-dependencies] lazy_static.workspace = true log.workspace = true -tflite = { git= "https://github.com/Marekkon5/tflite-rs" } +tflite.workspace = true tract-tflite = { path = "../../tflite", version = "=0.20.7-pre" } tract-onnx-opl = { path = "../../onnx-opl", version = "=0.20.7-pre" } infra = { path = "../infra" } From a5678f145c6ad36b61b143217a2b4a65110ebaed Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Thu, 10 Aug 2023 11:24:48 +0200 Subject: [PATCH 2/5] add libclang-dep --- .travis/onnx-tests.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis/onnx-tests.sh b/.travis/onnx-tests.sh index 075480864a..944e5fc0eb 100755 --- a/.travis/onnx-tests.sh +++ b/.travis/onnx-tests.sh @@ -15,6 +15,9 @@ rustc --version if [ `uname` = "Darwin" ] then brew install coreutils +else + # this seems to help with tflite / bindgen obscure bug + apt-get install -y libclang-dev fi # if [ `uname` = "Linux" -a -z "$TRAVIS" ] From 0d58bb105d242c691ce329c367ed9d8dbe1e2400 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Thu, 10 Aug 2023 13:28:22 +0200 Subject: [PATCH 3/5] fix install libclang-dev --- .travis/onnx-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/onnx-tests.sh b/.travis/onnx-tests.sh index 944e5fc0eb..39e9ba883d 100755 --- a/.travis/onnx-tests.sh +++ b/.travis/onnx-tests.sh @@ -15,9 +15,9 @@ rustc --version if [ `uname` = "Darwin" ] then brew install coreutils -else +else if [ -n "$GITHUB_ACTIONS" ] # this seems to help with tflite / bindgen obscure bug - apt-get install -y libclang-dev + sudo apt-get install -y libclang-dev fi # if [ `uname` = "Linux" -a -z "$TRAVIS" ] From 53a22b76c7de84919abc22f5e522739db5a664f2 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Thu, 10 Aug 2023 13:40:37 +0200 Subject: [PATCH 4/5] shell syntax --- .travis/onnx-tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis/onnx-tests.sh b/.travis/onnx-tests.sh index 39e9ba883d..5e12d6a67f 100755 --- a/.travis/onnx-tests.sh +++ b/.travis/onnx-tests.sh @@ -15,7 +15,8 @@ rustc --version if [ `uname` = "Darwin" ] then brew install coreutils -else if [ -n "$GITHUB_ACTIONS" ] +elif [ -n "$GITHUB_ACTIONS" ] +then # this seems to help with tflite / bindgen obscure bug sudo apt-get install -y libclang-dev fi From 1d73b6ec9afbf2d12f06821df54c78881ee02dd3 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Fri, 11 Aug 2023 08:41:44 +0200 Subject: [PATCH 5/5] come back to patched tflite --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b90c7f20c3..e8f5447dac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,7 +102,7 @@ serde_json = "1.0" string-interner = "0.14" tar = "0.4.37" tensorflow = "0.17.0" -tflite = "0.9.7" +tflite = { git = "https://github.com/Marekkon5/tflite-rs.git" } time = "=0.3.23" time-macros = "=0.2.10" tokenizers = "0.13"