More fix

Author: larryliu0820

.github/workflows/pull.yml

@@ -351,6 +351,7 @@ jobs:
 
         # reinstall executorch
         bash ./install_executorch.sh --minimal
+        pip list
 
         # run python unittest
         python -m unittest examples.models.moshi.mimi.test_mimi

CMakeLists.txt

@@ -882,23 +882,14 @@ if(EXECUTORCH_BUILD_PYBIND)
   # torch/lib. Don't do this to APPLE, as it will error out on the following
   # error:
   #
-  get_target_property(_rpath portable_lib INSTALL_RPATH)
-  if(NOT _rpath)
-    if(APPLE)
-      set_target_properties(
-        portable_lib PROPERTIES BUILD_RPATH "@loader_path/../../../torch/lib"
-                                INSTALL_RPATH "@loader_path/../../../torch/lib"
-      )
-    else()
-      set_target_properties(
-        portable_lib PROPERTIES BUILD_RPATH "$ORIGIN/../../../torch/lib"
-                                INSTALL_RPATH "$ORIGIN/../../../torch/lib"
-      )
-    endif()
+  if(APPLE)
+    # Skip setting @loader_path for APPLE, since it causes error like ld:
+    # duplicate LC_RPATH '@loader_path' in '<site-packages>/torch/lib/
+    # libtorch_cpu.dylib'
   else()
-    message(
-      STATUS
-        "Skipping setting RPATH for portable_lib on Apple platforms, found: ${_rpath}"
+    set_target_properties(
+      portable_lib PROPERTIES BUILD_RPATH "$ORIGIN/../../../torch/lib"
+                              INSTALL_RPATH "$ORIGIN/../../../torch/lib"
     )
   endif()
 

backends/cuda/runtime/cuda_backend.cpp

@@ -72,10 +72,13 @@ class ET_EXPERIMENTAL CudaBackend final
     LOAD_SYMBOL(run, AOTInductorModelContainerRun);
 #undef LOAD_SYMBOL
 
-    handle->update_constants_from_blob =
-        reinterpret_cast<AOTInductorModelUpdateConstantsFromBlobFunc>(
-            get_function(so_handle, "AOTInductorModelUpdateConstantsFromBlob").get());
-    if (handle->update_constants_from_blob == nullptr) {
+    auto symbol_res =
+        get_function(so_handle, "AOTInductorModelUpdateConstantsFromBlob");
+    if (symbol_res.ok()) {
+      handle->update_constants_from_blob =
+          reinterpret_cast<AOTInductorModelUpdateConstantsFromBlobFunc>(
+              symbol_res.get());
+    } else {
       ET_LOG(
           Info,
           "Failed to load AOTInductorModelUpdateConstantsFromBlob. This .so is probably compiled on an old version of torch (<2.9.0)");