Make sure size_test CI uses -Wall -Werror#8016

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
mergennachin merged 1 commit into from
Feb 11, 2025
Merged

Make sure size_test CI uses -Wall -Werror #8016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,14 @@ must work with threading**

## Testing

### Running Tests Locally

CI is run automatically on all pull requests. However, if you want to run tests locally, here are some example commands (not exhaustive):

- The `sh test/build_size_test.sh` script will compile the C++runtime along with portable kernels.
- The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally
- Running `pytest` from the root directory will run Python tests locally.

### Writing Tests
To help keep code quality high, ExecuTorch uses a combination of unit tests and
end-to-end (e2e) tests. If you add a new feature or fix a bug, please add tests
Expand All@@ -229,8 +237,6 @@ If it's not clear how to add a test for your PR, take a look at the blame for
the code you're modifying and find an author who has more context. Ask them
for their help in the PR comments.

The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally.

### Continuous Integration
See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of
the CI (continuous integration) jobs. If `main` is broken, consider rebasing
Expand Down
3 changes: 2 additions & 1 deletion kernels/portable/cpu/op_full.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ Tensor& full_out(

ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
CTYPE_VAL val;
utils::extract_scalar(fill_value, &val);
ET_KERNEL_CHECK(

@mergennachinmergennachinFeb 3, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to adjust due to errors like this:

https://github.com/pytorch/executorch/actions/runs/13123283587/job/36614101657?pr=8016

@swolchokswolchokFeb 4, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think ET_KERNEL_CHECK will do the right thing in a lambda -- it returns from the lambda, not the operator

@mergennachinmergennachinFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestions on how to fix?

i think it's fine, since it will return void from the lambda, but sets context to be fail, with error code InvalidArgument.

ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down
3 changes: 2 additions & 1 deletion kernels/portable/cpu/op_full_like.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,8 @@ Tensor& full_like_out(

ET_SWITCH_REALB_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
CTYPE_VAL val;
utils::extract_scalar(fill_value, &val);
ET_KERNEL_CHECK(
ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down
2 changes: 1 addition & 1 deletion kernels/portable/cpu/op_scatter.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -156,7 +156,7 @@ Tensor& scatter_value_out(

ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
CTYPE_VAL val;
utils::extract_scalar(value, &val);
ET_KERNEL_CHECK(ctx, utils::extract_scalar(value, &val), InvalidArgument, );

ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
scatter_value_helper<CTYPE>(in, dim, index, val, out);
Expand Down
16 changes: 7 additions & 9 deletions kernels/portable/cpu/util/broadcast_util.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,18 +215,16 @@ ET_NODISCARD Error get_broadcast_target_size(
size_t* out_dim) {
if ET_UNLIKELY (!tensors_are_broadcastable_between(a_size, b_size)) {
#ifdef ET_LOG_ENABLED
const auto a_shape_str = tensor_shape_to_c_string(
executorch::runtime::Span<const Tensor::SizesType>(
a_size.data(), a_size.size()));
const auto b_shape_str = tensor_shape_to_c_string(
executorch::runtime::Span<const Tensor::SizesType>(
b_size.data(), b_size.size()));
#endif
executorch::runtime::Span<const Tensor::SizesType> a_size_span(
a_size.data(), a_size.size());
executorch::runtime::Span<const Tensor::SizesType> b_size_span(
b_size.data(), b_size.size());
ET_LOG(
Error,
"Two input tensors should be broadcastable but got shapes %s and %s.",
a_shape_str.data(),
b_shape_str.data());
tensor_shape_to_c_string(a_size_span).data(),
tensor_shape_to_c_string(b_size_span).data());
#endif

@digantdesaidigantdesaiFeb 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

return executorch::runtime::Error::InvalidArgument;
}

Expand Down
24 changes: 11 additions & 13 deletions runtime/core/portable_type/tensor_impl.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,20 +96,18 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
case TensorShapeDynamism::STATIC:
if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
#ifdef ET_LOG_ENABLED
auto old_sizes_str = executorch::runtime::tensor_shape_to_c_string(
executorch::runtime::Span<const SizesType>(
sizes().data(), sizes().size()));
auto new_sizes_str = executorch::runtime::tensor_shape_to_c_string(
executorch::runtime::Span<const SizesType>(
new_sizes.data(), new_sizes.size()));
#endif

ET_CHECK_OR_RETURN_ERROR(
false,
NotSupported,
executorch::runtime::Span<const SizesType> sizes_span(
sizes().data(), sizes().size());
executorch::runtime::Span<const SizesType> new_sizes_span(
new_sizes.data(), new_sizes.size());
ET_LOG(
Error,
"Attempted to resize a static tensor. Expected shape %s, but received %s.",
old_sizes_str.data(),
new_sizes_str.data())
executorch::runtime::tensor_shape_to_c_string(sizes_span).data(),
executorch::runtime::tensor_shape_to_c_string(new_sizes_span)
.data());
#endif
return executorch::runtime::Error::NotSupported;
}

break;
Expand Down
8 changes: 6 additions & 2 deletions test/build_size_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,15 @@ set -e
# shellcheck source=/dev/null
source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"

# TODO(#8149): Remove -Wno-sign-compare
# TODO(#8357): Remove -Wno-int-in-bool-context
COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Werror -Wno-sign-compare -Wno-unknown-pragmas -Wno-int-in-bool-context"

cmake_install_executorch_lib() {
echo "Installing libexecutorch.a"
clean_executorch_install_folders

CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DBUCK2="$BUCK2" \
CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
-DCMAKE_INSTALL_PREFIX=cmake-out \
-DCMAKE_BUILD_TYPE=Release \
Expand All@@ -27,7 +31,7 @@ cmake_install_executorch_lib() {
}

test_cmake_size_test() {
CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test

echo "Build size test"
cmake --build cmake-out/test -j9 --config Release
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 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
Make sure size_test CI uses -Wall -Werror#8016

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

mergennachin
merged 1 commit into

from

Feb 11, 2025
 Merged


Make sure size_test CI uses -Wall -Werror
#8016
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,14 @@ must work with threading**

## Testing

### Running Tests Locally

CI is run automatically on all pull requests. However, if you want to run tests locally, here are some example commands (not exhaustive):

- The `sh test/build_size_test.sh` script will compile the C++runtime along with portable kernels.
- The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally
- Running `pytest` from the root directory will run Python tests locally.

### Writing Tests
To help keep code quality high, ExecuTorch uses a combination of unit tests and
end-to-end (e2e) tests. If you add a new feature or fix a bug, please add tests
Expand All@@ -229,8 +237,6 @@ If it's not clear how to add a test for your PR, take a look at the blame for
the code you're modifying and find an author who has more context. Ask them
for their help in the PR comments.

The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally.

### Continuous Integration
See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of
the CI (continuous integration) jobs. If `main` is broken, consider rebasing
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ Tensor& full_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
@mergennachinmergennachinFeb 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to adjust due to errors like this:
https://github.com/pytorch/executorch/actions/runs/13123283587/job/36614101657?pr=8016
@swolchokswolchokFeb 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think ET_KERNEL_CHECK will do the right thing in a lambda -- it returns from the lambda, not the operator
@mergennachinmergennachinFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestions on how to fix?
i think it's fine, since it will return void from the lambda, but sets context to be fail, with error code InvalidArgument.
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full_like.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,8 @@ Tensor& full_like_out(

 ET_SWITCH_REALB_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

2 changes: 1 addition & 1 deletion
kernels/portable/cpu/op_scatter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,7 +156,7 @@ Tensor& scatter_value_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(value, &val);
ET_KERNEL_CHECK(ctx, utils::extract_scalar(value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
 scatter_value_helper<CTYPE>(in, dim, index, val, out);
Expand Down

16 changes: 7 additions & 9 deletions
kernels/portable/cpu/util/broadcast_util.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,18 +215,16 @@ ET_NODISCARD Error get_broadcast_target_size(
 size_t* out_dim) {
 if ET_UNLIKELY (!tensors_are_broadcastable_between(a_size, b_size)) {
#ifdef ET_LOG_ENABLED
 const auto a_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 a_size.data(), a_size.size()));
 const auto b_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 b_size.data(), b_size.size()));
#endif
 executorch::runtime::Span<const Tensor::SizesType> a_size_span(
 a_size.data(), a_size.size());
 executorch::runtime::Span<const Tensor::SizesType> b_size_span(
 b_size.data(), b_size.size());
 ET_LOG(
 Error,
 "Two input tensors should be broadcastable but got shapes %s and %s.",
 a_shape_str.data(),
 b_shape_str.data());
 tensor_shape_to_c_string(a_size_span).data(),
 tensor_shape_to_c_string(b_size_span).data());
#endif
@digantdesaidigantdesaiFeb 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
 return executorch::runtime::Error::InvalidArgument;
 }

Expand Down

24 changes: 11 additions & 13 deletions
runtime/core/portable_type/tensor_impl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,20 +96,18 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
 case TensorShapeDynamism::STATIC:
 if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
#ifdef ET_LOG_ENABLED
 auto old_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 sizes().data(), sizes().size()));
 auto new_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 new_sizes.data(), new_sizes.size()));
#endif

 ET_CHECK_OR_RETURN_ERROR(
 false,
 NotSupported,
 executorch::runtime::Span<const SizesType> sizes_span(
 sizes().data(), sizes().size());
 executorch::runtime::Span<const SizesType> new_sizes_span(
 new_sizes.data(), new_sizes.size());
 ET_LOG(
 Error,
 "Attempted to resize a static tensor. Expected shape %s, but received %s.",
 old_sizes_str.data(),
 new_sizes_str.data())
 executorch::runtime::tensor_shape_to_c_string(sizes_span).data(),
 executorch::runtime::tensor_shape_to_c_string(new_sizes_span)
 .data());
#endif
 return executorch::runtime::Error::NotSupported;
 }

 break;
