Link utils against cuda_utils

PennyLaneAI · Apr 12, 2024 · aed4495 · aed4495
1 parent ca3bad3
commit aed4495
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,10 +149,9 @@ if(ENABLE_PYTHON)
     if("${PL_BACKEND}" STREQUAL "lightning_gpu")
         set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
         set_target_properties("${PL_BACKEND}_ops" PROPERTIES BUILD_RPATH "$ORIGIN/../cuquantum/lib:$ORIGIN/../nvidia/cuda_runtime/lib:$ORIGIN/../nvidia/cublas/lib:$ORIGIN/../nvidia/cusparse/lib:$ORIGIN")
-        target_link_libraries("${PL_BACKEND}_ops" PRIVATE  cuda_utils)
     endif()
 
-    target_link_libraries("${PL_BACKEND}_ops" PRIVATE  lightning_compile_options
+    target_link_libraries("${PL_BACKEND}_ops" PRIVATE   lightning_compile_options
                                                         lightning_external_libs
                                                         )
 

diff --git a/pennylane_lightning/core/src/simulators/lightning_gpu/algorithms/CMakeLists.txt b/pennylane_lightning/core/src/simulators/lightning_gpu/algorithms/CMakeLists.txt
@@ -16,8 +16,8 @@ target_link_libraries(${PL_BACKEND}_algorithms PRIVATE      lightning_compile_op
                                                             )
 
 target_link_libraries(${PL_BACKEND}_algorithms PUBLIC       ${PL_BACKEND}_utils
-                                                            cuda_utils
                                                             lightning_algorithms
+                                                            lightning_utils
                                                             ${PL_BACKEND}
                                                             ${PL_BACKEND}_observables
                                                             )

diff --git a/pennylane_lightning/core/src/simulators/lightning_gpu/bindings/CMakeLists.txt b/pennylane_lightning/core/src/simulators/lightning_gpu/bindings/CMakeLists.txt
@@ -11,7 +11,6 @@ target_link_libraries(${PL_BACKEND}_bindings INTERFACE  lightning_bindings
                                                         ${PL_BACKEND}
                                                         ${PL_BACKEND}_gates
                                                         ${PL_BACKEND}_measurements
-                                                        cuda_utils
                                                         ${PL_BACKEND}_utils
                                                         )
 

diff --git a/pennylane_lightning/core/src/simulators/lightning_gpu/gates/CMakeLists.txt b/pennylane_lightning/core/src/simulators/lightning_gpu/gates/CMakeLists.txt
@@ -6,7 +6,7 @@ project(${PL_BACKEND}_gates)
 add_library(${PL_BACKEND}_gates INTERFACE)
 target_include_directories(${PL_BACKEND}_gates INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_link_libraries(${PL_BACKEND}_gates INTERFACE  ${PL_BACKEND}_utils cuda_utils lightning_external_libs)
+target_link_libraries(${PL_BACKEND}_gates INTERFACE  ${PL_BACKEND}_utils lightning_utils lightning_external_libs)
 
 if (BUILD_TESTS)
     enable_testing()

diff --git a/pennylane_lightning/core/src/simulators/lightning_gpu/measurements/CMakeLists.txt b/pennylane_lightning/core/src/simulators/lightning_gpu/measurements/CMakeLists.txt
@@ -13,7 +13,6 @@ target_link_libraries(${PL_BACKEND}_measurements INTERFACE  lightning_compile_op
                                                             lightning_utils
                                                             ${PL_BACKEND}
                                                             ${PL_BACKEND}_utils
-                                                            cuda_utils
                                                             ${PL_BACKEND}_observables
                                                             )
 

diff --git a/pennylane_lightning/core/src/simulators/lightning_gpu/observables/CMakeLists.txt b/pennylane_lightning/core/src/simulators/lightning_gpu/observables/CMakeLists.txt
@@ -19,7 +19,6 @@ target_link_libraries(${PL_BACKEND}_observables PUBLIC  lightning_utils
                                                         lightning_gates
                                                         lightning_observables
                                                         ${PL_BACKEND}_utils
-                                                        cuda_utils
                                                         ${PL_BACKEND}_gates
                                                         ${PL_BACKEND}
                                                         )

diff --git a/pennylane_lightning/core/src/utils/CMakeLists.txt b/pennylane_lightning/core/src/utils/CMakeLists.txt
@@ -16,6 +16,8 @@ set(CUDA_UTILS_ADDED FALSE)
 foreach(BACKEND ${PL_BACKEND})
     if(${BACKEND} STREQUAL "lightning_gpu" AND NOT CUDA_UTILS_ADDED)
         add_subdirectory(cuda_utils)
+        target_include_directories(lightning_utils INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/cuda_utils)
+        target_link_libraries(lightning_utils INTERFACE cuda_utils)
         set(CUDA_UTILS_ADDED TRUE)
     endif()
 endforeach()