[core] Reorganizing the directory structure.

.github/workflows/ci.yml

@@ -251,7 +251,7 @@ jobs:
   gen_code_coverage:
     name: Gen code coverage
     needs: [metadata, config_devdeps]
-    if: github.event_name != 'push'
+    if: false
     strategy:
       matrix:
         platform: [amd64]

.licenserc.yaml

@@ -30,7 +30,7 @@ header:
     - 'LICENSE'
     - 'NOTICE'
     - 'llms.txt'
-    - 'test/README.txt'
+    - 'cudaq/test/README.txt'
     - 'runtime/cudaq/platform/default/rest/helpers/anyon/*.txt'
     - 'targettests/Target/IQM/*.txt'
     - 'unittests/backends/iqm/*.txt'
@@ -44,8 +44,8 @@ header:
     - 'docs/sphinx/_templates'
     - 'docs/sphinx/_static/cuda_quantum_icon.svg'
     - 'docker/test/installer/mpi_cuda_check.cpp'
-    - 'include/cudaq/Optimizer/CodeGen/OptUtils.h'
-    - 'lib/Optimizer/CodeGen/OptUtils.cpp'
+    - 'cudaq/include/cudaq/Optimizer/CodeGen/OptUtils.h'
+    - 'cudaq/lib/Optimizer/CodeGen/OptUtils.cpp'
     - 'runtime/cudaq/algorithms/optimizers/nlopt/nlopt-src'
 
   comment: on-failure

CMakeLists.txt

@@ -488,12 +488,12 @@ set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit")
 message(STATUS "Build type is ${CMAKE_BUILD_TYPE}")
 
 set(CUDAQ_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) # --src-root
-set(CUDAQ_MAIN_INCLUDE_DIR ${CUDAQ_MAIN_SRC_DIR}/include)
+set(CUDAQ_MAIN_INCLUDE_DIR ${CUDAQ_MAIN_SRC_DIR}/cudaq/include)
 
 set(CUDAQ_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(CUDAQ_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(CUDAQ_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-set(CUDAQ_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include)
+set(CUDAQ_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/cudaq/include)
 set(CUDAQ_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib)
 set(CUDAQ_TOOLS_DIR ${CMAKE_BINARY_DIR}/bin)
 
@@ -510,8 +510,8 @@ endif()
 
 # Add CUDA Quantum files to the include path
 include_directories(BEFORE
-  ${CUDAQ_SOURCE_DIR}/include
-  ${CUDAQ_BINARY_DIR}/include)
+  ${CUDAQ_SOURCE_DIR}/cudaq/include
+  ${CUDAQ_BINARY_DIR}/cudaq/include)
 
 # Installing the headers and docs needs to depend on generating any public
 # tablegen'd targets.
@@ -683,12 +683,10 @@ endif(CUDAQ_ENABLE_CC)
 # ==============================================================================
 
 add_subdirectory(cmake)
-add_subdirectory(include)
-add_subdirectory(lib)
+add_subdirectory(cudaq)
 if (NOT CUDAQ_DISABLE_RUNTIME)
   add_subdirectory(runtime)
 endif()
-add_subdirectory(tools)
 add_subdirectory(utils)
 
 if(CUDAQ_BUILD_TESTS)
@@ -735,7 +733,6 @@ if(CUDAQ_BUILD_TESTS AND NOT CUDAQ_DISABLE_CPP_FRONTEND)
   endif()
   include(GoogleTest)
   include(CTest)
-  add_subdirectory(test)
   if (NOT CUDAQ_DISABLE_RUNTIME)
     add_subdirectory(targettests)
     add_subdirectory(unittests)

cudaq/CMakeLists.txt

@@ -0,0 +1,20 @@
+# ============================================================================ #
+# Copyright (c) 2026 NVIDIA Corporation & Affiliates.                          #
+# All rights reserved.                                                         #
+#                                                                              #
+# This source code and the accompanying materials are made available under     #
+# the terms of the Apache License 2.0 which accompanies this distribution.     #
+# ============================================================================ #
+
+if (NOT DEFINED CUDAQ_ENABLE_CORE)
+  set(CUDAQ_ENABLE_CORE ON CACHE BOOL "Enable building CUDA-Q core.")
+endif()
+
+if(CUDAQ_ENABLE_CORE)
+  add_subdirectory(include)
+  add_subdirectory(lib)
+  add_subdirectory(tools)
+  if(CUDAQ_BUILD_TESTS AND NOT CUDAQ_DISABLE_CPP_FRONTEND)
+    add_subdirectory(test)
+  endif()
+endif()

include/CMakeLists.txt → cudaq/include/CMakeLists.txt

@@ -6,7 +6,13 @@
 # the terms of the Apache License 2.0 which accompanies this distribution.     #
 # ============================================================================ #
 
-configure_file("${CMAKE_SOURCE_DIR}/include/nvqpp_config.h.in"
-               "${CUDAQ_BINARY_DIR}/include/nvqpp_config.h" 
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/nvqpp_config.h.in"
+               "${CUDAQ_BINARY_DIR}/cudaq/include/nvqpp_config.h"
                @ONLY)
 add_subdirectory(cudaq)
+
+install(DIRECTORY cudaq
+        DESTINATION include
+        FILES_MATCHING
+          PATTERN "*.h"
+          PATTERN "*.td")

include/cudaq/Optimizer/Dialect/CC/CMakeLists.txt → cudaq/include/cudaq/Optimizer/Dialect/CC/CMakeLists.txt

@@ -9,3 +9,10 @@
 add_cudaq_dialect(CC cc)
 add_cudaq_interface(CCInterfaces)
 add_cudaq_dialect_doc(CCDialect cc)
+
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
+        DESTINATION include/cudaq/Optimizer/Dialect/CC
+        FILES_MATCHING
+          PATTERN "*.h.inc"
+          PATTERN "*.cpp.inc"
+          PATTERN "CMakeFiles" EXCLUDE)

include/cudaq/Optimizer/Dialect/Quake/CMakeLists.txt → cudaq/include/cudaq/Optimizer/Dialect/Quake/CMakeLists.txt

@@ -9,3 +9,10 @@
 add_cudaq_dialect(Quake quake)
 add_cudaq_interface(QuakeInterfaces)
 add_cudaq_dialect_doc(QuakeDialect quake)
+
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
+        DESTINATION include/cudaq/Optimizer/Dialect/Quake
+        FILES_MATCHING
+          PATTERN "*.h.inc"
+          PATTERN "*.cpp.inc"
+          PATTERN "CMakeFiles" EXCLUDE)

include/cudaq/Support/CMakeLists.txt → cudaq/include/cudaq/Support/CMakeLists.txt

@@ -6,4 +6,3 @@
 # the terms of the Apache License 2.0 which accompanies this distribution.     #
 # ============================================================================ #
 
-install (FILES TargetConfig.h Version.h DESTINATION include/cudaq/Support)

include/nvqpp_config.h.in → cudaq/include/nvqpp_config.h.in

@@ -24,7 +24,7 @@
 
 // This is used by cudaq-quake as a backup search location
 // for cudaq/Support/TargetConfig.h and cudaq/Support/Version.h
-#define FALLBACK_CUDAQ_SUPPORT_DIR "@CMAKE_SOURCE_DIR@/include"
+#define FALLBACK_CUDAQ_SUPPORT_DIR "@CMAKE_SOURCE_DIR@/cudaq/include"
 
 // This is used by cudaq-quake as a backup search location
 // for required json headers.