Expand Down

8 changes: 6 additions & 2 deletions
test/build_size_test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,15 @@ set -e
# shellcheck source=/dev/null
source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"

# TODO(#8149): Remove -Wno-sign-compare
# TODO(#8357): Remove -Wno-int-in-bool-context
COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Werror -Wno-sign-compare -Wno-unknown-pragmas -Wno-int-in-bool-context"

cmake_install_executorch_lib() {
 echo "Installing libexecutorch.a"
 clean_executorch_install_folders

 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DBUCK2="$BUCK2" \
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
 -DCMAKE_CXX_STANDARD_REQUIRED=ON \
 -DCMAKE_INSTALL_PREFIX=cmake-out \
 -DCMAKE_BUILD_TYPE=Release \
Expand All@@ -27,7 +31,7 @@ cmake_install_executorch_lib() {
}

test_cmake_size_test() {
 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test

 echo "Build size test"
 cmake --build cmake-out/test -j9 --config Release
Expand Down

, '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
Make sure size_test CI uses -Wall -Werror#8016

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

mergennachin
merged 1 commit into

from

Feb 11, 2025
 Merged


Make sure size_test CI uses -Wall -Werror
#8016
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,14 @@ must work with threading**

## Testing

### Running Tests Locally

CI is run automatically on all pull requests. However, if you want to run tests locally, here are some example commands (not exhaustive):

- The `sh test/build_size_test.sh` script will compile the C++runtime along with portable kernels.
- The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally
- Running `pytest` from the root directory will run Python tests locally.

### Writing Tests
To help keep code quality high, ExecuTorch uses a combination of unit tests and
end-to-end (e2e) tests. If you add a new feature or fix a bug, please add tests
Expand All@@ -229,8 +237,6 @@ If it's not clear how to add a test for your PR, take a look at the blame for
the code you're modifying and find an author who has more context. Ask them
for their help in the PR comments.

The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally.

### Continuous Integration
See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of
the CI (continuous integration) jobs. If `main` is broken, consider rebasing
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ Tensor& full_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
@mergennachinmergennachinFeb 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to adjust due to errors like this:
https://github.com/pytorch/executorch/actions/runs/13123283587/job/36614101657?pr=8016
@swolchokswolchokFeb 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think ET_KERNEL_CHECK will do the right thing in a lambda -- it returns from the lambda, not the operator
@mergennachinmergennachinFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestions on how to fix?
i think it's fine, since it will return void from the lambda, but sets context to be fail, with error code InvalidArgument.
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full_like.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,8 @@ Tensor& full_like_out(

 ET_SWITCH_REALB_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

2 changes: 1 addition & 1 deletion
kernels/portable/cpu/op_scatter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,7 +156,7 @@ Tensor& scatter_value_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(value, &val);
ET_KERNEL_CHECK(ctx, utils::extract_scalar(value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
 scatter_value_helper<CTYPE>(in, dim, index, val, out);
Expand Down

16 changes: 7 additions & 9 deletions
kernels/portable/cpu/util/broadcast_util.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,18 +215,16 @@ ET_NODISCARD Error get_broadcast_target_size(
 size_t* out_dim) {
 if ET_UNLIKELY (!tensors_are_broadcastable_between(a_size, b_size)) {
#ifdef ET_LOG_ENABLED
 const auto a_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 a_size.data(), a_size.size()));
 const auto b_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 b_size.data(), b_size.size()));
#endif
 executorch::runtime::Span<const Tensor::SizesType> a_size_span(
 a_size.data(), a_size.size());
 executorch::runtime::Span<const Tensor::SizesType> b_size_span(
 b_size.data(), b_size.size());
 ET_LOG(
 Error,
 "Two input tensors should be broadcastable but got shapes %s and %s.",
 a_shape_str.data(),
 b_shape_str.data());
 tensor_shape_to_c_string(a_size_span).data(),
 tensor_shape_to_c_string(b_size_span).data());
#endif
@digantdesaidigantdesaiFeb 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
 return executorch::runtime::Error::InvalidArgument;
 }

Expand Down

24 changes: 11 additions & 13 deletions
runtime/core/portable_type/tensor_impl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,20 +96,18 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
 case TensorShapeDynamism::STATIC:
 if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
#ifdef ET_LOG_ENABLED
 auto old_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 sizes().data(), sizes().size()));
 auto new_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 new_sizes.data(), new_sizes.size()));
