PennyLaneAI · multiphaseCFD · Apr 12, 2024 · Apr 11, 2024 · Apr 11, 2024 · Apr 11, 2024
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### New features since last release
 
 * Add dynamic linking to LAPACK/OpenBlas shared objects in scipy.libs for both C++ and Python layer.
-  [(#653)](https://github.com/PennyLaneAI/pennylane-lightning/pull/651)
+  [(#653)](https://github.com/PennyLaneAI/pennylane-lightning/pull/653)
 
 * `lightning.qubit` supports mid-circuit measurements.
   [(#650)](https://github.com/PennyLaneAI/pennylane-lightning/pull/650)
@@ -35,8 +35,11 @@
 
 ### Breaking changes
 
+* Move common components of `/src/simulator/lightning_gpu/utils/` to `/src/utils/cuda_utils/`.
+  [(#676)](https://github.com/PennyLaneAI/pennylane-lightning/pull/676)
+
 * Deprecate static LAPACK linking support.
-  [(#653)](https://github.com/PennyLaneAI/pennylane-lightning/pull/651)
+  [(#653)](https://github.com/PennyLaneAI/pennylane-lightning/pull/653)
 
 * Migrate `lightning.qubit` to the new device API.
   [(#646)](https://github.com/PennyLaneAI/pennylane-lightning/pull/646)
@@ -46,6 +49,9 @@
 
 ### Improvements
 
+* Create `cuda_utils` for common usage of CUDA related backends.
+  [(#676)](https://github.com/PennyLaneAI/pennylane-lightning/pull/676)
+
 * Refactor `lightning_gpu_utils` unit tests to remove the dependency on statevector class.
   [(#675)](https://github.com/PennyLaneAI/pennylane-lightning/pull/675)
 

diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py
@@ -16,4 +16,4 @@
    Version number (major.minor.patch[-label])
 """
 
-__version__ = "0.36.0-dev26"
+__version__ = "0.36.0-dev27"
diff --git a/pennylane_lightning/core/src/simulators/lightning_gpu/algorithms/CMakeLists.txt b/pennylane_lightning/core/src/simulators/lightning_gpu/algorithms/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(${PL_BACKEND}_algorithms PRIVATE      lightning_compile_op
 
 target_link_libraries(${PL_BACKEND}_algorithms PUBLIC       ${PL_BACKEND}_utils
                                                             lightning_algorithms
+                                                            lightning_utils
                                                             ${PL_BACKEND}
                                                             ${PL_BACKEND}_observables
                                                             )

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 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/utils/CMakeLists.txt b/pennylane_lightning/core/src/simulators/lightning_gpu/utils/CMakeLists.txt
@@ -6,8 +6,3 @@ findCUDATK(lightning_compile_options)
 add_library(${PL_BACKEND}_utils INTERFACE)
 target_include_directories(${PL_BACKEND}_utils INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 target_link_libraries(${PL_BACKEND}_utils INTERFACE CUDA::cudart CUDA::cublas CUDA::cusparse lightning_compile_options)
-
-if (BUILD_TESTS)
-    enable_testing()
-    add_subdirectory("tests")
-endif()
diff --git a/pennylane_lightning/core/src/utils/CMakeLists.txt b/pennylane_lightning/core/src/utils/CMakeLists.txt
@@ -11,6 +11,18 @@ if(NOT WIN32)
     list(APPEND LQUBIT_UTILS_FILES UtilLinearAlg.cpp)
 endif()
 
+set(CUDA_UTILS_ADDED FALSE CACHE BOOL "Add cuda_utils header files")
+
+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()
+
+
 target_include_directories(lightning_utils INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(lightning_utils INTERFACE lightning_compile_options
                                                 lightning_external_libs

diff --git a/pennylane_lightning/core/src/utils/cuda_utils/CMakeLists.txt b/pennylane_lightning/core/src/utils/cuda_utils/CMakeLists.txt
@@ -0,0 +1,13 @@
+project(cuda_utils LANGUAGES CXX CUDA)
+set(CMAKE_CXX_STANDARD 20)
+
+findCUDATK(lightning_compile_options)
+
+add_library(cuda_utils INTERFACE)
+target_include_directories(cuda_utils INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+target_link_libraries(cuda_utils INTERFACE CUDA::cudart CUDA::cublas CUDA::cusparse lightning_compile_options)
+
+if (BUILD_TESTS)
+    enable_testing()
+    add_subdirectory("tests")
+endif()
diff --git a/...ulators/lightning_gpu/utils/CSRMatrix.hpp → ...g/core/src/utils/cuda_utils/CSRMatrix.hpp b/...ulators/lightning_gpu/utils/CSRMatrix.hpp → ...g/core/src/utils/cuda_utils/CSRMatrix.hpp
diff --git a/...lators/lightning_gpu/utils/DataBuffer.hpp → .../core/src/utils/cuda_utils/DataBuffer.hpp b/...lators/lightning_gpu/utils/DataBuffer.hpp → .../core/src/utils/cuda_utils/DataBuffer.hpp
diff --git a/...simulators/lightning_gpu/utils/DevTag.hpp → ...ning/core/src/utils/cuda_utils/DevTag.hpp b/...simulators/lightning_gpu/utils/DevTag.hpp → ...ning/core/src/utils/cuda_utils/DevTag.hpp
diff --git a/...lators/lightning_gpu/utils/DevicePool.hpp → .../core/src/utils/cuda_utils/DevicePool.hpp b/...lators/lightning_gpu/utils/DevicePool.hpp → .../core/src/utils/cuda_utils/DevicePool.hpp
diff --git a/...ulators/lightning_gpu/utils/LinearAlg.hpp → ...g/core/src/utils/cuda_utils/LinearAlg.hpp b/...ulators/lightning_gpu/utils/LinearAlg.hpp → ...g/core/src/utils/cuda_utils/LinearAlg.hpp
diff --git a/...tors/lightning_gpu/utils/MPILinearAlg.hpp → ...ore/src/utils/cuda_utils/MPILinearAlg.hpp b/...tors/lightning_gpu/utils/MPILinearAlg.hpp → ...ore/src/utils/cuda_utils/MPILinearAlg.hpp
diff --git a/...lators/lightning_gpu/utils/MPIManager.hpp → .../core/src/utils/cuda_utils/MPIManager.hpp b/...lators/lightning_gpu/utils/MPIManager.hpp → .../core/src/utils/cuda_utils/MPIManager.hpp
diff --git a/...ators/lightning_gpu/utils/MPI_helpers.hpp → ...core/src/utils/cuda_utils/MPI_helpers.hpp b/...ators/lightning_gpu/utils/MPI_helpers.hpp → ...core/src/utils/cuda_utils/MPI_helpers.hpp
diff --git a/...imulators/lightning_gpu/utils/TSQueue.hpp → ...ing/core/src/utils/cuda_utils/TSQueue.hpp b/...imulators/lightning_gpu/utils/TSQueue.hpp → ...ing/core/src/utils/cuda_utils/TSQueue.hpp
diff --git a/...imulators/lightning_gpu/utils/cuError.hpp → ...ing/core/src/utils/cuda_utils/cuError.hpp b/...imulators/lightning_gpu/utils/cuError.hpp → ...ing/core/src/utils/cuda_utils/cuError.hpp
diff --git a/...tors/lightning_gpu/utils/cuda_helpers.hpp → ...ore/src/utils/cuda_utils/cuda_helpers.hpp b/...tors/lightning_gpu/utils/cuda_helpers.hpp → ...ore/src/utils/cuda_utils/cuda_helpers.hpp
diff --git a/.../lightning_gpu/utils/tests/CMakeLists.txt → ...src/utils/cuda_utils/tests/CMakeLists.txt b/.../lightning_gpu/utils/tests/CMakeLists.txt → ...src/utils/cuda_utils/tests/CMakeLists.txt
@@ -14,39 +14,37 @@ FetchAndIncludeCatch()
 # Define library
 ################################################################################
 
-add_library(${PL_BACKEND}_utils_tests INTERFACE)
-target_link_libraries(${PL_BACKEND}_utils_tests INTERFACE     Catch2::Catch2
+add_library(cuda_utils_tests INTERFACE)
+target_link_libraries(cuda_utils_tests INTERFACE     Catch2::Catch2
                                                                 lightning_utils
-                                                                ${PL_BACKEND}_utils
-                                                                ${PL_BACKEND}
+                                                                cuda_utils
                                                                 )
 
-ProcessTestOptions(${PL_BACKEND}_utils_tests)
+ProcessTestOptions(cuda_utils_tests)
 
-target_sources(${PL_BACKEND}_utils_tests INTERFACE runner_${PL_BACKEND}_utils.cpp)
+target_sources(cuda_utils_tests INTERFACE runner_cuda_utils.cpp)
 
 ################################################################################
 # Define targets
 ################################################################################
 set(TEST_SOURCES Test_LinearAlgebra.cpp)
 
-add_executable(${PL_BACKEND}_utils_test_runner ${TEST_SOURCES})
-target_link_libraries(${PL_BACKEND}_utils_test_runner PRIVATE ${PL_BACKEND}_utils_tests)
-catch_discover_tests(${PL_BACKEND}_utils_test_runner)
+add_executable(cuda_utils_test_runner ${TEST_SOURCES})
+target_link_libraries(cuda_utils_test_runner PRIVATE cuda_utils_tests)
+catch_discover_tests(cuda_utils_test_runner)
 
-install(TARGETS ${PL_BACKEND}_utils_test_runner DESTINATION bin)
+install(TARGETS cuda_utils_test_runner DESTINATION bin)
 
 if(ENABLE_MPI)
-add_library(${PL_BACKEND}_utils_tests_mpi INTERFACE)
-target_link_libraries(${PL_BACKEND}_utils_tests_mpi INTERFACE     Catch2::Catch2
+add_library(cuda_utils_tests_mpi INTERFACE)
+target_link_libraries(cuda_utils_tests_mpi INTERFACE     Catch2::Catch2
                                                                 lightning_utils
-                                                                ${PL_BACKEND}_utils
-                                                                ${PL_BACKEND}
+                                                                cuda_utils
                                                                 )
 
-ProcessTestOptions(${PL_BACKEND}_utils_tests_mpi)
+ProcessTestOptions(cuda_utils_tests_mpi)
 
-target_sources(${PL_BACKEND}_utils_tests_mpi INTERFACE ./mpi/runner_${PL_BACKEND}_utils_mpi.cpp)
+target_sources(cuda_utils_tests_mpi INTERFACE ./mpi/runner_cuda_utils_mpi.cpp)
 
 ################################################################################
 # Define targets
@@ -55,8 +53,8 @@ set(TEST_SOURCES ./mpi/Test_LinearAlgebraMPI.cpp
                  ./mpi/Test_MPIManager.cpp
                  ./mpi/Test_CSRMatrix.cpp)
 
-add_executable(${PL_BACKEND}_utils_test_runner_mpi ${TEST_SOURCES})
-target_link_libraries(${PL_BACKEND}_utils_test_runner_mpi PRIVATE ${PL_BACKEND}_utils_tests_mpi)
-catch_discover_tests(${PL_BACKEND}_utils_test_runner_mpi)
+add_executable(cuda_utils_test_runner_mpi ${TEST_SOURCES})
+target_link_libraries(cuda_utils_test_runner_mpi PRIVATE cuda_utils_tests_mpi)
+catch_discover_tests(cuda_utils_test_runner_mpi)
 
-endif()
+endif()
diff --git a/...ng_gpu/utils/tests/Test_LinearAlgebra.cpp → ...s/cuda_utils/tests/Test_LinearAlgebra.cpp b/...ng_gpu/utils/tests/Test_LinearAlgebra.cpp → ...s/cuda_utils/tests/Test_LinearAlgebra.cpp
diff --git a/...ng_gpu/utils/tests/mpi/Test_CSRMatrix.cpp → ...s/cuda_utils/tests/mpi/Test_CSRMatrix.cpp b/...ng_gpu/utils/tests/mpi/Test_CSRMatrix.cpp → ...s/cuda_utils/tests/mpi/Test_CSRMatrix.cpp
diff --git a/...utils/tests/mpi/Test_LinearAlgebraMPI.cpp → ...utils/tests/mpi/Test_LinearAlgebraMPI.cpp b/...utils/tests/mpi/Test_LinearAlgebraMPI.cpp → ...utils/tests/mpi/Test_LinearAlgebraMPI.cpp
diff --git a/...g_gpu/utils/tests/mpi/Test_MPIManager.cpp → .../cuda_utils/tests/mpi/Test_MPIManager.cpp b/...g_gpu/utils/tests/mpi/Test_MPIManager.cpp → .../cuda_utils/tests/mpi/Test_MPIManager.cpp
diff --git a/...ts/mpi/runner_lightning_gpu_utils_mpi.cpp → ...utils/tests/mpi/runner_cuda_utils_mpi.cpp b/...ts/mpi/runner_lightning_gpu_utils_mpi.cpp → ...utils/tests/mpi/runner_cuda_utils_mpi.cpp
diff --git a/...tils/tests/runner_lightning_gpu_utils.cpp → ...ls/cuda_utils/tests/runner_cuda_utils.cpp b/...tils/tests/runner_lightning_gpu_utils.cpp → ...ls/cuda_utils/tests/runner_cuda_utils.cpp