Skip to content

fix bitrot in example tflite module #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 16, 2024
Merged

fix bitrot in example tflite module #214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27bd2d4
fix bitrot in example tflite module
acmorrow Feb 16, 2024
db6ab0c
format
acmorrow Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/viam/examples/modules/tflite/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class MLModelServiceTFLite : public vsdk::MLModelService, public vsdk::Stoppable
void stop() noexcept {
using std::swap;
try {
std::lock_guard<std::mutex> lock(state_lock_);
const std::lock_guard<std::mutex> lock(state_lock_);
if (!stopped_) {
stopped_ = true;
std::shared_ptr<state> state;
Expand All @@ -93,8 +93,8 @@ class MLModelServiceTFLite : public vsdk::MLModelService, public vsdk::Stoppable
}
}

void reconfigure(vsdk::Dependencies dependencies, vsdk::ResourceConfig configuration) final
try {
void reconfigure(const vsdk::Dependencies& dependencies,
const vsdk::ResourceConfig& configuration) final try {
// Care needs to be taken during reconfiguration. The
// framework does not offer protection against invocation
// during reconfiguration. Keep all state in a shared_ptr
Expand All @@ -121,7 +121,7 @@ class MLModelServiceTFLite : public vsdk::MLModelService, public vsdk::Stoppable
swap(state_, state);
}

state = reconfigure_(std::move(dependencies), std::move(configuration));
state = reconfigure_(dependencies, configuration);

// Reconfiguration worked: put the state in under the lock,
// release the lock, and then notify any callers waiting on
Expand All @@ -140,7 +140,7 @@ class MLModelServiceTFLite : public vsdk::MLModelService, public vsdk::Stoppable

std::shared_ptr<named_tensor_views> infer(const named_tensor_views& inputs,
const vsdk::AttributeMap& extra) final {
const auto state = lease_state_();
auto state = lease_state_();

// We serialize access to the interpreter. We use a
// unique_lock because we will move the lock into the shared
Expand Down Expand Up @@ -244,6 +244,7 @@ class MLModelServiceTFLite : public vsdk::MLModelService, public vsdk::Stoppable
// inference_result object is destroyed, the lock will be
// released and the next caller can invoke the interpreter.
auto* const views = &inference_result->views;
// NOLINTNEXTLINE(performance-move-const-arg): C++20
return {std::move(inference_result), views};
}

Expand Down Expand Up @@ -359,7 +360,7 @@ class MLModelServiceTFLite : public vsdk::MLModelService, public vsdk::Stoppable
// buffer which we can use with `TfLiteModelCreate`. That
// still requires that the buffer be kept valid, but that's
// more easily done.
std::ifstream in(*model_path_string, std::ios::in | std::ios::binary);
const std::ifstream in(*model_path_string, std::ios::in | std::ios::binary);
if (!in) {
std::ostringstream buffer;
buffer << service_name << ": Failed to open file for `model_path` "
Expand Down