#endif

 ET_CHECK_OR_RETURN_ERROR(
 false,
 NotSupported,
 executorch::runtime::Span<const SizesType> sizes_span(
 sizes().data(), sizes().size());
 executorch::runtime::Span<const SizesType> new_sizes_span(
 new_sizes.data(), new_sizes.size());
 ET_LOG(
 Error,
 "Attempted to resize a static tensor. Expected shape %s, but received %s.",
 old_sizes_str.data(),
 new_sizes_str.data())
 executorch::runtime::tensor_shape_to_c_string(sizes_span).data(),
 executorch::runtime::tensor_shape_to_c_string(new_sizes_span)
 .data());
#endif
 return executorch::runtime::Error::NotSupported;
 }

 break;
Expand Down

8 changes: 6 additions & 2 deletions
test/build_size_test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,15 @@ set -e
# shellcheck source=/dev/null
source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"

# TODO(#8149): Remove -Wno-sign-compare
# TODO(#8357): Remove -Wno-int-in-bool-context
COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Werror -Wno-sign-compare -Wno-unknown-pragmas -Wno-int-in-bool-context"

cmake_install_executorch_lib() {
 echo "Installing libexecutorch.a"
 clean_executorch_install_folders

 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DBUCK2="$BUCK2" \
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
 -DCMAKE_CXX_STANDARD_REQUIRED=ON \
 -DCMAKE_INSTALL_PREFIX=cmake-out \
 -DCMAKE_BUILD_TYPE=Release \
Expand All@@ -27,7 +31,7 @@ cmake_install_executorch_lib() {
}

test_cmake_size_test() {
 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test

 echo "Build size test"
 cmake --build cmake-out/test -j9 --config Release
Expand Down

, '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 > 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
Make sure size_test CI uses -Wall -Werror#8016

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

mergennachin
merged 1 commit into

from

Feb 11, 2025
 Merged


Make sure size_test CI uses -Wall -Werror
#8016
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,14 @@ must work with threading**

## Testing

### Running Tests Locally

CI is run automatically on all pull requests. However, if you want to run tests locally, here are some example commands (not exhaustive):

- The `sh test/build_size_test.sh` script will compile the C++runtime along with portable kernels.
- The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally
- Running `pytest` from the root directory will run Python tests locally.

### Writing Tests
To help keep code quality high, ExecuTorch uses a combination of unit tests and
end-to-end (e2e) tests. If you add a new feature or fix a bug, please add tests
Expand All@@ -229,8 +237,6 @@ If it's not clear how to add a test for your PR, take a look at the blame for
the code you're modifying and find an author who has more context. Ask them
for their help in the PR comments.

The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally.

### Continuous Integration
See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of
the CI (continuous integration) jobs. If `main` is broken, consider rebasing
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ Tensor& full_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
@mergennachinmergennachinFeb 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to adjust due to errors like this:
https://github.com/pytorch/executorch/actions/runs/13123283587/job/36614101657?pr=8016
@swolchokswolchokFeb 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think ET_KERNEL_CHECK will do the right thing in a lambda -- it returns from the lambda, not the operator
@mergennachinmergennachinFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestions on how to fix?
i think it's fine, since it will return void from the lambda, but sets context to be fail, with error code InvalidArgument.
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full_like.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,8 @@ Tensor& full_like_out(

 ET_SWITCH_REALB_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

2 changes: 1 addition & 1 deletion
kernels/portable/cpu/op_scatter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,7 +156,7 @@ Tensor& scatter_value_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(value, &val);
ET_KERNEL_CHECK(ctx, utils::extract_scalar(value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
 scatter_value_helper<CTYPE>(in, dim, index, val, out);
Expand Down

16 changes: 7 additions & 9 deletions
kernels/portable/cpu/util/broadcast_util.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,18 +215,16 @@ ET_NODISCARD Error get_broadcast_target_size(
 size_t* out_dim) {
 if ET_UNLIKELY (!tensors_are_broadcastable_between(a_size, b_size)) {
#ifdef ET_LOG_ENABLED
 const auto a_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 a_size.data(), a_size.size()));
 const auto b_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 b_size.data(), b_size.size()));
#endif
 executorch::runtime::Span<const Tensor::SizesType> a_size_span(
 a_size.data(), a_size.size());
 executorch::runtime::Span<const Tensor::SizesType> b_size_span(
 b_size.data(), b_size.size());
 ET_LOG(
 Error,
 "Two input tensors should be broadcastable but got shapes %s and %s.",
 a_shape_str.data(),
 b_shape_str.data());
 tensor_shape_to_c_string(a_size_span).data(),
 tensor_shape_to_c_string(b_size_span).data());
#endif
@digantdesaidigantdesaiFeb 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
 return executorch::runtime::Error::InvalidArgument;
 }

Expand Down

24 changes: 11 additions & 13 deletions
runtime/core/portable_type/tensor_impl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,20 +96,18 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
 case TensorShapeDynamism::STATIC:
 if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
#ifdef ET_LOG_ENABLED
 auto old_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 sizes().data(), sizes().size()));
 auto new_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 new_sizes.data(), new_sizes.size()));
