Skip to content

Respect selective build for dtype_specialized_elementwise_fn_impl in elementwise_util #11975

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2025
Merged

Respect selective build for dtype_specialized_elementwise_fn_impl in elementwise_util #11975

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
65ff10b
Update
swolchok Jun 25, 2025
e7fce3d
fix buck dep
swolchok Jun 25, 2025
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
31 changes: 17 additions & 14 deletions kernels/portable/cpu/util/elementwise_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#pragma once

#include <c10/util/irange.h>
#include <executorch/kernels/portable/cpu/selective_build.h>
#include <executorch/kernels/portable/cpu/util/broadcast_indexes_range.h>
#include <executorch/kernels/portable/cpu/util/broadcast_util.h>
#include <executorch/kernels/portable/cpu/util/dtype_util.h>
Expand Down Expand Up @@ -345,20 +346,22 @@ inline void apply_elementwise_fn(
}

constexpr auto compute_type = CppTypeToScalarType<CTYPE_COMPUTE>::value;
const bool all_inputs_compute_dtype =
((inputs.first->scalar_type() == compute_type) && ...);

constexpr ScalarType out_specialized_scalar_type =
specialized_output_scalar_type<CTYPE_COMPUTE>(out_dtypes);
if (all_inputs_compute_dtype &&
out.scalar_type() == out_specialized_scalar_type) {
using CTYPE_OUT =
typename ScalarTypeToCppType<out_specialized_scalar_type>::type;
dtype_specialized_elementwise_fn_impl<
CTYPE_COMPUTE,
CTYPE_OUT,
support_noncontiguous_tensors>(compute_fun, ctx, out, inputs...);
return;
if constexpr (should_include_kernel_dtype(op_name, compute_type)) {
Copy link
Contributor Author

@swolchok swolchok Jul 2, 2025

Choose a reason for hiding this comment

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

I think I got this wrong. Talked to @lucylq and she confirmed that dtype selective build is about input and output tensor types, not the compute type. My plan is to fix this on main (see PR #12183 ) and to just revert this PR from the release branch for safety.

const bool all_inputs_compute_dtype =
((inputs.first->scalar_type() == compute_type) && ...);

constexpr ScalarType out_specialized_scalar_type =
specialized_output_scalar_type<CTYPE_COMPUTE>(out_dtypes);
if (all_inputs_compute_dtype &&
out.scalar_type() == out_specialized_scalar_type) {
using CTYPE_OUT =
typename ScalarTypeToCppType<out_specialized_scalar_type>::type;
dtype_specialized_elementwise_fn_impl<
CTYPE_COMPUTE,
CTYPE_OUT,
support_noncontiguous_tensors>(compute_fun, ctx, out, inputs...);
return;
}
}

apply_elementwise_fn_generic_impl<
Expand Down
2 changes: 1 addition & 1 deletion kernels/portable/cpu/util/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ def define_common_targets():
":vectorized_math",
"//executorch/runtime/core/portable_type/c10/c10:aten_headers_for_executorch",
"//executorch/runtime/kernel:kernel_runtime_context",
"//executorch/kernels/portable/cpu:scalar_utils",
"//executorch/extension/threadpool:threadpool",
],
deps = [
"//executorch/kernels/portable/cpu:scalar_utils",
"//executorch/runtime/kernel:kernel_includes",
],
visibility = ["//executorch/kernels/portable/cpu/...", "//executorch/kernels/optimized/cpu/...", "@EXECUTORCH_CLIENTS"],
Expand Down
Loading