Tf v2.4.1 #44

jasonahills · 2021-04-26T16:27:59Z

Updates tensorflow submodule to v2.4.1 tag so that we can have more supported operations.

Updates dependencies (and weakens version requirements).

jasonahills · 2021-04-26T16:29:22Z

Once boncheolgu/tflite-rs-downloads#2 gets merged, we'll want to update the submodule to use the merge commit.

jasonahills · 2021-04-26T16:30:29Z

Also, I should note that I'm seeing some warnings on the c++ side of things. How would you like me to handle them?

warning: In file included from /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/interpreter.h:31:0,
warning:                  from src/interpreter/mod.rs:19:
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h: In member function ‘virtual void tflite::Profiler::EndEvent(uint32_t, int64_t, int64_t)’:
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h:73:34: warning: unused parameter ‘event_handle’ [-Wunused-parameter]
warning:    virtual void EndEvent(uint32_t event_handle, int64_t event_metadata1,
warning:                                   ^~~~~~~~~~~~
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h:73:56: warning: unused parameter ‘event_metadata1’ [-Wunused-parameter]
warning:    virtual void EndEvent(uint32_t event_handle, int64_t event_metadata1,
warning:                                                         ^~~~~~~~~~~~~~~
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h:74:33: warning: unused parameter ‘event_metadata2’ [-Wunused-parameter]
warning:                          int64_t event_metadata2) {}
warning:                                  ^~~~~~~~~~~~~~~
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h: In member function ‘virtual void tflite::Profiler::AddEvent(const char*, tflite::Profiler::EventType, uint64_t, uint64_t, int64_t, int64_t)’:
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h:91:37: warning: unused parameter ‘tag’ [-Wunused-parameter]
warning:    virtual void AddEvent(const char* tag, EventType event_type, uint64_t start,
warning:                                      ^~~
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h:91:52: warning: unused parameter ‘event_type’ [-Wunused-parameter]
warning:    virtual void AddEvent(const char* tag, EventType event_type, uint64_t start,
warning:                                                     ^~~~~~~~~~
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h:91:73: warning: unused parameter ‘start’ [-Wunused-parameter]
warning:    virtual void AddEvent(const char* tag, EventType event_type, uint64_t start,
warning:                                                                          ^~~~~
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h:92:34: warning: unused parameter ‘end’ [-Wunused-parameter]
warning:                          uint64_t end, int64_t event_metadata1,
warning:                                   ^~~
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h:92:47: warning: unused parameter ‘event_metadata1’ [-Wunused-parameter]
warning:                          uint64_t end, int64_t event_metadata1,
warning:                                                ^~~~~~~~~~~~~~~
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/profiler.h:93:33: warning: unused parameter ‘event_metadata2’ [-Wunused-parameter]
warning:                          int64_t event_metadata2) {}
warning:                                  ^~~~~~~~~~~~~~~
warning: In file included from /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/interpreter.h:32:0,
warning:                  from src/interpreter/mod.rs:19:
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/subgraph.h: In member function ‘virtual uint32_t tflite::Subgraph::SubgraphAwareProfiler::BeginEvent(const char*, tflite::Profiler::EventType, int64_t, int64_t)’:
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/subgraph.h:365:33: warning: unused parameter ‘event_metadata2’ [-Wunused-parameter]
warning:                          int64_t event_metadata2) override {
warning:                                  ^~~~~~~~~~~~~~~
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/subgraph.h: In member function ‘virtual void tflite::Subgraph::SubgraphAwareProfiler::AddEvent(const char*, tflite::Profiler::EventType, uint64_t, uint64_t, int64_t, int64_t)’:
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/subgraph.h:384:27: warning: unused parameter ‘event_metadata2’ [-Wunused-parameter]
warning:                    int64_t event_metadata2) override {
warning:                            ^~~~~~~~~~~~~~~
warning: In file included from /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/interpreter_builder.h:25:0,
warning:                  from /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/model.h:21,
warning:                  from src/interpreter/builder.rs:10:
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/op_resolver.h: In member function ‘virtual tflite::OpResolver::TfLiteDelegatePtrVector tflite::OpResolver::GetDelegates(int) const’:
warning: /target/package/tflite-0.10.0/submodules/tensorflow/tensorflow/lite/core/api/op_resolver.h:43:52: warning: unused parameter ‘num_threads’ [-Wunused-parameter]
warning:    virtual TfLiteDelegatePtrVector GetDelegates(int num_threads) const {
warning:

tylerhawkes · 2021-04-26T16:33:04Z

Cargo.toml

@@ -20,19 +20,31 @@ include = [
  "data/",
  "csrc/",
  "src/",
-  "submodules/downloads",
+  "submodules/downloads/ruy",


If there are things in downloads that we don't need, we should drop them in the script, and keep this simple.

tylerhawkes · 2021-04-26T16:34:42Z

src/model/builtin_options_impl.rs

@@ -1,3 +1,4 @@
+
 use super::{BuiltinOptions, BuiltinOptionsUnion, NativeTable};


Looks like this file had rustfmt run on it and that's why there's all the changes.

The changes in these _impl files come from when we run with the generate_model_apis feature on.

tylerhawkes · 2021-04-26T16:36:54Z

src/model/stl/vector_impl.rs

@@ -1,10 +1,11 @@
-use std::ops::{Deref, DerefMut, Index, IndexMut};


rustfmt changes

These changes come from building with the generate_model_apis feature on.

tylerhawkes · 2021-04-26T16:37:25Z

src/model/stl/memory_impl.rs

@@ -1,5 +1,6 @@
-use std::ops::{Deref, DerefMut};


rustfmt changes

These changes come from building with the generate_model_apis feature on.

jasonahills · 2021-04-26T16:52:04Z

I see that the Jenkins builders have failed. It looks like I'll need to be less aggressive in the files that I remove to get the package size under the 10mb crates.io limit.

jasonahills · 2021-04-26T19:10:03Z

Cargo.toml

-maybe-owned = "0.3.4"
-thiserror = "1.0.20"
+cpp = "0.5"
+libc = "0.2"


Loosening these dependencies because we can rely upon semver for them.

…removing target .inc files now that tensorflow has them

…e been happening

…o namespace issues

…he interpreter mod.

Michael-F-Bryan · 2021-05-16T23:13:23Z

We were running into some issues where the TensorFlow Lite model we've been provided is too new for tflite to use (""ERROR: Op builtin_code out of range: 127").

@jasonahills and @tylerhawkes, is there anything I can do to help push this PR through?

tylerhawkes · 2021-05-17T17:45:25Z

We still need to port all of the model code over to get it mergeable. As you can see, we've moved all of the inference code to using cxx and it all works great. The code to inspect and build models segfaults so it needs to use cxx as well and it's got the largest api surface area. Anything you can do on that would help out a lot. I can give you access to our branch if that will help out or you can make pull requests to our branch. We also have this published on cloudsmith. You'll need to add registries.vivint-public = { index = "https://dl.cloudsmith.io/public/vivint/public/cargo/index.git" } to your cargo config and add registry = "vivint-public" to the tflite dependency in Cargo.toml if you want to use that and all you need is the inference code.

jasonahills added 2 commits April 23, 2021 15:36

updates to tensorflow 2.4.1

ba65e20

updates generated impls, reduces package size to under 10mb

c84ef74

tylerhawkes reviewed Apr 26, 2021

View reviewed changes

adds headers to package

9d91f41

jasonahills commented Apr 26, 2021

View reviewed changes

jasonahills and others added 14 commits April 26, 2021 15:18

pruned too much; restoring

f41afa5

Fixing warnings for all feature combinations, upgrading bindgen, and …

c09d599

…removing target .inc files now that tensorflow has them

Adding necessary features to bindgen

620fe2c

Another try at getting just the right files packaged up

4caebec

Actually removing unneeded test files from downloads

9a58843

Fixing submodules in hopes that we're not using the wrong checkout...

eb98942

Working minimum build, hopefully

3d83d99

Hopefully fixing Eigen/Core issue finally

4d4e92c

Fixing makefile reference for debug build

6113290

Trying to get all the types to line up to fix the seg faults that hav…

69eabfd

…e been happening

Saving place. Have cxx compiling but not working with rust code due t…

d8357e8

…o namespace issues

Tests compile and mostly work. All cpp has been replaced by cxx for t…

38a4a6f

…he interpreter mod.

Cleaning up clippy lints and making the model apis optional

245fa47

Fixing aarch64 build and tests for cross-compilation test running

d94649b

Michael-F-Bryan mentioned this pull request May 16, 2021

Update the version of TensorFlow Lite being used hotg-ai/rune#155

Closed

Adding send/sync implementations

59894c2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tf v2.4.1 #44

Tf v2.4.1 #44

jasonahills commented Apr 26, 2021

jasonahills commented Apr 26, 2021

jasonahills commented Apr 26, 2021

tylerhawkes Apr 26, 2021

tylerhawkes Apr 26, 2021

jasonahills Apr 26, 2021

tylerhawkes Apr 26, 2021

jasonahills Apr 26, 2021

tylerhawkes Apr 26, 2021

jasonahills Apr 26, 2021

jasonahills commented Apr 26, 2021

jasonahills Apr 26, 2021

Michael-F-Bryan commented May 16, 2021

tylerhawkes commented May 17, 2021

		@@ -1,3 +1,4 @@

		use super::{BuiltinOptions, BuiltinOptionsUnion, NativeTable};

		@@ -1,10 +1,11 @@
		use std::ops::{Deref, DerefMut, Index, IndexMut};

Tf v2.4.1 #44

Are you sure you want to change the base?

Tf v2.4.1 #44

Conversation

jasonahills commented Apr 26, 2021

jasonahills commented Apr 26, 2021

jasonahills commented Apr 26, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jasonahills commented Apr 26, 2021

Choose a reason for hiding this comment

Michael-F-Bryan commented May 16, 2021

tylerhawkes commented May 17, 2021