#endif

 ET_CHECK_OR_RETURN_ERROR(
 false,
 NotSupported,
 executorch::runtime::Span<const SizesType> sizes_span(
 sizes().data(), sizes().size());
 executorch::runtime::Span<const SizesType> new_sizes_span(
 new_sizes.data(), new_sizes.size());
 ET_LOG(
 Error,
 "Attempted to resize a static tensor. Expected shape %s, but received %s.",
 old_sizes_str.data(),
 new_sizes_str.data())
 executorch::runtime::tensor_shape_to_c_string(sizes_span).data(),
 executorch::runtime::tensor_shape_to_c_string(new_sizes_span)
 .data());
#endif
 return executorch::runtime::Error::NotSupported;
 }

 break;
Expand Down

8 changes: 6 additions & 2 deletions
test/build_size_test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,15 @@ set -e
# shellcheck source=/dev/null
source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"

# TODO(#8149): Remove -Wno-sign-compare
# TODO(#8357): Remove -Wno-int-in-bool-context
COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Werror -Wno-sign-compare -Wno-unknown-pragmas -Wno-int-in-bool-context"

cmake_install_executorch_lib() {
 echo "Installing libexecutorch.a"
 clean_executorch_install_folders

 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DBUCK2="$BUCK2" \
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
 -DCMAKE_CXX_STANDARD_REQUIRED=ON \
 -DCMAKE_INSTALL_PREFIX=cmake-out \
 -DCMAKE_BUILD_TYPE=Release \
Expand All@@ -27,7 +31,7 @@ cmake_install_executorch_lib() {
}

test_cmake_size_test() {
 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test

 echo "Build size test"
 cmake --build cmake-out/test -j9 --config Release
Expand Down

, '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
Make sure size_test CI uses -Wall -Werror#8016

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

mergennachin
merged 1 commit into

from

Feb 11, 2025
 Merged


Make sure size_test CI uses -Wall -Werror
#8016
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,14 @@ must work with threading**

## Testing

### Running Tests Locally

CI is run automatically on all pull requests. However, if you want to run tests locally, here are some example commands (not exhaustive):

- The `sh test/build_size_test.sh` script will compile the C++runtime along with portable kernels.
- The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally
- Running `pytest` from the root directory will run Python tests locally.

### Writing Tests
To help keep code quality high, ExecuTorch uses a combination of unit tests and
end-to-end (e2e) tests. If you add a new feature or fix a bug, please add tests
Expand All@@ -229,8 +237,6 @@ If it's not clear how to add a test for your PR, take a look at the blame for
the code you're modifying and find an author who has more context. Ask them
for their help in the PR comments.

The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally.

### Continuous Integration
See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of
the CI (continuous integration) jobs. If `main` is broken, consider rebasing
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ Tensor& full_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
@mergennachinmergennachinFeb 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to adjust due to errors like this:
https://github.com/pytorch/executorch/actions/runs/13123283587/job/36614101657?pr=8016
@swolchokswolchokFeb 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think ET_KERNEL_CHECK will do the right thing in a lambda -- it returns from the lambda, not the operator
@mergennachinmergennachinFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestions on how to fix?
i think it's fine, since it will return void from the lambda, but sets context to be fail, with error code InvalidArgument.
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full_like.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,8 @@ Tensor& full_like_out(

 ET_SWITCH_REALB_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

2 changes: 1 addition & 1 deletion
kernels/portable/cpu/op_scatter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,7 +156,7 @@ Tensor& scatter_value_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(value, &val);
ET_KERNEL_CHECK(ctx, utils::extract_scalar(value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
 scatter_value_helper<CTYPE>(in, dim, index, val, out);
Expand Down

16 changes: 7 additions & 9 deletions
kernels/portable/cpu/util/broadcast_util.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,18 +215,16 @@ ET_NODISCARD Error get_broadcast_target_size(
 size_t* out_dim) {
 if ET_UNLIKELY (!tensors_are_broadcastable_between(a_size, b_size)) {
#ifdef ET_LOG_ENABLED
 const auto a_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 a_size.data(), a_size.size()));
 const auto b_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 b_size.data(), b_size.size()));
#endif
 executorch::runtime::Span<const Tensor::SizesType> a_size_span(
 a_size.data(), a_size.size());
 executorch::runtime::Span<const Tensor::SizesType> b_size_span(
 b_size.data(), b_size.size());
 ET_LOG(
 Error,
 "Two input tensors should be broadcastable but got shapes %s and %s.",
 a_shape_str.data(),
 b_shape_str.data());
 tensor_shape_to_c_string(a_size_span).data(),
 tensor_shape_to_c_string(b_size_span).data());
#endif
@digantdesaidigantdesaiFeb 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
 return executorch::runtime::Error::InvalidArgument;
 }

Expand Down

24 changes: 11 additions & 13 deletions
runtime/core/portable_type/tensor_impl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,20 +96,18 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
 case TensorShapeDynamism::STATIC:
 if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
#ifdef ET_LOG_ENABLED
 auto old_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 sizes().data(), sizes().size()));
 auto new_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 new_sizes.data(), new_sizes.size()));
