Skip to content

[release/0.7 only] Fix check_c10_sync being out of sync #12252

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
Parent: Test PR , do not commit
merged 1 commit into from
Jul 8, 2025
Merged

[release/0.7 only] Fix check_c10_sync being out of sync #12252

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
2 changes: 1 addition & 1 deletion .ci/scripts/check_c10_sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ pushd pytorch
git checkout "$pytorch_pin"
popd
"$(dirname "${BASH_SOURCE[0]}")"/compare_dirs.sh runtime/core/portable_type/c10/c10 pytorch/c10
"$(dirname "${BASH_SOURCE[0]}")"/compare_dirs.sh runtime/core/portable_type/c10/torch/standalone pytorch/torch/standalone
"$(dirname "${BASH_SOURCE[0]}")"/compare_dirs.sh runtime/core/portable_type/c10/torch/headeronly pytorch/torch/headeronly
2 changes: 1 addition & 1 deletion runtime/core/portable_type/c10/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ would cause all headers in that directory to be includeable with
`runtime/core/portable_type/complex.h`, which would shadow the C99
`complex.h` standard header.

`torch/standalone` has been added as an extra "even more bottom of
`torch/headeronly` has been added as an extra "even more bottom of
stack" directory in PyTorch, so we have to add it to our sync
here. The extra "stutter" c10 directory causing `c10/torch/standlone`
is unfortunately awkward; perhaps we can rename the top-level
Expand Down
2 changes: 1 addition & 1 deletion runtime/core/portable_type/c10/c10/macros/Export.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <c10/macros/cmake_macros.h>
#endif // C10_USING_CUSTOM_GENERATED_MACROS

#include <torch/standalone/macros/Export.h>
#include <torch/headeronly/macros/Export.h>

// This one is being used by libtorch.so
#ifdef CAFFE2_BUILD_MAIN_LIB
Expand Down
2 changes: 1 addition & 1 deletion runtime/core/portable_type/c10/c10/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def define_common_targets():
"@EXECUTORCH_CLIENTS",
],
exported_deps = [
"//executorch/runtime/core/portable_type/c10/torch/standalone:torch_standalone_headers",
"//executorch/runtime/core/portable_type/c10/torch/headeronly:torch_headeronly",
] + select({
"DEFAULT": [],
# Half-inl.h depends on vec_half.h from ATen, but only when building for x86.
Expand Down
0 ...ortable_type/c10/torch/standalone/TARGETS → ...ortable_type/c10/torch/headeronly/TARGETS
View file
Open in desktop
File renamed without changes.
0 ...type/c10/torch/standalone/macros/Export.h → ...type/c10/torch/headeronly/macros/Export.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ble_type/c10/torch/standalone/targets.bzl → ...ble_type/c10/torch/headeronly/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def define_common_targets():
"""

runtime.cxx_library(
name = "torch_standalone_headers",
name = "torch_headeronly",
exported_headers = glob(["**/*.h"]),
header_namespace = "torch/standalone",
header_namespace = "torch/headeronly",
)
2 changes: 1 addition & 1 deletion scripts/build_apple_frameworks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ sed -i '' '1i\
' \
"$HEADERS_ABSOLUTE_PATH/executorch/runtime/core/portable_type/c10/c10/macros/Macros.h" \
"$HEADERS_ABSOLUTE_PATH/executorch/runtime/core/portable_type/c10/c10/macros/Export.h" \
"$HEADERS_ABSOLUTE_PATH/executorch/runtime/core/portable_type/c10/torch/standalone/macros/Export.h"
"$HEADERS_ABSOLUTE_PATH/executorch/runtime/core/portable_type/c10/torch/headeronly/macros/Export.h"

cp -r $HEADERS_ABSOLUTE_PATH/executorch/runtime/core/portable_type/c10/c10 "$HEADERS_ABSOLUTE_PATH/"
cp -r $HEADERS_ABSOLUTE_PATH/executorch/runtime/core/portable_type/c10/torch "$HEADERS_ABSOLUTE_PATH/"
Expand Down
Loading