Merge branch 'master' into add_mps_capture

PennyLaneAI · Dec 18, 2024 · 22fac6d · 22fac6d
2 parents 8476d92 + 42d3b8e
commit 22fac6d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -98,6 +98,9 @@
 
 ### Bug fixes
 
+* Set rpath with `@loader_path` instead of `$ORIGIN` for macOS.
+  [(#1029)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1029)
+
 * Update CUDA version to 12.4 for GPU tests on CI.
   [(#1023)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1023)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -100,7 +100,11 @@ message("Python site-packages directory: ${Python_SITELIB}")
 if(DEFINED PY_INSTALL)
     # Note the following setting is only for pyenv and not for conda
     # TODO: Add support for conda
-    set(SCIPY_OPENBLAS32_RUNTIME_LIB_PATH "$ORIGIN/../scipy_openblas32/lib")
+    if(APPLE)
+        set(SCIPY_OPENBLAS32_RUNTIME_LIB_PATH "@loader_path/../scipy_openblas32/lib")
+    else()
+        set(SCIPY_OPENBLAS32_RUNTIME_LIB_PATH "$ORIGIN/../scipy_openblas32/lib")
+    endif()
 else()
     include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSCIPY_OPENBLAS32.cmake")
     if(NOT DEFINED SCIPY_OPENBLAS32_LIB_PATH AND NOT EXISTS ${SCIPY_OPENBLAS32_LIB_PATH})