#endif

 ET_CHECK_OR_RETURN_ERROR(
 false,
 NotSupported,
 executorch::runtime::Span<const SizesType> sizes_span(
 sizes().data(), sizes().size());
 executorch::runtime::Span<const SizesType> new_sizes_span(
 new_sizes.data(), new_sizes.size());
 ET_LOG(
 Error,
 "Attempted to resize a static tensor. Expected shape %s, but received %s.",
 old_sizes_str.data(),
 new_sizes_str.data())
 executorch::runtime::tensor_shape_to_c_string(sizes_span).data(),
 executorch::runtime::tensor_shape_to_c_string(new_sizes_span)
 .data());
#endif
 return executorch::runtime::Error::NotSupported;
 }

 break;
Expand Down

8 changes: 6 additions & 2 deletions
test/build_size_test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,15 @@ set -e
# shellcheck source=/dev/null
source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"

# TODO(#8149): Remove -Wno-sign-compare
# TODO(#8357): Remove -Wno-int-in-bool-context
COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Werror -Wno-sign-compare -Wno-unknown-pragmas -Wno-int-in-bool-context"

cmake_install_executorch_lib() {
 echo "Installing libexecutorch.a"
 clean_executorch_install_folders

 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DBUCK2="$BUCK2" \
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
 -DCMAKE_CXX_STANDARD_REQUIRED=ON \
 -DCMAKE_INSTALL_PREFIX=cmake-out \
 -DCMAKE_BUILD_TYPE=Release \
Expand All@@ -27,7 +31,7 @@ cmake_install_executorch_lib() {
}

test_cmake_size_test() {
 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test

 echo "Build size test"
 cmake --build cmake-out/test -j9 --config Release
Expand Down

, '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
Make sure size_test CI uses -Wall -Werror#8016

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

mergennachin
merged 1 commit into

from

Feb 11, 2025
 Merged


Make sure size_test CI uses -Wall -Werror
#8016
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,14 @@ must work with threading**

## Testing

### Running Tests Locally

CI is run automatically on all pull requests. However, if you want to run tests locally, here are some example commands (not exhaustive):

- The `sh test/build_size_test.sh` script will compile the C++runtime along with portable kernels.
- The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally
- Running `pytest` from the root directory will run Python tests locally.

### Writing Tests
To help keep code quality high, ExecuTorch uses a combination of unit tests and
end-to-end (e2e) tests. If you add a new feature or fix a bug, please add tests
Expand All@@ -229,8 +237,6 @@ If it's not clear how to add a test for your PR, take a look at the blame for
the code you're modifying and find an author who has more context. Ask them
for their help in the PR comments.

The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally.

### Continuous Integration
See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of
the CI (continuous integration) jobs. If `main` is broken, consider rebasing
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ Tensor& full_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
@mergennachinmergennachinFeb 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to adjust due to errors like this:
https://github.com/pytorch/executorch/actions/runs/13123283587/job/36614101657?pr=8016
@swolchokswolchokFeb 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think ET_KERNEL_CHECK will do the right thing in a lambda -- it returns from the lambda, not the operator
@mergennachinmergennachinFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestions on how to fix?
i think it's fine, since it will return void from the lambda, but sets context to be fail, with error code InvalidArgument.
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full_like.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,8 @@ Tensor& full_like_out(

 ET_SWITCH_REALB_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

2 changes: 1 addition & 1 deletion
kernels/portable/cpu/op_scatter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,7 +156,7 @@ Tensor& scatter_value_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(value, &val);
ET_KERNEL_CHECK(ctx, utils::extract_scalar(value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
 scatter_value_helper<CTYPE>(in, dim, index, val, out);
Expand Down

16 changes: 7 additions & 9 deletions
kernels/portable/cpu/util/broadcast_util.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,18 +215,16 @@ ET_NODISCARD Error get_broadcast_target_size(
 size_t* out_dim) {
 if ET_UNLIKELY (!tensors_are_broadcastable_between(a_size, b_size)) {
#ifdef ET_LOG_ENABLED
 const auto a_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 a_size.data(), a_size.size()));
 const auto b_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 b_size.data(), b_size.size()));
#endif
 executorch::runtime::Span<const Tensor::SizesType> a_size_span(
 a_size.data(), a_size.size());
 executorch::runtime::Span<const Tensor::SizesType> b_size_span(
 b_size.data(), b_size.size());
 ET_LOG(
 Error,
 "Two input tensors should be broadcastable but got shapes %s and %s.",
 a_shape_str.data(),
 b_shape_str.data());
 tensor_shape_to_c_string(a_size_span).data(),
 tensor_shape_to_c_string(b_size_span).data());
#endif
@digantdesaidigantdesaiFeb 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
 return executorch::runtime::Error::InvalidArgument;
 }

Expand Down

24 changes: 11 additions & 13 deletions
runtime/core/portable_type/tensor_impl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,20 +96,18 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
 case TensorShapeDynamism::STATIC:
 if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
#ifdef ET_LOG_ENABLED
 auto old_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 sizes().data(), sizes().size()));
 auto new_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 new_sizes.data(), new_sizes.size()));
