Skip to content

executorch-the-CMake-target should re-export executorch_core, shouldn't it? #8404

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2025
Merged

executorch-the-CMake-target should re-export executorch_core, shouldn't it? #8404

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
d5887fc
Update
swolchok Feb 12, 2025
aa28e1c
Update
swolchok Feb 12, 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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ endif()
# any backends.
#
add_library(executorch ${_executorch__srcs})
target_link_libraries(executorch PRIVATE executorch_core)
target_link_libraries(executorch PUBLIC executorch_core)
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not quite sure how this change fixes the error, but looks like CI is green

target_include_directories(executorch PUBLIC ${_common_include_directories})
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
target_compile_options(executorch PUBLIC ${_common_compile_options})
Expand Down
2 changes: 1 addition & 1 deletion kernels/portable/cpu/util/advanced_index_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ bool check_mask_indices(const Tensor& in, TensorOptList indices) {
index.dim() > 0, "Zero-dimensional mask index not allowed");
for (auto j = 0; j < index.dim(); j++) {
if (index.size(j) != in.size(in_i + j)) {
#ifdef ET_LOG_ENABLED
#if ET_LOG_ENABLED
auto mask_shape = executorch::runtime::tensor_shape_to_c_string(
executorch::runtime::Span<const Tensor::SizesType>(
index.sizes().data(), index.sizes().size()));
Expand Down
2 changes: 1 addition & 1 deletion kernels/portable/cpu/util/broadcast_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ ET_NODISCARD Error get_broadcast_target_size(
const size_t out_sizes_len,
size_t* out_dim) {
if ET_UNLIKELY (!tensors_are_broadcastable_between(a_size, b_size)) {
#ifdef ET_LOG_ENABLED
#if ET_LOG_ENABLED
executorch::runtime::Span<const Tensor::SizesType> a_size_span(
a_size.data(), a_size.size());
executorch::runtime::Span<const Tensor::SizesType> b_size_span(
Expand Down
2 changes: 1 addition & 1 deletion runtime/core/portable_type/tensor_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
switch (shape_dynamism_) {
case TensorShapeDynamism::STATIC:
if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
#ifdef ET_LOG_ENABLED
#if ET_LOG_ENABLED
executorch::runtime::Span<const SizesType> sizes_span(
sizes().data(), sizes().size());
executorch::runtime::Span<const SizesType> new_sizes_span(
Expand Down
Loading