Move changes to individual lib directories to support separate builds

Signed-off-by: Ben Howe <bhowe@nvidia.com>
NVIDIA · Dec 13, 2024 · addac4a · addac4a
1 parent 5a40143
commit addac4a
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 39 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,44 +91,6 @@ if (CUDAQX_INCLUDE_TESTS)
   endif()
 endif()
 
-# Check for CUDA Support
-# ==============================================================================
-include(CheckLanguage)
-check_language(CUDA)
-set(CUDA_FOUND FALSE)
-# Generate -gencode arch=compute_XX,code=sm_XX for list of supported
-# arch values.
-# List should be sorted in increasing order.
-function(CUDA_get_gencode_args out_args_string arch_values)
-  # allow the user to pass the list like a normal variable
-  set(arch_list ${arch_values} ${ARGN})
-  set(out "")
-  foreach(arch IN LISTS arch_list)
-    set(out "${out} -gencode arch=compute_${arch},code=sm_${arch}")
-  endforeach(arch)
-
-  # Repeat the last one as to ensure the generation of PTX for most
-  # recent virtual architecture for forward compatibility
-  list(GET arch_list -1 last_arch)
-  set(out "${out} -gencode arch=compute_${last_arch},code=compute_${last_arch}")
-  set(${out_args_string} ${out} PARENT_SCOPE)
-endfunction()
-
-if(CMAKE_CUDA_COMPILER)
-  if (NOT CUDA_TARGET_ARCHS)
-    # Volta, Ampere, Hopper
-    set(CUDA_TARGET_ARCHS  "70;80;90")
-  endif()
-  CUDA_get_gencode_args(CUDA_gencode_flags ${CUDA_TARGET_ARCHS})
-  set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -shared -std=c++17 ${CUDA_gencode_flags} --compiler-options -fPIC")
-
-  enable_language(CUDA)
-  set(CUDA_FOUND TRUE)
-  set(CMAKE_CUDA_STANDARD 17)
-  set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
-  message(STATUS "Cuda language found.")
-endif()
-
 # Directory setup
 # ==============================================================================
 

diff --git a/libs/qec/CMakeLists.txt b/libs/qec/CMakeLists.txt
@@ -6,7 +6,7 @@
 # the terms of the Apache License 2.0 which accompanies this distribution.     #
 # ============================================================================ #
 
-# Requering the same version as the others.
+# Requiring the same version as the others.
 cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
 
 # Project setup
@@ -52,6 +52,44 @@ option(CUDAQX_QEC_INSTALL_PYTHON
        "Install python files alongside the library."
        ${CUDAQX_INSTALL_PYTHON})
 
+# Check for CUDA Support (ref: cuda-quantum/CMakeLists.txt)
+# ==============================================================================
+include(CheckLanguage)
+check_language(CUDA)
+set(CUDA_FOUND FALSE)
+# Generate -gencode arch=compute_XX,code=sm_XX for list of supported
+# arch values.
+# List should be sorted in increasing order.
+function(CUDA_get_gencode_args out_args_string arch_values)
+  # allow the user to pass the list like a normal variable
+  set(arch_list ${arch_values} ${ARGN})
+  set(out "")
+  foreach(arch IN LISTS arch_list)
+    set(out "${out} -gencode arch=compute_${arch},code=sm_${arch}")
+  endforeach(arch)
+
+  # Repeat the last one as to ensure the generation of PTX for most
+  # recent virtual architecture for forward compatibility
+  list(GET arch_list -1 last_arch)
+  set(out "${out} -gencode arch=compute_${last_arch},code=compute_${last_arch}")
+  set(${out_args_string} ${out} PARENT_SCOPE)
+endfunction()
+
+if(CMAKE_CUDA_COMPILER)
+  if (NOT CUDA_TARGET_ARCHS)
+    # Volta, Ampere, Hopper
+    set(CUDA_TARGET_ARCHS  "70;80;90")
+  endif()
+  CUDA_get_gencode_args(CUDA_gencode_flags ${CUDA_TARGET_ARCHS})
+  set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -shared -std=c++17 ${CUDA_gencode_flags} --compiler-options -fPIC")
+
+  enable_language(CUDA)
+  set(CUDA_FOUND TRUE)
+  set(CMAKE_CUDA_STANDARD 17)
+  set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
+  message(STATUS "Cuda language found.")
+endif()
+
 # External Dependencies 
 # ==============================================================================
 

diff --git a/libs/solvers/CMakeLists.txt b/libs/solvers/CMakeLists.txt
@@ -63,6 +63,44 @@ option(CUDAQX_SOLVERS_INSTALL_PYTHON
        "Install python files alongside the library."
        ${CUDAQX_INSTALL_PYTHON})
 
+# Check for CUDA Support (ref: cuda-quantum/CMakeLists.txt)
+# ==============================================================================
+include(CheckLanguage)
+check_language(CUDA)
+set(CUDA_FOUND FALSE)
+# Generate -gencode arch=compute_XX,code=sm_XX for list of supported
+# arch values.
+# List should be sorted in increasing order.
+function(CUDA_get_gencode_args out_args_string arch_values)
+  # allow the user to pass the list like a normal variable
+  set(arch_list ${arch_values} ${ARGN})
+  set(out "")
+  foreach(arch IN LISTS arch_list)
+    set(out "${out} -gencode arch=compute_${arch},code=sm_${arch}")
+  endforeach(arch)
+
+  # Repeat the last one as to ensure the generation of PTX for most
+  # recent virtual architecture for forward compatibility
+  list(GET arch_list -1 last_arch)
+  set(out "${out} -gencode arch=compute_${last_arch},code=compute_${last_arch}")
+  set(${out_args_string} ${out} PARENT_SCOPE)
+endfunction()
+
+if(CMAKE_CUDA_COMPILER)
+  if (NOT CUDA_TARGET_ARCHS)
+    # Volta, Ampere, Hopper
+    set(CUDA_TARGET_ARCHS  "70;80;90")
+  endif()
+  CUDA_get_gencode_args(CUDA_gencode_flags ${CUDA_TARGET_ARCHS})
+  set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -shared -std=c++17 ${CUDA_gencode_flags} --compiler-options -fPIC")
+
+  enable_language(CUDA)
+  set(CUDA_FOUND TRUE)
+  set(CMAKE_CUDA_STANDARD 17)
+  set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
+  message(STATUS "Cuda language found.")
+endif()
+
 # External Dependencies 
 # ==============================================================================