[flatbuffers] Update to flatbuffers v23.5.26#39

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

Closed
dbort wants to merge 2 commits into from
Closed

[flatbuffers] Update to flatbuffers v23.5.26 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce03799
[executorch] Remove flatbuffer forward declarations from method.h
dbort Aug 5, 2023
ecab427
[flatbuffers] Update to flatbuffers v23.5.26
dbort Aug 5, 2023
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
40 changes: 20 additions & 20 deletions runtime/executor/method.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,11 +257,19 @@ bool parse_cond_value(const EValue& cond_value) {

} // namespace

Error Method::parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* flatbuffer_values,
size_t* num_parsed) {
for (size_t i = 0; i < n_value_; ++i) {
Error Method::parse_values() {
auto flatbuffer_values = serialization_plan_->values();
ET_CHECK(flatbuffer_values != nullptr);
size_t n_value = flatbuffer_values->size();
values_ = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
memory_manager_->get_runtime_allocator(), EValue, n_value);

// n_value_ counts the number of successfully-initialized values for ~Method()
// to clean up, and is incremented at the bottom of the loop. This makes it
// safe for errors to return without updating any state.
n_value_ = 0;

for (size_t i = 0; i < n_value; ++i) {
auto serialization_value = flatbuffer_values->Get(i);
switch (serialization_value->val_type()) {
case executorch_flatbuffer::KernelTypes::Null: {
Expand DownExpand Up@@ -329,7 +337,6 @@ Error Method::parse_values(
"Failed parsing tensor at index %zu: %" PRIu32,
i,
t.error());
*num_parsed = i;
return t.error();
}
new (&values_[i]) EValue(t.get());
Expand All@@ -347,7 +354,6 @@ Error Method::parse_values(
"Failed parsing tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -365,7 +371,6 @@ Error Method::parse_values(
"Failed parsing optional tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -383,8 +388,12 @@ Error Method::parse_values(
"to see which type this is.",
static_cast<uint32_t>(serialization_value->val_type()) - 1);
}

// ~Method() will try to clean up n_value_ entries in the values_ array.
// Only increment this once we know the entry is valid, so that we don't try
// to clean up an uninitialized entry.
n_value_ = i + 1;
}
*num_parsed = n_value_;
return Error::Ok;
}

Expand DownExpand Up@@ -502,18 +511,9 @@ Error Method::init(executorch_flatbuffer::ExecutionPlan* s_plan) {
auto runtime_allocator = memory_manager_->get_runtime_allocator();

{
// Load values
auto plan_values = serialization_plan_->values();
ET_CHECK(plan_values != nullptr);
n_value_ = plan_values->size();
values_ =
ET_ALLOCATE_LIST_OR_RETURN_ERROR(runtime_allocator, EValue, n_value_);
size_t num_parsed;
Error err = parse_values(plan_values, &num_parsed);
// Parse the elements of the values_ array.
Error err = parse_values();
if (err != Error::Ok) {
// ~Method() will try to clean up entries in this list. Ensure that it
// doesn't look at any uninitialized entries.
n_value_ = num_parsed;
return err;
}
}
Expand Down
16 changes: 4 additions & 12 deletions runtime/executor/method.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,6 @@

// Forward declare flatbuffer types. This is a public header and must not
// include the generated flatbuffer header.
namespace flatbuffers {
template <typename T>
class Vector;
template <typename T>
struct Offset;
} // namespace flatbuffers
namespace executorch_flatbuffer {
struct Chain;
struct ExecutionPlan;
Expand DownExpand Up@@ -262,13 +256,11 @@ class Method final {
bool pre_allocated_input_;

/**
* Initialize the EValue table of the program. *num_parsed is the number
* of elements actually parsed, which may be less than n_value_ on failure.
* Parses the elements of the values_ array. On error, n_value_ will be set to
* the number of successfully-initialized entries so that ~Method doesn't try
* to clean up uninitialized entries.
*/
__ET_NODISCARD Error parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* fb_values,
size_t* num_parsed);
__ET_NODISCARD Error parse_values();

__ET_NODISCARD Error resolve_operator(
int32_t op_index,
Expand Down
18 changes: 14 additions & 4 deletions third-party/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,36 +165,46 @@ runtime.cxx_binary(
"flatbuffers/grpc/src/compiler/python_generator.cc",
"flatbuffers/grpc/src/compiler/swift_generator.cc",
"flatbuffers/grpc/src/compiler/ts_generator.cc",
"flatbuffers/src/annotated_binary_text_gen.cpp",
"flatbuffers/src/bfbs_gen_lua.cpp",
"flatbuffers/src/bfbs_gen_nim.cpp",
"flatbuffers/src/binary_annotator.cpp",
"flatbuffers/src/code_generators.cpp",
"flatbuffers/src/file_binary_writer.cpp",
"flatbuffers/src/file_name_saving_file_manager.cpp",
"flatbuffers/src/file_writer.cpp",
"flatbuffers/src/flatc.cpp",
"flatbuffers/src/flatc_main.cpp",
"flatbuffers/src/idl_gen_binary.cpp",
"flatbuffers/src/idl_gen_cpp.cpp",
"flatbuffers/src/idl_gen_csharp.cpp",
"flatbuffers/src/idl_gen_dart.cpp",
"flatbuffers/src/idl_gen_fbs.cpp",
"flatbuffers/src/idl_gen_go.cpp",
"flatbuffers/src/idl_gen_grpc.cpp",
"flatbuffers/src/idl_gen_java.cpp",
"flatbuffers/src/idl_gen_js_ts.cpp",
"flatbuffers/src/idl_gen_json_schema.cpp",
"flatbuffers/src/idl_gen_kotlin.cpp",
"flatbuffers/src/idl_gen_lobster.cpp",
"flatbuffers/src/idl_gen_lua.cpp",
"flatbuffers/src/idl_gen_php.cpp",
"flatbuffers/src/idl_gen_python.cpp",
"flatbuffers/src/idl_gen_rust.cpp",
"flatbuffers/src/idl_gen_swift.cpp",
"flatbuffers/src/idl_gen_text.cpp",
"flatbuffers/src/idl_gen_ts.cpp",
"flatbuffers/src/idl_parser.cpp",
"flatbuffers/src/reflection.cpp",
"flatbuffers/src/util.cpp",
],
include_directories = [
"flatbuffers/grpc",
"flatbuffers/include",
],
raw_headers = [
"flatbuffers/grpc/src/compiler/config.h",
"flatbuffers/grpc/src/compiler/cpp_generator.h",
"flatbuffers/grpc/src/compiler/go_generator.h",
"flatbuffers/grpc/src/compiler/java_generator.h",
"flatbuffers/grpc/src/compiler/python_generator.h",
"flatbuffers/grpc/src/compiler/python_private_generator.h",
"flatbuffers/grpc/src/compiler/schema_interface.h",
"flatbuffers/grpc/src/compiler/swift_generator.h",
"flatbuffers/grpc/src/compiler/ts_generator.h",
Expand Down
2 changes: 1 addition & 1 deletion third-party/flatbuffers
Open in desktop
Submodule flatbuffers updated 1636 files
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[flatbuffers] Update to flatbuffers v23.5.26#39

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

Closed
dbort wants to merge 2 commits into from
Closed

[flatbuffers] Update to flatbuffers v23.5.26 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce03799
[executorch] Remove flatbuffer forward declarations from method.h
dbort Aug 5, 2023
ecab427
[flatbuffers] Update to flatbuffers v23.5.26
dbort Aug 5, 2023
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
40 changes: 20 additions & 20 deletions runtime/executor/method.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,11 +257,19 @@ bool parse_cond_value(const EValue& cond_value) {

} // namespace

Error Method::parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* flatbuffer_values,
size_t* num_parsed) {
for (size_t i = 0; i < n_value_; ++i) {
Error Method::parse_values() {
auto flatbuffer_values = serialization_plan_->values();
ET_CHECK(flatbuffer_values != nullptr);
size_t n_value = flatbuffer_values->size();
values_ = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
memory_manager_->get_runtime_allocator(), EValue, n_value);

// n_value_ counts the number of successfully-initialized values for ~Method()
// to clean up, and is incremented at the bottom of the loop. This makes it
// safe for errors to return without updating any state.
n_value_ = 0;

for (size_t i = 0; i < n_value; ++i) {
auto serialization_value = flatbuffer_values->Get(i);
switch (serialization_value->val_type()) {
case executorch_flatbuffer::KernelTypes::Null: {
Expand DownExpand Up@@ -329,7 +337,6 @@ Error Method::parse_values(
"Failed parsing tensor at index %zu: %" PRIu32,
i,
t.error());
*num_parsed = i;
return t.error();
}
new (&values_[i]) EValue(t.get());
Expand All@@ -347,7 +354,6 @@ Error Method::parse_values(
"Failed parsing tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -365,7 +371,6 @@ Error Method::parse_values(
"Failed parsing optional tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -383,8 +388,12 @@ Error Method::parse_values(
"to see which type this is.",
static_cast<uint32_t>(serialization_value->val_type()) - 1);
}

// ~Method() will try to clean up n_value_ entries in the values_ array.
// Only increment this once we know the entry is valid, so that we don't try
// to clean up an uninitialized entry.
n_value_ = i + 1;
}
*num_parsed = n_value_;
return Error::Ok;
}

Expand DownExpand Up@@ -502,18 +511,9 @@ Error Method::init(executorch_flatbuffer::ExecutionPlan* s_plan) {
auto runtime_allocator = memory_manager_->get_runtime_allocator();

{
// Load values
auto plan_values = serialization_plan_->values();
ET_CHECK(plan_values != nullptr);
n_value_ = plan_values->size();
values_ =
ET_ALLOCATE_LIST_OR_RETURN_ERROR(runtime_allocator, EValue, n_value_);
size_t num_parsed;
Error err = parse_values(plan_values, &num_parsed);
// Parse the elements of the values_ array.
Error err = parse_values();
if (err != Error::Ok) {
// ~Method() will try to clean up entries in this list. Ensure that it
// doesn't look at any uninitialized entries.
n_value_ = num_parsed;
return err;
}
}
Expand Down
16 changes: 4 additions & 12 deletions runtime/executor/method.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,6 @@

// Forward declare flatbuffer types. This is a public header and must not
// include the generated flatbuffer header.
namespace flatbuffers {
template <typename T>
class Vector;
template <typename T>
struct Offset;
} // namespace flatbuffers
namespace executorch_flatbuffer {
struct Chain;
struct ExecutionPlan;
Expand DownExpand Up@@ -262,13 +256,11 @@ class Method final {
bool pre_allocated_input_;

/**
* Initialize the EValue table of the program. *num_parsed is the number
* of elements actually parsed, which may be less than n_value_ on failure.
* Parses the elements of the values_ array. On error, n_value_ will be set to
* the number of successfully-initialized entries so that ~Method doesn't try
* to clean up uninitialized entries.
*/
__ET_NODISCARD Error parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* fb_values,
size_t* num_parsed);
__ET_NODISCARD Error parse_values();

__ET_NODISCARD Error resolve_operator(
int32_t op_index,
Expand Down
18 changes: 14 additions & 4 deletions third-party/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,36 +165,46 @@ runtime.cxx_binary(
"flatbuffers/grpc/src/compiler/python_generator.cc",
"flatbuffers/grpc/src/compiler/swift_generator.cc",
"flatbuffers/grpc/src/compiler/ts_generator.cc",
"flatbuffers/src/annotated_binary_text_gen.cpp",
"flatbuffers/src/bfbs_gen_lua.cpp",
"flatbuffers/src/bfbs_gen_nim.cpp",
"flatbuffers/src/binary_annotator.cpp",
"flatbuffers/src/code_generators.cpp",
"flatbuffers/src/file_binary_writer.cpp",
"flatbuffers/src/file_name_saving_file_manager.cpp",
"flatbuffers/src/file_writer.cpp",
"flatbuffers/src/flatc.cpp",
"flatbuffers/src/flatc_main.cpp",
"flatbuffers/src/idl_gen_binary.cpp",
"flatbuffers/src/idl_gen_cpp.cpp",
"flatbuffers/src/idl_gen_csharp.cpp",
"flatbuffers/src/idl_gen_dart.cpp",
"flatbuffers/src/idl_gen_fbs.cpp",
"flatbuffers/src/idl_gen_go.cpp",
"flatbuffers/src/idl_gen_grpc.cpp",
"flatbuffers/src/idl_gen_java.cpp",
"flatbuffers/src/idl_gen_js_ts.cpp",
"flatbuffers/src/idl_gen_json_schema.cpp",
"flatbuffers/src/idl_gen_kotlin.cpp",
"flatbuffers/src/idl_gen_lobster.cpp",
"flatbuffers/src/idl_gen_lua.cpp",
"flatbuffers/src/idl_gen_php.cpp",
"flatbuffers/src/idl_gen_python.cpp",
"flatbuffers/src/idl_gen_rust.cpp",
"flatbuffers/src/idl_gen_swift.cpp",
"flatbuffers/src/idl_gen_text.cpp",
"flatbuffers/src/idl_gen_ts.cpp",
"flatbuffers/src/idl_parser.cpp",
"flatbuffers/src/reflection.cpp",
"flatbuffers/src/util.cpp",
],
include_directories = [
"flatbuffers/grpc",
"flatbuffers/include",
],
raw_headers = [
"flatbuffers/grpc/src/compiler/config.h",
"flatbuffers/grpc/src/compiler/cpp_generator.h",
"flatbuffers/grpc/src/compiler/go_generator.h",
"flatbuffers/grpc/src/compiler/java_generator.h",
"flatbuffers/grpc/src/compiler/python_generator.h",
"flatbuffers/grpc/src/compiler/python_private_generator.h",
"flatbuffers/grpc/src/compiler/schema_interface.h",
"flatbuffers/grpc/src/compiler/swift_generator.h",
"flatbuffers/grpc/src/compiler/ts_generator.h",
Expand Down
2 changes: 1 addition & 1 deletion third-party/flatbuffers
Open in desktop
Submodule flatbuffers updated 1636 files
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[flatbuffers] Update to flatbuffers v23.5.26#39

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

Closed
dbort wants to merge 2 commits into from
Closed

[flatbuffers] Update to flatbuffers v23.5.26 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce03799
[executorch] Remove flatbuffer forward declarations from method.h
dbort Aug 5, 2023
ecab427
[flatbuffers] Update to flatbuffers v23.5.26
dbort Aug 5, 2023
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
40 changes: 20 additions & 20 deletions runtime/executor/method.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,11 +257,19 @@ bool parse_cond_value(const EValue& cond_value) {

} // namespace

Error Method::parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* flatbuffer_values,
size_t* num_parsed) {
for (size_t i = 0; i < n_value_; ++i) {
Error Method::parse_values() {
auto flatbuffer_values = serialization_plan_->values();
ET_CHECK(flatbuffer_values != nullptr);
size_t n_value = flatbuffer_values->size();
values_ = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
memory_manager_->get_runtime_allocator(), EValue, n_value);

// n_value_ counts the number of successfully-initialized values for ~Method()
// to clean up, and is incremented at the bottom of the loop. This makes it
// safe for errors to return without updating any state.
n_value_ = 0;

for (size_t i = 0; i < n_value; ++i) {
auto serialization_value = flatbuffer_values->Get(i);
switch (serialization_value->val_type()) {
case executorch_flatbuffer::KernelTypes::Null: {
Expand DownExpand Up@@ -329,7 +337,6 @@ Error Method::parse_values(
"Failed parsing tensor at index %zu: %" PRIu32,
i,
t.error());
*num_parsed = i;
return t.error();
}
new (&values_[i]) EValue(t.get());
Expand All@@ -347,7 +354,6 @@ Error Method::parse_values(
"Failed parsing tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -365,7 +371,6 @@ Error Method::parse_values(
"Failed parsing optional tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -383,8 +388,12 @@ Error Method::parse_values(
"to see which type this is.",
static_cast<uint32_t>(serialization_value->val_type()) - 1);
}

// ~Method() will try to clean up n_value_ entries in the values_ array.
// Only increment this once we know the entry is valid, so that we don't try
// to clean up an uninitialized entry.
n_value_ = i + 1;
}
*num_parsed = n_value_;
return Error::Ok;
}

Expand DownExpand Up@@ -502,18 +511,9 @@ Error Method::init(executorch_flatbuffer::ExecutionPlan* s_plan) {
auto runtime_allocator = memory_manager_->get_runtime_allocator();

{
// Load values
auto plan_values = serialization_plan_->values();
ET_CHECK(plan_values != nullptr);
n_value_ = plan_values->size();
values_ =
ET_ALLOCATE_LIST_OR_RETURN_ERROR(runtime_allocator, EValue, n_value_);
size_t num_parsed;
Error err = parse_values(plan_values, &num_parsed);
// Parse the elements of the values_ array.
Error err = parse_values();
if (err != Error::Ok) {
// ~Method() will try to clean up entries in this list. Ensure that it
// doesn't look at any uninitialized entries.
n_value_ = num_parsed;
return err;
}
}
Expand Down
16 changes: 4 additions & 12 deletions runtime/executor/method.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,6 @@

// Forward declare flatbuffer types. This is a public header and must not
// include the generated flatbuffer header.
namespace flatbuffers {
template <typename T>
class Vector;
template <typename T>
struct Offset;
} // namespace flatbuffers
namespace executorch_flatbuffer {
struct Chain;
struct ExecutionPlan;
Expand DownExpand Up@@ -262,13 +256,11 @@ class Method final {
bool pre_allocated_input_;

/**
* Initialize the EValue table of the program. *num_parsed is the number
* of elements actually parsed, which may be less than n_value_ on failure.
* Parses the elements of the values_ array. On error, n_value_ will be set to
* the number of successfully-initialized entries so that ~Method doesn't try
* to clean up uninitialized entries.
*/
__ET_NODISCARD Error parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* fb_values,
size_t* num_parsed);
__ET_NODISCARD Error parse_values();

__ET_NODISCARD Error resolve_operator(
int32_t op_index,
Expand Down
18 changes: 14 additions & 4 deletions third-party/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,36 +165,46 @@ runtime.cxx_binary(
"flatbuffers/grpc/src/compiler/python_generator.cc",
"flatbuffers/grpc/src/compiler/swift_generator.cc",
"flatbuffers/grpc/src/compiler/ts_generator.cc",
"flatbuffers/src/annotated_binary_text_gen.cpp",
"flatbuffers/src/bfbs_gen_lua.cpp",
"flatbuffers/src/bfbs_gen_nim.cpp",
"flatbuffers/src/binary_annotator.cpp",
"flatbuffers/src/code_generators.cpp",
"flatbuffers/src/file_binary_writer.cpp",
"flatbuffers/src/file_name_saving_file_manager.cpp",
"flatbuffers/src/file_writer.cpp",
"flatbuffers/src/flatc.cpp",
"flatbuffers/src/flatc_main.cpp",
"flatbuffers/src/idl_gen_binary.cpp",
"flatbuffers/src/idl_gen_cpp.cpp",
"flatbuffers/src/idl_gen_csharp.cpp",
"flatbuffers/src/idl_gen_dart.cpp",
"flatbuffers/src/idl_gen_fbs.cpp",
"flatbuffers/src/idl_gen_go.cpp",
"flatbuffers/src/idl_gen_grpc.cpp",
"flatbuffers/src/idl_gen_java.cpp",
"flatbuffers/src/idl_gen_js_ts.cpp",
"flatbuffers/src/idl_gen_json_schema.cpp",
"flatbuffers/src/idl_gen_kotlin.cpp",
"flatbuffers/src/idl_gen_lobster.cpp",
"flatbuffers/src/idl_gen_lua.cpp",
"flatbuffers/src/idl_gen_php.cpp",
"flatbuffers/src/idl_gen_python.cpp",
"flatbuffers/src/idl_gen_rust.cpp",
"flatbuffers/src/idl_gen_swift.cpp",
"flatbuffers/src/idl_gen_text.cpp",
"flatbuffers/src/idl_gen_ts.cpp",
"flatbuffers/src/idl_parser.cpp",
"flatbuffers/src/reflection.cpp",
"flatbuffers/src/util.cpp",
],
include_directories = [
"flatbuffers/grpc",
"flatbuffers/include",
],
raw_headers = [
"flatbuffers/grpc/src/compiler/config.h",
"flatbuffers/grpc/src/compiler/cpp_generator.h",
"flatbuffers/grpc/src/compiler/go_generator.h",
"flatbuffers/grpc/src/compiler/java_generator.h",
"flatbuffers/grpc/src/compiler/python_generator.h",
"flatbuffers/grpc/src/compiler/python_private_generator.h",
"flatbuffers/grpc/src/compiler/schema_interface.h",
"flatbuffers/grpc/src/compiler/swift_generator.h",
"flatbuffers/grpc/src/compiler/ts_generator.h",
Expand Down
2 changes: 1 addition & 1 deletion third-party/flatbuffers
Open in desktop
Submodule flatbuffers updated 1636 files
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[flatbuffers] Update to flatbuffers v23.5.26#39

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

Closed
dbort wants to merge 2 commits into from
Closed

[flatbuffers] Update to flatbuffers v23.5.26 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce03799
[executorch] Remove flatbuffer forward declarations from method.h
dbort Aug 5, 2023
ecab427
[flatbuffers] Update to flatbuffers v23.5.26
dbort Aug 5, 2023
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
40 changes: 20 additions & 20 deletions runtime/executor/method.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,11 +257,19 @@ bool parse_cond_value(const EValue& cond_value) {

} // namespace

Error Method::parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* flatbuffer_values,
size_t* num_parsed) {
for (size_t i = 0; i < n_value_; ++i) {
Error Method::parse_values() {
auto flatbuffer_values = serialization_plan_->values();
ET_CHECK(flatbuffer_values != nullptr);
size_t n_value = flatbuffer_values->size();
values_ = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
memory_manager_->get_runtime_allocator(), EValue, n_value);

// n_value_ counts the number of successfully-initialized values for ~Method()
// to clean up, and is incremented at the bottom of the loop. This makes it
// safe for errors to return without updating any state.
n_value_ = 0;

for (size_t i = 0; i < n_value; ++i) {
auto serialization_value = flatbuffer_values->Get(i);
switch (serialization_value->val_type()) {
case executorch_flatbuffer::KernelTypes::Null: {
Expand DownExpand Up@@ -329,7 +337,6 @@ Error Method::parse_values(
"Failed parsing tensor at index %zu: %" PRIu32,
i,
t.error());
*num_parsed = i;
return t.error();
}
new (&values_[i]) EValue(t.get());
Expand All@@ -347,7 +354,6 @@ Error Method::parse_values(
"Failed parsing tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -365,7 +371,6 @@ Error Method::parse_values(
"Failed parsing optional tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -383,8 +388,12 @@ Error Method::parse_values(
"to see which type this is.",
static_cast<uint32_t>(serialization_value->val_type()) - 1);
}

// ~Method() will try to clean up n_value_ entries in the values_ array.
// Only increment this once we know the entry is valid, so that we don't try
// to clean up an uninitialized entry.
n_value_ = i + 1;
}
*num_parsed = n_value_;
return Error::Ok;
}

Expand DownExpand Up@@ -502,18 +511,9 @@ Error Method::init(executorch_flatbuffer::ExecutionPlan* s_plan) {
auto runtime_allocator = memory_manager_->get_runtime_allocator();

{
// Load values
auto plan_values = serialization_plan_->values();
ET_CHECK(plan_values != nullptr);
n_value_ = plan_values->size();
values_ =
ET_ALLOCATE_LIST_OR_RETURN_ERROR(runtime_allocator, EValue, n_value_);
size_t num_parsed;
Error err = parse_values(plan_values, &num_parsed);
// Parse the elements of the values_ array.
Error err = parse_values();
if (err != Error::Ok) {
// ~Method() will try to clean up entries in this list. Ensure that it
// doesn't look at any uninitialized entries.
n_value_ = num_parsed;
return err;
}
}
Expand Down
16 changes: 4 additions & 12 deletions runtime/executor/method.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,6 @@

// Forward declare flatbuffer types. This is a public header and must not
// include the generated flatbuffer header.
namespace flatbuffers {
template <typename T>
class Vector;
template <typename T>
struct Offset;
} // namespace flatbuffers
namespace executorch_flatbuffer {
struct Chain;
struct ExecutionPlan;
Expand DownExpand Up@@ -262,13 +256,11 @@ class Method final {
bool pre_allocated_input_;

/**
* Initialize the EValue table of the program. *num_parsed is the number
* of elements actually parsed, which may be less than n_value_ on failure.
* Parses the elements of the values_ array. On error, n_value_ will be set to
* the number of successfully-initialized entries so that ~Method doesn't try
* to clean up uninitialized entries.
*/
__ET_NODISCARD Error parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* fb_values,
size_t* num_parsed);
__ET_NODISCARD Error parse_values();

__ET_NODISCARD Error resolve_operator(
int32_t op_index,
Expand Down
18 changes: 14 additions & 4 deletions third-party/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,36 +165,46 @@ runtime.cxx_binary(
"flatbuffers/grpc/src/compiler/python_generator.cc",
"flatbuffers/grpc/src/compiler/swift_generator.cc",
"flatbuffers/grpc/src/compiler/ts_generator.cc",
"flatbuffers/src/annotated_binary_text_gen.cpp",
"flatbuffers/src/bfbs_gen_lua.cpp",
"flatbuffers/src/bfbs_gen_nim.cpp",
"flatbuffers/src/binary_annotator.cpp",
"flatbuffers/src/code_generators.cpp",
"flatbuffers/src/file_binary_writer.cpp",
"flatbuffers/src/file_name_saving_file_manager.cpp",
"flatbuffers/src/file_writer.cpp",
"flatbuffers/src/flatc.cpp",
"flatbuffers/src/flatc_main.cpp",
"flatbuffers/src/idl_gen_binary.cpp",
"flatbuffers/src/idl_gen_cpp.cpp",
"flatbuffers/src/idl_gen_csharp.cpp",
"flatbuffers/src/idl_gen_dart.cpp",
"flatbuffers/src/idl_gen_fbs.cpp",
"flatbuffers/src/idl_gen_go.cpp",
"flatbuffers/src/idl_gen_grpc.cpp",
"flatbuffers/src/idl_gen_java.cpp",
"flatbuffers/src/idl_gen_js_ts.cpp",
"flatbuffers/src/idl_gen_json_schema.cpp",
"flatbuffers/src/idl_gen_kotlin.cpp",
"flatbuffers/src/idl_gen_lobster.cpp",
"flatbuffers/src/idl_gen_lua.cpp",
"flatbuffers/src/idl_gen_php.cpp",
"flatbuffers/src/idl_gen_python.cpp",
"flatbuffers/src/idl_gen_rust.cpp",
"flatbuffers/src/idl_gen_swift.cpp",
"flatbuffers/src/idl_gen_text.cpp",
"flatbuffers/src/idl_gen_ts.cpp",
"flatbuffers/src/idl_parser.cpp",
"flatbuffers/src/reflection.cpp",
"flatbuffers/src/util.cpp",
],
include_directories = [
"flatbuffers/grpc",
"flatbuffers/include",
],
raw_headers = [
"flatbuffers/grpc/src/compiler/config.h",
"flatbuffers/grpc/src/compiler/cpp_generator.h",
"flatbuffers/grpc/src/compiler/go_generator.h",
"flatbuffers/grpc/src/compiler/java_generator.h",
"flatbuffers/grpc/src/compiler/python_generator.h",
"flatbuffers/grpc/src/compiler/python_private_generator.h",
"flatbuffers/grpc/src/compiler/schema_interface.h",
"flatbuffers/grpc/src/compiler/swift_generator.h",
"flatbuffers/grpc/src/compiler/ts_generator.h",
Expand Down
2 changes: 1 addition & 1 deletion third-party/flatbuffers
Open in desktop
Submodule flatbuffers updated 1636 files
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[flatbuffers] Update to flatbuffers v23.5.26#39

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

Closed
dbort wants to merge 2 commits into from
Closed

[flatbuffers] Update to flatbuffers v23.5.26 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce03799
[executorch] Remove flatbuffer forward declarations from method.h
dbort Aug 5, 2023
ecab427
[flatbuffers] Update to flatbuffers v23.5.26
dbort Aug 5, 2023
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
40 changes: 20 additions & 20 deletions runtime/executor/method.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,11 +257,19 @@ bool parse_cond_value(const EValue& cond_value) {

} // namespace

Error Method::parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* flatbuffer_values,
size_t* num_parsed) {
for (size_t i = 0; i < n_value_; ++i) {
Error Method::parse_values() {
auto flatbuffer_values = serialization_plan_->values();
ET_CHECK(flatbuffer_values != nullptr);
size_t n_value = flatbuffer_values->size();
values_ = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
memory_manager_->get_runtime_allocator(), EValue, n_value);

// n_value_ counts the number of successfully-initialized values for ~Method()
// to clean up, and is incremented at the bottom of the loop. This makes it
// safe for errors to return without updating any state.
n_value_ = 0;

for (size_t i = 0; i < n_value; ++i) {
auto serialization_value = flatbuffer_values->Get(i);
switch (serialization_value->val_type()) {
case executorch_flatbuffer::KernelTypes::Null: {
Expand DownExpand Up@@ -329,7 +337,6 @@ Error Method::parse_values(
"Failed parsing tensor at index %zu: %" PRIu32,
i,
t.error());
*num_parsed = i;
return t.error();
}
new (&values_[i]) EValue(t.get());
Expand All@@ -347,7 +354,6 @@ Error Method::parse_values(
"Failed parsing tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -365,7 +371,6 @@ Error Method::parse_values(
"Failed parsing optional tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -383,8 +388,12 @@ Error Method::parse_values(
"to see which type this is.",
static_cast<uint32_t>(serialization_value->val_type()) - 1);
}

// ~Method() will try to clean up n_value_ entries in the values_ array.
// Only increment this once we know the entry is valid, so that we don't try
// to clean up an uninitialized entry.
n_value_ = i + 1;
}
*num_parsed = n_value_;
return Error::Ok;
}

Expand DownExpand Up@@ -502,18 +511,9 @@ Error Method::init(executorch_flatbuffer::ExecutionPlan* s_plan) {
auto runtime_allocator = memory_manager_->get_runtime_allocator();

{
// Load values
auto plan_values = serialization_plan_->values();
ET_CHECK(plan_values != nullptr);
n_value_ = plan_values->size();
values_ =
ET_ALLOCATE_LIST_OR_RETURN_ERROR(runtime_allocator, EValue, n_value_);
size_t num_parsed;
Error err = parse_values(plan_values, &num_parsed);
// Parse the elements of the values_ array.
Error err = parse_values();
if (err != Error::Ok) {
// ~Method() will try to clean up entries in this list. Ensure that it
// doesn't look at any uninitialized entries.
n_value_ = num_parsed;
return err;
}
}
Expand Down
16 changes: 4 additions & 12 deletions runtime/executor/method.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,6 @@

// Forward declare flatbuffer types. This is a public header and must not
// include the generated flatbuffer header.
namespace flatbuffers {
template <typename T>
class Vector;
template <typename T>
struct Offset;
} // namespace flatbuffers
namespace executorch_flatbuffer {
struct Chain;
struct ExecutionPlan;
Expand DownExpand Up@@ -262,13 +256,11 @@ class Method final {
bool pre_allocated_input_;

/**
* Initialize the EValue table of the program. *num_parsed is the number
* of elements actually parsed, which may be less than n_value_ on failure.
* Parses the elements of the values_ array. On error, n_value_ will be set to
* the number of successfully-initialized entries so that ~Method doesn't try
* to clean up uninitialized entries.
*/
__ET_NODISCARD Error parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* fb_values,
size_t* num_parsed);
__ET_NODISCARD Error parse_values();

__ET_NODISCARD Error resolve_operator(
int32_t op_index,
Expand Down
18 changes: 14 additions & 4 deletions third-party/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,36 +165,46 @@ runtime.cxx_binary(
"flatbuffers/grpc/src/compiler/python_generator.cc",
"flatbuffers/grpc/src/compiler/swift_generator.cc",
"flatbuffers/grpc/src/compiler/ts_generator.cc",
"flatbuffers/src/annotated_binary_text_gen.cpp",
"flatbuffers/src/bfbs_gen_lua.cpp",
"flatbuffers/src/bfbs_gen_nim.cpp",
"flatbuffers/src/binary_annotator.cpp",
"flatbuffers/src/code_generators.cpp",
"flatbuffers/src/file_binary_writer.cpp",
"flatbuffers/src/file_name_saving_file_manager.cpp",
"flatbuffers/src/file_writer.cpp",
"flatbuffers/src/flatc.cpp",
"flatbuffers/src/flatc_main.cpp",
"flatbuffers/src/idl_gen_binary.cpp",
"flatbuffers/src/idl_gen_cpp.cpp",
"flatbuffers/src/idl_gen_csharp.cpp",
"flatbuffers/src/idl_gen_dart.cpp",
"flatbuffers/src/idl_gen_fbs.cpp",
"flatbuffers/src/idl_gen_go.cpp",
"flatbuffers/src/idl_gen_grpc.cpp",
"flatbuffers/src/idl_gen_java.cpp",
"flatbuffers/src/idl_gen_js_ts.cpp",
"flatbuffers/src/idl_gen_json_schema.cpp",
"flatbuffers/src/idl_gen_kotlin.cpp",
"flatbuffers/src/idl_gen_lobster.cpp",
"flatbuffers/src/idl_gen_lua.cpp",
"flatbuffers/src/idl_gen_php.cpp",
"flatbuffers/src/idl_gen_python.cpp",
"flatbuffers/src/idl_gen_rust.cpp",
"flatbuffers/src/idl_gen_swift.cpp",
"flatbuffers/src/idl_gen_text.cpp",
"flatbuffers/src/idl_gen_ts.cpp",
"flatbuffers/src/idl_parser.cpp",
"flatbuffers/src/reflection.cpp",
"flatbuffers/src/util.cpp",
],
include_directories = [
"flatbuffers/grpc",
"flatbuffers/include",
],
raw_headers = [
"flatbuffers/grpc/src/compiler/config.h",
"flatbuffers/grpc/src/compiler/cpp_generator.h",
"flatbuffers/grpc/src/compiler/go_generator.h",
"flatbuffers/grpc/src/compiler/java_generator.h",
"flatbuffers/grpc/src/compiler/python_generator.h",
"flatbuffers/grpc/src/compiler/python_private_generator.h",
"flatbuffers/grpc/src/compiler/schema_interface.h",
"flatbuffers/grpc/src/compiler/swift_generator.h",
"flatbuffers/grpc/src/compiler/ts_generator.h",
Expand Down
2 changes: 1 addition & 1 deletion third-party/flatbuffers
Open in desktop
Submodule flatbuffers updated 1636 files
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[flatbuffers] Update to flatbuffers v23.5.26#39

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

Closed
dbort wants to merge 2 commits into from
Closed

[flatbuffers] Update to flatbuffers v23.5.26 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce03799
[executorch] Remove flatbuffer forward declarations from method.h
dbort Aug 5, 2023
ecab427
[flatbuffers] Update to flatbuffers v23.5.26
dbort Aug 5, 2023
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
40 changes: 20 additions & 20 deletions runtime/executor/method.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,11 +257,19 @@ bool parse_cond_value(const EValue& cond_value) {

} // namespace

Error Method::parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* flatbuffer_values,
size_t* num_parsed) {
for (size_t i = 0; i < n_value_; ++i) {
Error Method::parse_values() {
auto flatbuffer_values = serialization_plan_->values();
ET_CHECK(flatbuffer_values != nullptr);
size_t n_value = flatbuffer_values->size();
values_ = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
memory_manager_->get_runtime_allocator(), EValue, n_value);

// n_value_ counts the number of successfully-initialized values for ~Method()
// to clean up, and is incremented at the bottom of the loop. This makes it
// safe for errors to return without updating any state.
n_value_ = 0;

for (size_t i = 0; i < n_value; ++i) {
auto serialization_value = flatbuffer_values->Get(i);
switch (serialization_value->val_type()) {
case executorch_flatbuffer::KernelTypes::Null: {
Expand DownExpand Up@@ -329,7 +337,6 @@ Error Method::parse_values(
"Failed parsing tensor at index %zu: %" PRIu32,
i,
t.error());
*num_parsed = i;
return t.error();
}
new (&values_[i]) EValue(t.get());
Expand All@@ -347,7 +354,6 @@ Error Method::parse_values(
"Failed parsing tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -365,7 +371,6 @@ Error Method::parse_values(
"Failed parsing optional tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -383,8 +388,12 @@ Error Method::parse_values(
"to see which type this is.",
static_cast<uint32_t>(serialization_value->val_type()) - 1);
}

// ~Method() will try to clean up n_value_ entries in the values_ array.
// Only increment this once we know the entry is valid, so that we don't try
// to clean up an uninitialized entry.
n_value_ = i + 1;
}
*num_parsed = n_value_;
return Error::Ok;
}

Expand DownExpand Up@@ -502,18 +511,9 @@ Error Method::init(executorch_flatbuffer::ExecutionPlan* s_plan) {
auto runtime_allocator = memory_manager_->get_runtime_allocator();

{
// Load values
auto plan_values = serialization_plan_->values();
ET_CHECK(plan_values != nullptr);
n_value_ = plan_values->size();
values_ =
ET_ALLOCATE_LIST_OR_RETURN_ERROR(runtime_allocator, EValue, n_value_);
size_t num_parsed;
Error err = parse_values(plan_values, &num_parsed);
// Parse the elements of the values_ array.
Error err = parse_values();
if (err != Error::Ok) {
// ~Method() will try to clean up entries in this list. Ensure that it
// doesn't look at any uninitialized entries.
n_value_ = num_parsed;
return err;
}
}
Expand Down
16 changes: 4 additions & 12 deletions runtime/executor/method.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,6 @@

// Forward declare flatbuffer types. This is a public header and must not
// include the generated flatbuffer header.
namespace flatbuffers {
template <typename T>
class Vector;
template <typename T>
struct Offset;
} // namespace flatbuffers
namespace executorch_flatbuffer {
struct Chain;
struct ExecutionPlan;
Expand DownExpand Up@@ -262,13 +256,11 @@ class Method final {
bool pre_allocated_input_;

/**
* Initialize the EValue table of the program. *num_parsed is the number
* of elements actually parsed, which may be less than n_value_ on failure.
* Parses the elements of the values_ array. On error, n_value_ will be set to
* the number of successfully-initialized entries so that ~Method doesn't try
* to clean up uninitialized entries.
*/
__ET_NODISCARD Error parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* fb_values,
size_t* num_parsed);
__ET_NODISCARD Error parse_values();

__ET_NODISCARD Error resolve_operator(
int32_t op_index,
Expand Down
18 changes: 14 additions & 4 deletions third-party/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,36 +165,46 @@ runtime.cxx_binary(
"flatbuffers/grpc/src/compiler/python_generator.cc",
"flatbuffers/grpc/src/compiler/swift_generator.cc",
"flatbuffers/grpc/src/compiler/ts_generator.cc",
"flatbuffers/src/annotated_binary_text_gen.cpp",
"flatbuffers/src/bfbs_gen_lua.cpp",
"flatbuffers/src/bfbs_gen_nim.cpp",
"flatbuffers/src/binary_annotator.cpp",
"flatbuffers/src/code_generators.cpp",
"flatbuffers/src/file_binary_writer.cpp",
"flatbuffers/src/file_name_saving_file_manager.cpp",
"flatbuffers/src/file_writer.cpp",
"flatbuffers/src/flatc.cpp",
"flatbuffers/src/flatc_main.cpp",
"flatbuffers/src/idl_gen_binary.cpp",
"flatbuffers/src/idl_gen_cpp.cpp",
"flatbuffers/src/idl_gen_csharp.cpp",
"flatbuffers/src/idl_gen_dart.cpp",
"flatbuffers/src/idl_gen_fbs.cpp",
"flatbuffers/src/idl_gen_go.cpp",
"flatbuffers/src/idl_gen_grpc.cpp",
"flatbuffers/src/idl_gen_java.cpp",
"flatbuffers/src/idl_gen_js_ts.cpp",
"flatbuffers/src/idl_gen_json_schema.cpp",
"flatbuffers/src/idl_gen_kotlin.cpp",
"flatbuffers/src/idl_gen_lobster.cpp",
"flatbuffers/src/idl_gen_lua.cpp",
"flatbuffers/src/idl_gen_php.cpp",
"flatbuffers/src/idl_gen_python.cpp",
"flatbuffers/src/idl_gen_rust.cpp",
"flatbuffers/src/idl_gen_swift.cpp",
"flatbuffers/src/idl_gen_text.cpp",
"flatbuffers/src/idl_gen_ts.cpp",
"flatbuffers/src/idl_parser.cpp",
"flatbuffers/src/reflection.cpp",
"flatbuffers/src/util.cpp",
],
include_directories = [
"flatbuffers/grpc",
"flatbuffers/include",
],
raw_headers = [
"flatbuffers/grpc/src/compiler/config.h",
"flatbuffers/grpc/src/compiler/cpp_generator.h",
"flatbuffers/grpc/src/compiler/go_generator.h",
"flatbuffers/grpc/src/compiler/java_generator.h",
"flatbuffers/grpc/src/compiler/python_generator.h",
"flatbuffers/grpc/src/compiler/python_private_generator.h",
"flatbuffers/grpc/src/compiler/schema_interface.h",
"flatbuffers/grpc/src/compiler/swift_generator.h",
"flatbuffers/grpc/src/compiler/ts_generator.h",
Expand Down
2 changes: 1 addition & 1 deletion third-party/flatbuffers
Open in desktop
Submodule flatbuffers updated 1636 files
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[flatbuffers] Update to flatbuffers v23.5.26#39

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

Closed
dbort wants to merge 2 commits into from
Closed

[flatbuffers] Update to flatbuffers v23.5.26 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce03799
[executorch] Remove flatbuffer forward declarations from method.h
dbort Aug 5, 2023
ecab427
[flatbuffers] Update to flatbuffers v23.5.26
dbort Aug 5, 2023
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
40 changes: 20 additions & 20 deletions runtime/executor/method.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,11 +257,19 @@ bool parse_cond_value(const EValue& cond_value) {

} // namespace

Error Method::parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* flatbuffer_values,
size_t* num_parsed) {
for (size_t i = 0; i < n_value_; ++i) {
Error Method::parse_values() {
auto flatbuffer_values = serialization_plan_->values();
ET_CHECK(flatbuffer_values != nullptr);
size_t n_value = flatbuffer_values->size();
values_ = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
memory_manager_->get_runtime_allocator(), EValue, n_value);

// n_value_ counts the number of successfully-initialized values for ~Method()
// to clean up, and is incremented at the bottom of the loop. This makes it
// safe for errors to return without updating any state.
n_value_ = 0;

for (size_t i = 0; i < n_value; ++i) {
auto serialization_value = flatbuffer_values->Get(i);
switch (serialization_value->val_type()) {
case executorch_flatbuffer::KernelTypes::Null: {
Expand DownExpand Up@@ -329,7 +337,6 @@ Error Method::parse_values(
"Failed parsing tensor at index %zu: %" PRIu32,
i,
t.error());
*num_parsed = i;
return t.error();
}
new (&values_[i]) EValue(t.get());
Expand All@@ -347,7 +354,6 @@ Error Method::parse_values(
"Failed parsing tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -365,7 +371,6 @@ Error Method::parse_values(
"Failed parsing optional tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -383,8 +388,12 @@ Error Method::parse_values(
"to see which type this is.",
static_cast<uint32_t>(serialization_value->val_type()) - 1);
}

// ~Method() will try to clean up n_value_ entries in the values_ array.
// Only increment this once we know the entry is valid, so that we don't try
// to clean up an uninitialized entry.
n_value_ = i + 1;
}
*num_parsed = n_value_;
return Error::Ok;
}

Expand DownExpand Up@@ -502,18 +511,9 @@ Error Method::init(executorch_flatbuffer::ExecutionPlan* s_plan) {
auto runtime_allocator = memory_manager_->get_runtime_allocator();

{
// Load values
auto plan_values = serialization_plan_->values();
ET_CHECK(plan_values != nullptr);
n_value_ = plan_values->size();
values_ =
ET_ALLOCATE_LIST_OR_RETURN_ERROR(runtime_allocator, EValue, n_value_);
size_t num_parsed;
Error err = parse_values(plan_values, &num_parsed);
// Parse the elements of the values_ array.
Error err = parse_values();
if (err != Error::Ok) {
// ~Method() will try to clean up entries in this list. Ensure that it
// doesn't look at any uninitialized entries.
n_value_ = num_parsed;
return err;
}
}
Expand Down
16 changes: 4 additions & 12 deletions runtime/executor/method.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,6 @@

// Forward declare flatbuffer types. This is a public header and must not
// include the generated flatbuffer header.
namespace flatbuffers {
template <typename T>
class Vector;
template <typename T>
struct Offset;
} // namespace flatbuffers
namespace executorch_flatbuffer {
struct Chain;
struct ExecutionPlan;
Expand DownExpand Up@@ -262,13 +256,11 @@ class Method final {
bool pre_allocated_input_;

/**
* Initialize the EValue table of the program. *num_parsed is the number
* of elements actually parsed, which may be less than n_value_ on failure.
* Parses the elements of the values_ array. On error, n_value_ will be set to
* the number of successfully-initialized entries so that ~Method doesn't try
* to clean up uninitialized entries.
*/
__ET_NODISCARD Error parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* fb_values,
size_t* num_parsed);
__ET_NODISCARD Error parse_values();

__ET_NODISCARD Error resolve_operator(
int32_t op_index,
Expand Down
18 changes: 14 additions & 4 deletions third-party/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,36 +165,46 @@ runtime.cxx_binary(
"flatbuffers/grpc/src/compiler/python_generator.cc",
"flatbuffers/grpc/src/compiler/swift_generator.cc",
"flatbuffers/grpc/src/compiler/ts_generator.cc",
"flatbuffers/src/annotated_binary_text_gen.cpp",
"flatbuffers/src/bfbs_gen_lua.cpp",
"flatbuffers/src/bfbs_gen_nim.cpp",
"flatbuffers/src/binary_annotator.cpp",
"flatbuffers/src/code_generators.cpp",
"flatbuffers/src/file_binary_writer.cpp",
"flatbuffers/src/file_name_saving_file_manager.cpp",
"flatbuffers/src/file_writer.cpp",
"flatbuffers/src/flatc.cpp",
"flatbuffers/src/flatc_main.cpp",
"flatbuffers/src/idl_gen_binary.cpp",
"flatbuffers/src/idl_gen_cpp.cpp",
"flatbuffers/src/idl_gen_csharp.cpp",
"flatbuffers/src/idl_gen_dart.cpp",
"flatbuffers/src/idl_gen_fbs.cpp",
"flatbuffers/src/idl_gen_go.cpp",
"flatbuffers/src/idl_gen_grpc.cpp",
"flatbuffers/src/idl_gen_java.cpp",
"flatbuffers/src/idl_gen_js_ts.cpp",
"flatbuffers/src/idl_gen_json_schema.cpp",
"flatbuffers/src/idl_gen_kotlin.cpp",
"flatbuffers/src/idl_gen_lobster.cpp",
"flatbuffers/src/idl_gen_lua.cpp",
"flatbuffers/src/idl_gen_php.cpp",
"flatbuffers/src/idl_gen_python.cpp",
"flatbuffers/src/idl_gen_rust.cpp",
"flatbuffers/src/idl_gen_swift.cpp",
"flatbuffers/src/idl_gen_text.cpp",
"flatbuffers/src/idl_gen_ts.cpp",
"flatbuffers/src/idl_parser.cpp",
"flatbuffers/src/reflection.cpp",
"flatbuffers/src/util.cpp",
],
include_directories = [
"flatbuffers/grpc",
"flatbuffers/include",
],
raw_headers = [
"flatbuffers/grpc/src/compiler/config.h",
"flatbuffers/grpc/src/compiler/cpp_generator.h",
"flatbuffers/grpc/src/compiler/go_generator.h",
"flatbuffers/grpc/src/compiler/java_generator.h",
"flatbuffers/grpc/src/compiler/python_generator.h",
"flatbuffers/grpc/src/compiler/python_private_generator.h",
"flatbuffers/grpc/src/compiler/schema_interface.h",
"flatbuffers/grpc/src/compiler/swift_generator.h",
"flatbuffers/grpc/src/compiler/ts_generator.h",
Expand Down
2 changes: 1 addition & 1 deletion third-party/flatbuffers
Open in desktop
Submodule flatbuffers updated 1636 files
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[flatbuffers] Update to flatbuffers v23.5.26#39

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

Closed
dbort wants to merge 2 commits into from
Closed

[flatbuffers] Update to flatbuffers v23.5.26 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce03799
[executorch] Remove flatbuffer forward declarations from method.h
dbort Aug 5, 2023
ecab427
[flatbuffers] Update to flatbuffers v23.5.26
dbort Aug 5, 2023
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
40 changes: 20 additions & 20 deletions runtime/executor/method.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,11 +257,19 @@ bool parse_cond_value(const EValue& cond_value) {

} // namespace

Error Method::parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* flatbuffer_values,
size_t* num_parsed) {
for (size_t i = 0; i < n_value_; ++i) {
Error Method::parse_values() {
auto flatbuffer_values = serialization_plan_->values();
ET_CHECK(flatbuffer_values != nullptr);
size_t n_value = flatbuffer_values->size();
values_ = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
memory_manager_->get_runtime_allocator(), EValue, n_value);

// n_value_ counts the number of successfully-initialized values for ~Method()
// to clean up, and is incremented at the bottom of the loop. This makes it
// safe for errors to return without updating any state.
n_value_ = 0;

for (size_t i = 0; i < n_value; ++i) {
auto serialization_value = flatbuffer_values->Get(i);
switch (serialization_value->val_type()) {
case executorch_flatbuffer::KernelTypes::Null: {
Expand DownExpand Up@@ -329,7 +337,6 @@ Error Method::parse_values(
"Failed parsing tensor at index %zu: %" PRIu32,
i,
t.error());
*num_parsed = i;
return t.error();
}
new (&values_[i]) EValue(t.get());
Expand All@@ -347,7 +354,6 @@ Error Method::parse_values(
"Failed parsing tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -365,7 +371,6 @@ Error Method::parse_values(
"Failed parsing optional tensor list at index %zu: %" PRIu32,
i,
tensors.error());
*num_parsed = i;
return tensors.error();
}
new (&values_[i]) EValue(tensors.get());
Expand All@@ -383,8 +388,12 @@ Error Method::parse_values(
"to see which type this is.",
static_cast<uint32_t>(serialization_value->val_type()) - 1);
}

// ~Method() will try to clean up n_value_ entries in the values_ array.
// Only increment this once we know the entry is valid, so that we don't try
// to clean up an uninitialized entry.
n_value_ = i + 1;
}
*num_parsed = n_value_;
return Error::Ok;
}

Expand DownExpand Up@@ -502,18 +511,9 @@ Error Method::init(executorch_flatbuffer::ExecutionPlan* s_plan) {
auto runtime_allocator = memory_manager_->get_runtime_allocator();

{
// Load values
auto plan_values = serialization_plan_->values();
ET_CHECK(plan_values != nullptr);
n_value_ = plan_values->size();
values_ =
ET_ALLOCATE_LIST_OR_RETURN_ERROR(runtime_allocator, EValue, n_value_);
size_t num_parsed;
Error err = parse_values(plan_values, &num_parsed);
// Parse the elements of the values_ array.
Error err = parse_values();
if (err != Error::Ok) {
// ~Method() will try to clean up entries in this list. Ensure that it
// doesn't look at any uninitialized entries.
n_value_ = num_parsed;
return err;
}
}
Expand Down
16 changes: 4 additions & 12 deletions runtime/executor/method.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,6 @@

// Forward declare flatbuffer types. This is a public header and must not
// include the generated flatbuffer header.
namespace flatbuffers {
template <typename T>
class Vector;
template <typename T>
struct Offset;
} // namespace flatbuffers
namespace executorch_flatbuffer {
struct Chain;
struct ExecutionPlan;
Expand DownExpand Up@@ -262,13 +256,11 @@ class Method final {
bool pre_allocated_input_;

/**
* Initialize the EValue table of the program. *num_parsed is the number
* of elements actually parsed, which may be less than n_value_ on failure.
* Parses the elements of the values_ array. On error, n_value_ will be set to
* the number of successfully-initialized entries so that ~Method doesn't try
* to clean up uninitialized entries.
*/
__ET_NODISCARD Error parse_values(
const flatbuffers::Vector<
flatbuffers::Offset<executorch_flatbuffer::EValue>>* fb_values,
size_t* num_parsed);
__ET_NODISCARD Error parse_values();

__ET_NODISCARD Error resolve_operator(
int32_t op_index,
Expand Down
18 changes: 14 additions & 4 deletions third-party/TARGETS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,36 +165,46 @@ runtime.cxx_binary(
"flatbuffers/grpc/src/compiler/python_generator.cc",
"flatbuffers/grpc/src/compiler/swift_generator.cc",
"flatbuffers/grpc/src/compiler/ts_generator.cc",
"flatbuffers/src/annotated_binary_text_gen.cpp",
"flatbuffers/src/bfbs_gen_lua.cpp",
"flatbuffers/src/bfbs_gen_nim.cpp",
"flatbuffers/src/binary_annotator.cpp",
"flatbuffers/src/code_generators.cpp",
"flatbuffers/src/file_binary_writer.cpp",
"flatbuffers/src/file_name_saving_file_manager.cpp",
"flatbuffers/src/file_writer.cpp",
"flatbuffers/src/flatc.cpp",
"flatbuffers/src/flatc_main.cpp",
"flatbuffers/src/idl_gen_binary.cpp",
"flatbuffers/src/idl_gen_cpp.cpp",
"flatbuffers/src/idl_gen_csharp.cpp",
"flatbuffers/src/idl_gen_dart.cpp",
"flatbuffers/src/idl_gen_fbs.cpp",
"flatbuffers/src/idl_gen_go.cpp",
"flatbuffers/src/idl_gen_grpc.cpp",
"flatbuffers/src/idl_gen_java.cpp",
"flatbuffers/src/idl_gen_js_ts.cpp",
"flatbuffers/src/idl_gen_json_schema.cpp",
"flatbuffers/src/idl_gen_kotlin.cpp",
"flatbuffers/src/idl_gen_lobster.cpp",
"flatbuffers/src/idl_gen_lua.cpp",
"flatbuffers/src/idl_gen_php.cpp",
"flatbuffers/src/idl_gen_python.cpp",
"flatbuffers/src/idl_gen_rust.cpp",
"flatbuffers/src/idl_gen_swift.cpp",
"flatbuffers/src/idl_gen_text.cpp",
"flatbuffers/src/idl_gen_ts.cpp",
"flatbuffers/src/idl_parser.cpp",
"flatbuffers/src/reflection.cpp",
"flatbuffers/src/util.cpp",
],
include_directories = [
"flatbuffers/grpc",
"flatbuffers/include",
],
raw_headers = [
"flatbuffers/grpc/src/compiler/config.h",
"flatbuffers/grpc/src/compiler/cpp_generator.h",
"flatbuffers/grpc/src/compiler/go_generator.h",
"flatbuffers/grpc/src/compiler/java_generator.h",
"flatbuffers/grpc/src/compiler/python_generator.h",
"flatbuffers/grpc/src/compiler/python_private_generator.h",
"flatbuffers/grpc/src/compiler/schema_interface.h",
"flatbuffers/grpc/src/compiler/swift_generator.h",
"flatbuffers/grpc/src/compiler/ts_generator.h",
Expand Down
2 changes: 1 addition & 1 deletion third-party/flatbuffers
Open in desktop
Submodule flatbuffers updated 1636 files