#endif

 ET_CHECK_OR_RETURN_ERROR(
 false,
 NotSupported,
 executorch::runtime::Span<const SizesType> sizes_span(
 sizes().data(), sizes().size());
 executorch::runtime::Span<const SizesType> new_sizes_span(
 new_sizes.data(), new_sizes.size());
 ET_LOG(
 Error,
 "Attempted to resize a static tensor. Expected shape %s, but received %s.",
 old_sizes_str.data(),
 new_sizes_str.data())
 executorch::runtime::tensor_shape_to_c_string(sizes_span).data(),
 executorch::runtime::tensor_shape_to_c_string(new_sizes_span)
 .data());
#endif
 return executorch::runtime::Error::NotSupported;
 }

 break;
Expand Down

8 changes: 6 additions & 2 deletions
test/build_size_test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,15 @@ set -e
# shellcheck source=/dev/null
source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"

# TODO(#8149): Remove -Wno-sign-compare
# TODO(#8357): Remove -Wno-int-in-bool-context
COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Werror -Wno-sign-compare -Wno-unknown-pragmas -Wno-int-in-bool-context"

cmake_install_executorch_lib() {
 echo "Installing libexecutorch.a"
 clean_executorch_install_folders

 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DBUCK2="$BUCK2" \
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
 -DCMAKE_CXX_STANDARD_REQUIRED=ON \
 -DCMAKE_INSTALL_PREFIX=cmake-out \
 -DCMAKE_BUILD_TYPE=Release \
Expand All@@ -27,7 +31,7 @@ cmake_install_executorch_lib() {
}

test_cmake_size_test() {
 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test

 echo "Build size test"
 cmake --build cmake-out/test -j9 --config Release
Expand Down

, '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
Make sure size_test CI uses -Wall -Werror#8016

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

mergennachin
merged 1 commit into

from

Feb 11, 2025
 Merged


Make sure size_test CI uses -Wall -Werror
#8016
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,14 @@ must work with threading**

## Testing

### Running Tests Locally

CI is run automatically on all pull requests. However, if you want to run tests locally, here are some example commands (not exhaustive):

- The `sh test/build_size_test.sh` script will compile the C++runtime along with portable kernels.
- The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally
- Running `pytest` from the root directory will run Python tests locally.

### Writing Tests
To help keep code quality high, ExecuTorch uses a combination of unit tests and
end-to-end (e2e) tests. If you add a new feature or fix a bug, please add tests
Expand All@@ -229,8 +237,6 @@ If it's not clear how to add a test for your PR, take a look at the blame for
the code you're modifying and find an author who has more context. Ask them
for their help in the PR comments.

The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally.

### Continuous Integration
See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of
the CI (continuous integration) jobs. If `main` is broken, consider rebasing
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ Tensor& full_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
@mergennachinmergennachinFeb 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to adjust due to errors like this:
https://github.com/pytorch/executorch/actions/runs/13123283587/job/36614101657?pr=8016
@swolchokswolchokFeb 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think ET_KERNEL_CHECK will do the right thing in a lambda -- it returns from the lambda, not the operator
@mergennachinmergennachinFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestions on how to fix?
i think it's fine, since it will return void from the lambda, but sets context to be fail, with error code InvalidArgument.
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full_like.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,8 @@ Tensor& full_like_out(

 ET_SWITCH_REALB_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

2 changes: 1 addition & 1 deletion
kernels/portable/cpu/op_scatter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,7 +156,7 @@ Tensor& scatter_value_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(value, &val);
ET_KERNEL_CHECK(ctx, utils::extract_scalar(value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
 scatter_value_helper<CTYPE>(in, dim, index, val, out);
Expand Down

16 changes: 7 additions & 9 deletions
kernels/portable/cpu/util/broadcast_util.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,18 +215,16 @@ ET_NODISCARD Error get_broadcast_target_size(
 size_t* out_dim) {
 if ET_UNLIKELY (!tensors_are_broadcastable_between(a_size, b_size)) {
#ifdef ET_LOG_ENABLED
 const auto a_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 a_size.data(), a_size.size()));
 const auto b_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 b_size.data(), b_size.size()));
#endif
 executorch::runtime::Span<const Tensor::SizesType> a_size_span(
 a_size.data(), a_size.size());
 executorch::runtime::Span<const Tensor::SizesType> b_size_span(
 b_size.data(), b_size.size());
 ET_LOG(
 Error,
 "Two input tensors should be broadcastable but got shapes %s and %s.",
 a_shape_str.data(),
 b_shape_str.data());
 tensor_shape_to_c_string(a_size_span).data(),
 tensor_shape_to_c_string(b_size_span).data());
#endif
@digantdesaidigantdesaiFeb 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
 return executorch::runtime::Error::InvalidArgument;
 }

Expand Down

24 changes: 11 additions & 13 deletions
runtime/core/portable_type/tensor_impl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,20 +96,18 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
 case TensorShapeDynamism::STATIC:
 if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
#ifdef ET_LOG_ENABLED
 auto old_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 sizes().data(), sizes().size()));
 auto new_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 new_sizes.data(), new_sizes.size()));
