From ba544652b6095d4b419bb47fcc41d80ed875e5d5 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Fri, 10 Jan 2025 15:44:17 +0100 Subject: [PATCH 1/7] tweak deps --- examples/keras-tract-tf2/ci.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/keras-tract-tf2/ci.sh b/examples/keras-tract-tf2/ci.sh index fc0838fad4..7d95a21db0 100755 --- a/examples/keras-tract-tf2/ci.sh +++ b/examples/keras-tract-tf2/ci.sh @@ -6,7 +6,8 @@ set -e sudo apt-get update # Install required libraries -sudo apt-get install -y libgl1-mesa-glx libegl1-mesa libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6 python3 python3-venv +# sudo apt-get install -y libgl1-mesa-glx libegl1-mesa libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6 python3 python3-venv +sudo apt-get install -y libegl1-mesa libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6 python3 python3-venv python3 -m venv venv . venv/bin/activate From 61541879e1f076d9950bc97f9c5b52847e4bf505 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Fri, 10 Jan 2025 15:46:32 +0100 Subject: [PATCH 2/7] tweak more --- examples/keras-tract-tf2/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/keras-tract-tf2/ci.sh b/examples/keras-tract-tf2/ci.sh index 7d95a21db0..0ecaa86849 100755 --- a/examples/keras-tract-tf2/ci.sh +++ b/examples/keras-tract-tf2/ci.sh @@ -7,7 +7,7 @@ sudo apt-get update # Install required libraries # sudo apt-get install -y libgl1-mesa-glx libegl1-mesa libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6 python3 python3-venv -sudo apt-get install -y libegl1-mesa libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6 python3 python3-venv +sudo apt-get install -y libegl1-mesa libxrandr2 libxss1 libxcursor1 libxcomposite1 libxi6 libxtst6 python3 python3-venv python3 -m venv venv . venv/bin/activate From d56a18968f54845d61a46f290f132157116563b8 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Fri, 10 Jan 2025 15:48:29 +0100 Subject: [PATCH 3/7] tweak more more --- examples/keras-tract-tf2/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/keras-tract-tf2/ci.sh b/examples/keras-tract-tf2/ci.sh index 0ecaa86849..d9aa5f67c5 100755 --- a/examples/keras-tract-tf2/ci.sh +++ b/examples/keras-tract-tf2/ci.sh @@ -7,7 +7,7 @@ sudo apt-get update # Install required libraries # sudo apt-get install -y libgl1-mesa-glx libegl1-mesa libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6 python3 python3-venv -sudo apt-get install -y libegl1-mesa libxrandr2 libxss1 libxcursor1 libxcomposite1 libxi6 libxtst6 python3 python3-venv +sudo apt-get install -y libxrandr2 libxss1 libxcursor1 libxcomposite1 libxi6 libxtst6 python3 python3-venv python3 -m venv venv . venv/bin/activate From d8e06e97ae58f4cc5e49513f0dd863b7d9ff285c Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Fri, 10 Jan 2025 15:53:12 +0100 Subject: [PATCH 4/7] bump tf --- examples/keras-tract-tf2/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/keras-tract-tf2/requirements.txt b/examples/keras-tract-tf2/requirements.txt index 999e8b2aed..1d753b8017 100644 --- a/examples/keras-tract-tf2/requirements.txt +++ b/examples/keras-tract-tf2/requirements.txt @@ -1,4 +1,4 @@ -tensorflow==2.12.1 +tensorflow==2.18.0 numpy==1.24.3 tf2onnx==1.13.0 tract==0.21.6 From e11df01d215b37b109e702ff87086d1f2ebff608 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Fri, 10 Jan 2025 16:04:50 +0100 Subject: [PATCH 5/7] discard this test (depends on unmaintained tf2onxx) --- examples/keras-tract-tf2/{ci.sh => ci.sh.nope} | 0 examples/keras-tract-tf2/requirements.txt | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename examples/keras-tract-tf2/{ci.sh => ci.sh.nope} (100%) diff --git a/examples/keras-tract-tf2/ci.sh b/examples/keras-tract-tf2/ci.sh.nope similarity index 100% rename from examples/keras-tract-tf2/ci.sh rename to examples/keras-tract-tf2/ci.sh.nope diff --git a/examples/keras-tract-tf2/requirements.txt b/examples/keras-tract-tf2/requirements.txt index 1d753b8017..d94d2f1c31 100644 --- a/examples/keras-tract-tf2/requirements.txt +++ b/examples/keras-tract-tf2/requirements.txt @@ -1,4 +1,4 @@ tensorflow==2.18.0 -numpy==1.24.3 -tf2onnx==1.13.0 +numpy==1.26.0 +tf2onnx==1.16.1 tract==0.21.6 From 2013230b61716fe3e309f761a2626b818bd5bf1e Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Mon, 13 Jan 2025 16:04:37 +0100 Subject: [PATCH 6/7] bump tflite --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7132366367..2c44bea4c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -188,7 +188,7 @@ structopt = { version = "0.3", default-features = false } tar = "0.4.37" tempfile = "3.8" tensorflow = "0.17.0" -tflitec = { git = "https://github.com/kali/tflitec-rs.git", rev="b37d65a" } +tflitec = { git = "https://github.com/kali/tflitec-rs.git", rev="9ceb838" } time = "0.3.23" time-macros = "0.2.10" tokenizers = "0.19" From 81473e9d31961c4c041b90d2a3339e869aeb00a5 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Mon, 13 Jan 2025 16:19:57 +0100 Subject: [PATCH 7/7] clip --- nnef/src/framework.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nnef/src/framework.rs b/nnef/src/framework.rs index 1478b8a3c7..69177abf94 100644 --- a/nnef/src/framework.rs +++ b/nnef/src/framework.rs @@ -357,7 +357,7 @@ fn proto_model_from_resources( r.into_iter().partition(|(k, _v)| k.starts_with(&it)); let submodel_resources = submodel_resources .into_iter() - .map(|(k, v)| (k.split('/').last().unwrap().to_string(), v)) + .map(|(k, v)| (k.split('/').next_back().unwrap().to_string(), v)) .collect::>>(); let typed_model = nnef() .model_for_proto_model(&proto_model_from_resources(submodel_resources).unwrap())?;