Update

[ghstack-poisoned]

Author: shoumikhin

.ci/scripts/wheel/test_cpp_sdk.py

@@ -553,14 +553,12 @@ def test_consumer_is_relocatable(work_dir: Path) -> None:
     shutil.copy2(consumer, deployed / "consumer")
     # Every directory the wheel ships a library in, not just lib/. The CUDA delegate records a
     # dependency on a library under backends/cuda/, so copying lib/ alone produced a deployment
-    # that cannot start, and this check could not see it.
-    for source in ("lib", "backends/cuda"):
-        directory = package_dir / source
-        if not directory.is_dir():
-            continue
-        for library in sorted(directory.glob("lib*.so*")):
-            if library.is_file() and not library.is_symlink():
-                shutil.copy2(library, deployed / library.name)
+    # that cannot start, and this check could not see it. Searched for rather than named, because
+    # a backend that ships its own library in a new directory would otherwise be left out of the
+    # copy and this check would pass on a deployment that cannot start.
+    for library in sorted(package_dir.rglob("lib*.so*")):
+        if library.is_file() and not library.is_symlink():
+            shutil.copy2(library, deployed / library.name)
 
     moved = deployed / "consumer"
     # Strip the absolute entry the build left behind, so only $ORIGIN can resolve the
@@ -839,6 +837,11 @@ def test_every_shipped_header_compiles(work_dir: Path) -> None:
     # package: a platform that is not the one being built for, or a third-party library the wheel does not
     # carry. They ship because a source build includes them, and holding them to this rule would report a
     # defect with no available fix.
+    #
+    # Not the same list as the packaging one that decides which headers ship at all. That list removes a
+    # header no shipped header includes; this one keeps a header that has to ship because something else
+    # includes it, and skips only the attempt to compile it on its own. A header belongs in exactly one of
+    # the two.
     needs_more_than_the_wheel = (
         # These ship because other shipped headers include them, so they cannot be left out, and they do
         # not compile on their own: each needs a third-party library the wheel links but publishes no

docs/source/using-executorch-cpp.md

@@ -184,7 +184,6 @@ targets you need instead.
 
 ### Building from source
 
-
 ExecuTorch uses CMake as the primary build system. Inclusion of the module and tensor APIs are controlled by the `EXECUTORCH_BUILD_EXTENSION_MODULE` and `EXECUTORCH_BUILD_EXTENSION_TENSOR` CMake options. As these APIs may not be supported on embedded systems, they are disabled by default when building from source. The low-level API surface is always included. To link, add the `executorch` target as a CMake dependency, along with `executorch_backends`, `executorch_extensions`, and `extension_kernels`, to link all configured backends, extensions, and kernels.
 
 ```

setup.py

@@ -94,14 +94,15 @@
 # helper or removed the utility everything needs.
 #
 # Only headers that nothing else the wheel installs includes belong here. A header other shipped headers
-# pull in must keep shipping even when it cannot be compiled on its own.
+# pull in must keep shipping even when it cannot be compiled on its own. Those are the ones listed
+# separately in the release test's own exemptions, which skip the compile check for a header that has to
+# ship anyway. The two lists are deliberately different: this one decides what ships, that one decides
+# what is compiled on its own.
 _UNSHIPPABLE_HEADERS = frozenset(
     {
         # Needs a header generated when the schema is compiled, which in turn needs the FlatBuffers C++
         # headers. Those are a third-party library this wheel does not vendor.
         "runtime/executor/tensor_parser.h",
-        # A test helper, needing a test framework the wheel does not ship.
-        "runtime/core/testing_util/error_matchers.h",
         # Reads processor details through cpuinfo, whose headers the wheel does not publish.
         "extension/threadpool/cpuinfo_utils.h",
         # Holds a pthreadpool member by value, so it needs that library's header, which the wheel does not

tools/cmake/executorch-wheel-config.cmake

@@ -353,9 +353,6 @@ elseif(_executorch_runtime_library)
   # target twice is an error, so only define it once and set the properties
   # either way.
   if(TARGET executorch::runtime)
-    # This file ran already in the same configure, because another subproject
-    # also called find_package. Redefining the target would be an error, so keep
-    # the one that is already there.
     message(
       STATUS "executorch: executorch::runtime is already defined, reusing it"
     )