#endif

 ET_CHECK_OR_RETURN_ERROR(
 false,
 NotSupported,
 executorch::runtime::Span<const SizesType> sizes_span(
 sizes().data(), sizes().size());
 executorch::runtime::Span<const SizesType> new_sizes_span(
 new_sizes.data(), new_sizes.size());
 ET_LOG(
 Error,
 "Attempted to resize a static tensor. Expected shape %s, but received %s.",
 old_sizes_str.data(),
 new_sizes_str.data())
 executorch::runtime::tensor_shape_to_c_string(sizes_span).data(),
 executorch::runtime::tensor_shape_to_c_string(new_sizes_span)
 .data());
#endif
 return executorch::runtime::Error::NotSupported;
 }

 break;
Expand Down

8 changes: 6 additions & 2 deletions
test/build_size_test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,15 @@ set -e
# shellcheck source=/dev/null
source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"

# TODO(#8149): Remove -Wno-sign-compare
# TODO(#8357): Remove -Wno-int-in-bool-context
COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Werror -Wno-sign-compare -Wno-unknown-pragmas -Wno-int-in-bool-context"

cmake_install_executorch_lib() {
 echo "Installing libexecutorch.a"
 clean_executorch_install_folders

 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DBUCK2="$BUCK2" \
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
 -DCMAKE_CXX_STANDARD_REQUIRED=ON \
 -DCMAKE_INSTALL_PREFIX=cmake-out \
 -DCMAKE_BUILD_TYPE=Release \
Expand All@@ -27,7 +31,7 @@ cmake_install_executorch_lib() {
}

test_cmake_size_test() {
 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test

 echo "Build size test"
 cmake --build cmake-out/test -j9 --config Release
Expand Down

, '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
Make sure size_test CI uses -Wall -Werror#8016

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

mergennachin
merged 1 commit into

from

Feb 11, 2025
 Merged


Make sure size_test CI uses -Wall -Werror
#8016
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 8 additions & 2 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,14 @@ must work with threading**

## Testing

### Running Tests Locally

CI is run automatically on all pull requests. However, if you want to run tests locally, here are some example commands (not exhaustive):

- The `sh test/build_size_test.sh` script will compile the C++runtime along with portable kernels.
- The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally
- Running `pytest` from the root directory will run Python tests locally.

### Writing Tests
To help keep code quality high, ExecuTorch uses a combination of unit tests and
end-to-end (e2e) tests. If you add a new feature or fix a bug, please add tests
Expand All@@ -229,8 +237,6 @@ If it's not clear how to add a test for your PR, take a look at the blame for
the code you're modifying and find an author who has more context. Ask them
for their help in the PR comments.

The `test/run_oss_cpp_tests.sh` script will build and run C++ tests locally.

### Continuous Integration
See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of
the CI (continuous integration) jobs. If `main` is broken, consider rebasing
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ Tensor& full_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
@mergennachinmergennachinFeb 3, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to adjust due to errors like this:
https://github.com/pytorch/executorch/actions/runs/13123283587/job/36614101657?pr=8016
@swolchokswolchokFeb 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think ET_KERNEL_CHECK will do the right thing in a lambda -- it returns from the lambda, not the operator
@mergennachinmergennachinFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestions on how to fix?
i think it's fine, since it will return void from the lambda, but sets context to be fail, with error code InvalidArgument.
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

3 changes: 2 additions & 1 deletion
kernels/portable/cpu/op_full_like.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,8 @@ Tensor& full_like_out(

 ET_SWITCH_REALB_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(fill_value, &val);
 ET_KERNEL_CHECK(
 ctx, utils::extract_scalar(fill_value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
 CTYPE_OUT val_casted = static_cast<CTYPE_OUT>(val);
Expand Down

2 changes: 1 addition & 1 deletion
kernels/portable/cpu/op_scatter.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,7 +156,7 @@ Tensor& scatter_value_out(

 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, name, CTYPE_VAL, [&] {
 CTYPE_VAL val;
 utils::extract_scalar(value, &val);
ET_KERNEL_CHECK(ctx, utils::extract_scalar(value, &val), InvalidArgument, );

 ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
 scatter_value_helper<CTYPE>(in, dim, index, val, out);
Expand Down

16 changes: 7 additions & 9 deletions
kernels/portable/cpu/util/broadcast_util.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,18 +215,16 @@ ET_NODISCARD Error get_broadcast_target_size(
 size_t* out_dim) {
 if ET_UNLIKELY (!tensors_are_broadcastable_between(a_size, b_size)) {
#ifdef ET_LOG_ENABLED
 const auto a_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 a_size.data(), a_size.size()));
 const auto b_shape_str = tensor_shape_to_c_string(
 executorch::runtime::Span<const Tensor::SizesType>(
 b_size.data(), b_size.size()));
#endif
 executorch::runtime::Span<const Tensor::SizesType> a_size_span(
 a_size.data(), a_size.size());
 executorch::runtime::Span<const Tensor::SizesType> b_size_span(
 b_size.data(), b_size.size());
 ET_LOG(
 Error,
 "Two input tensors should be broadcastable but got shapes %s and %s.",
 a_shape_str.data(),
 b_shape_str.data());
 tensor_shape_to_c_string(a_size_span).data(),
 tensor_shape_to_c_string(b_size_span).data());
#endif
@digantdesaidigantdesaiFeb 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
 return executorch::runtime::Error::InvalidArgument;
 }

Expand Down

24 changes: 11 additions & 13 deletions
runtime/core/portable_type/tensor_impl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,20 +96,18 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
 case TensorShapeDynamism::STATIC:
 if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
#ifdef ET_LOG_ENABLED
 auto old_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 sizes().data(), sizes().size()));
 auto new_sizes_str = executorch::runtime::tensor_shape_to_c_string(
 executorch::runtime::Span<const SizesType>(
 new_sizes.data(), new_sizes.size()));
#endif

 ET_CHECK_OR_RETURN_ERROR(
 false,
 NotSupported,
 executorch::runtime::Span<const SizesType> sizes_span(
 sizes().data(), sizes().size());
 executorch::runtime::Span<const SizesType> new_sizes_span(
 new_sizes.data(), new_sizes.size());
 ET_LOG(
 Error,
 "Attempted to resize a static tensor. Expected shape %s, but received %s.",
 old_sizes_str.data(),
 new_sizes_str.data())
 executorch::runtime::tensor_shape_to_c_string(sizes_span).data(),
 executorch::runtime::tensor_shape_to_c_string(new_sizes_span)
 .data());
#endif
 return executorch::runtime::Error::NotSupported;
 }

 break;
Expand Down

8 changes: 6 additions & 2 deletions
test/build_size_test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,15 @@ set -e
# shellcheck source=/dev/null
source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"

# TODO(#8149): Remove -Wno-sign-compare
# TODO(#8357): Remove -Wno-int-in-bool-context
COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Werror -Wno-sign-compare -Wno-unknown-pragmas -Wno-int-in-bool-context"

cmake_install_executorch_lib() {
 echo "Installing libexecutorch.a"
 clean_executorch_install_folders

 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DBUCK2="$BUCK2" \
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
 -DCMAKE_CXX_STANDARD_REQUIRED=ON \
 -DCMAKE_INSTALL_PREFIX=cmake-out \
 -DCMAKE_BUILD_TYPE=Release \
Expand All@@ -27,7 +31,7 @@ cmake_install_executorch_lib() {
}

test_cmake_size_test() {
 CXXFLAGS="-fno-exceptions -fno-rtti" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
 CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test

 echo "Build size test"
 cmake --build cmake-out/test -j9 --config Release
Expand Down