Update

[ghstack-poisoned]

Author: shoumikhin

.ci/scripts/test_cpp_sdk_wheel.sh

@@ -128,7 +128,6 @@ cat > main.cpp <<'CPP'
 #include <executorch/extension/flat_tensor/flat_tensor_data_map.h>
 #include <executorch/extension/named_data_map/merged_data_map.h>
 #include <executorch/extension/module/module.h>
-#include <executorch/extension/named_data_map/merged_data_map.h>
 #include <executorch/extension/tensor/tensor.h>
 #include <executorch/runtime/backend/interface.h>
 #include <executorch/runtime/platform/runtime.h>

CMakeLists.txt

@@ -1441,10 +1441,6 @@ if(EXECUTORCH_BUILD_SHARED AND _executorch_kernels)
   target_link_libraries(
     executorch_kernels_shared PRIVATE executorch_shared ${_executorch_kernels}
   )
-  # No EXPORT set: the .so is shipped by setup.py (BuiltSharedLib file copy) and
-  # found via find_library in executorch-wheel-config.cmake, so it must not also
-  # join ExecuTorchTargets (that double-registers the target).
-  install(TARGETS executorch_kernels_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
 install(TARGETS executorch_backends executorch_extensions executorch_kernels

setup.py

@@ -542,14 +542,14 @@ def inplace_dir(self, installer: "InstallerBuildExt") -> Path:
 
 
 class BuiltSharedLib(BuiltFile):
-    """Installs a SONAME-versioned shared library plus its symlink chain.
-
-    A normal ``BuiltFile`` copies one file. A shared library like
-    ``libexecutorch.so.1.4.0`` also needs the loader-visible SONAME symlink
-    (``libexecutorch.so.1``) and the developer symlink (``libexecutorch.so``),
-    or a consumer that links ``-lexecutorch`` fails at runtime because the
-    SONAME recorded in dependents cannot be found. This recreates that chain in
-    the wheel, matching a standard ``cmake --install`` layout.
+    """Installs a SONAME-versioned shared library.
+
+    A normal ``BuiltFile`` copies one file. For a shared library like
+    ``libexecutorch.so.1.4.0`` the wheel ships only the loader-visible SONAME
+    file (e.g. ``libexecutorch.so.1``), which is what dependents record via
+    DT_NEEDED. pip does not preserve symlinks, so a dev-name link
+    (``libexecutorch.so``) would become a second full copy; consumers link
+    through the CMake package's imported targets (full path), so it is omitted.
     """
 
     def __init__(

tools/cmake/executorch-wheel-config.cmake

@@ -142,12 +142,16 @@ set(_executorch_sdk_libdir "${_executorch_sdk_root}/lib")
 # against libexecutorch.so at load), then force-loaded so its static-init
 # registration runs.
 set(EXECUTORCH_SDK_FOUND OFF)
-find_library(
-  _executorch_shared_LIBRARY
-  NAMES executorch libexecutorch.so.1
-  PATHS "${_executorch_sdk_libdir}"
-  NO_DEFAULT_PATH
+# Discover the versioned SONAME (libexecutorch.so.<major>) rather than
+# hardcoding a major, so this keeps working across ABI bumps. The wheel ships
+# only the real SONAME file (no dev-name symlink), so find_library(NAMES
+# executorch) alone would miss it.
+file(GLOB _executorch_shared_candidates
+     "${_executorch_sdk_libdir}/libexecutorch.so.*"
 )
+if(_executorch_shared_candidates)
+  list(GET _executorch_shared_candidates 0 _executorch_shared_LIBRARY)
+endif()
 if(_executorch_shared_LIBRARY)
   set(EXECUTORCH_SDK_FOUND ON)
   if(NOT TARGET executorch::runtime)
@@ -184,12 +188,14 @@ if(_executorch_shared_LIBRARY)
   # links executorch::kernels for a full CPU operator set (optimized + portable
   # fallback). Defined only when the kernels .so is present. Loaded purely for
   # its op-registration static initializers, so force it to stay linked.
-  find_library(
-    _executorch_kernels_LIBRARY
-    NAMES executorch_kernels libexecutorch_kernels.so.1
-    PATHS "${_executorch_sdk_libdir}"
-    NO_DEFAULT_PATH
+  # Discover the versioned SONAME rather than hardcoding a major (see the
+  # runtime lookup above).
+  file(GLOB _executorch_kernels_candidates
+       "${_executorch_sdk_libdir}/libexecutorch_kernels.so.*"
   )
+  if(_executorch_kernels_candidates)
+    list(GET _executorch_kernels_candidates 0 _executorch_kernels_LIBRARY)
+  endif()
   if(_executorch_kernels_LIBRARY AND NOT TARGET executorch::kernels)
     add_library(executorch::kernels SHARED IMPORTED)
     set_target_properties(