vulkan solution 2

Author: kirklandsign

CMakeLists.txt

@@ -577,6 +577,15 @@ endif()
 
 add_library(executorch_core ${_executorch_core__srcs})
 
+add_library(executorch_headers INTERFACE)
+
+target_include_directories(executorch_headers INTERFACE
+    ${_common_include_directories}
+)
+target_compile_definitions(executorch_headers INTERFACE C10_USING_CUSTOM_GENERATED_MACROS)
+
+add_library(executorch_jni SHARED extension/android/empty.cpp)
+
 # Legacy name alias.
 add_library(executorch_no_prim_ops ALIAS executorch_core)
 
@@ -631,12 +640,15 @@ endif()
 # Does not contain portable kernels or other full operators. Does not contain
 # any backends.
 #
-add_library(executorch ${_executorch__srcs})
-target_link_libraries(executorch PUBLIC executorch_core)
+add_library(executorch SHARED ${_executorch__srcs})
+target_link_libraries(executorch PRIVATE executorch_core)
 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})
-target_link_options_shared_lib(executorch)
+# target_link_options_shared_lib(executorch)
+target_link_options(executorch PRIVATE "-Wl,-soname,libexecutorch_jni.so")
+set_target_properties(executorch PROPERTIES NO_SONAME TRUE)
+target_link_options_shared_lib(executorch_core)
 
 #
 # portable_ops_lib: A library to register core ATen ops using portable kernels,

backends/vulkan/CMakeLists.txt

@@ -109,7 +109,7 @@ file(GLOB vulkan_backend_cpp ${RUNTIME_PATH}/*.cpp)
 list(APPEND vulkan_backend_cpp ${vulkan_graph_cpp})
 list(APPEND vulkan_backend_cpp ${vulkan_standard_shaders_cpp})
 
-add_library(vulkan_backend STATIC ${vulkan_backend_cpp})
+add_library(vulkan_backend SHARED ${vulkan_backend_cpp})
 target_include_directories(
   vulkan_backend PRIVATE ${SCHEMA_INCLUDE_DIR} ${COMMON_INCLUDES}
 )
@@ -119,7 +119,6 @@ target_compile_options(vulkan_backend PRIVATE ${VULKAN_CXX_FLAGS})
 target_link_options_shared_lib(vulkan_backend)
 
 set_property(TARGET vulkan_backend PROPERTY CXX_STANDARD 17)
-
 # Executor Runner
 
 if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")

extension/android/CMakeLists.txt

@@ -105,11 +105,6 @@ if(TARGET xnnpack_backend)
   list(APPEND link_libraries xnnpack_backend XNNPACK pthreadpool cpuinfo microkernels-prod)
 endif()
 
-if(TARGET vulkan_backend)
-  target_link_options_shared_lib(vulkan_backend)
-  list(APPEND link_libraries vulkan_backend)
-endif()
-
 if(EXECUTORCH_BUILD_KERNELS_CUSTOM)
   list(APPEND link_libraries $<LINK_LIBRARY:WHOLE_ARCHIVE,custom_ops>)
 endif()

extension/android/executorch_android/src/androidTest/java/org/pytorch/executorch/ModuleInstrumentationTest.java

@@ -38,7 +38,7 @@
 /** Unit tests for {@link Module}. */
 @RunWith(AndroidJUnit4.class)
 public class ModuleInstrumentationTest {
-    private static String TEST_FILE_NAME = "/add.pte";
+    private static String TEST_FILE_NAME = "/vk_add.pte";
     private static String MISSING_FILE_NAME = "/missing.pte";
     private static String NON_PTE_FILE_NAME = "/test.txt";
     private static String FORWARD_METHOD = "forward";

extension/android/executorch_android/src/main/java/org/pytorch/executorch/NativePeer.java

@@ -23,6 +23,7 @@ class NativePeer {
   static {
     // Loads libexecutorch.so from jniLibs
     NativeLoader.loadLibrary("executorch");
+    NativeLoader.loadLibrary("vulkan_backend");
   }
 
   private final HybridData mHybridData;

scripts/build_android_library.sh

@@ -38,6 +38,7 @@ build_android_native_library() {
     -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \
     -DANDROID_ABI="${ANDROID_ABI}" \
     -DANDROID_PLATFORM=android-26 \
+    -DANDROID_ALLOW_UNDEFINED_SYMBOLS=OFF \
     -DBUILD_TESTING=OFF \
     -DEXECUTORCH_ENABLE_LOGGING=ON \
     -DEXECUTORCH_LOG_LEVEL=Info \
@@ -86,6 +87,7 @@ build_android_native_library() {
   local SO_STAGE_DIR="cmake-out-android-so/${ANDROID_ABI}"
   mkdir -p ${SO_STAGE_DIR}
   cp "${CMAKE_OUT}"/extension/android/*.so "${SO_STAGE_DIR}/libexecutorch.so"
+  cp "${CMAKE_OUT}"/lib/libvulkan_backend.so "${SO_STAGE_DIR}/" || true
 
   # Copy QNN related so library
   if [ -n "$QNN_SDK_ROOT" ] && [ "$ANDROID_ABI" == "arm64-v8a" ]; then