Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -45,7 +45,7 @@ header:
- '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/lib/Optimizer/CodeGen/OptUtils.cpp'
- 'runtime/cudaq/algorithms/optimizers/nlopt/nlopt-src'

comment: on-failure
Expand Down
17 changes: 9 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ 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})
Expand All @@ -510,8 +510,9 @@ 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}/include
${CUDAQ_BINARY_DIR}/cudaq/include)

# Installing the headers and docs needs to depend on generating any public
# tablegen'd targets.
Expand Down Expand Up @@ -683,13 +684,13 @@ endif(CUDAQ_ENABLE_CC)
# ==============================================================================

add_subdirectory(cmake)
add_subdirectory(include)
add_subdirectory(lib)
add_subdirectory(cudaq/include)
add_subdirectory(cudaq/lib)
if (NOT CUDAQ_DISABLE_RUNTIME)
add_subdirectory(runtime)
endif()
add_subdirectory(tools)
add_subdirectory(utils)
add_subdirectory(cudaq/tools)
add_subdirectory(cudaq/utils)

if(CUDAQ_BUILD_TESTS)
enable_testing()
Expand Down Expand Up @@ -772,7 +773,7 @@ if(CUDAQ_BUILD_TESTS AND NOT CUDAQ_DISABLE_CPP_FRONTEND)
endif()
include(GoogleTest)
include(CTest)
add_subdirectory(test)
add_subdirectory(cudaq/test)
if (NOT CUDAQ_DISABLE_RUNTIME)
add_subdirectory(targettests)
add_subdirectory(unittests)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include "cudaq/Support/Handle.h"
#include "Support/Handle.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Support/raw_ostream.h"
#include "mlir/Support/LLVM.h"
Expand Down
4 changes: 4 additions & 0 deletions include/cudaq/CMakeLists.txt → cudaq/include/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
# the terms of the Apache License 2.0 which accompanies this distribution. #
# ============================================================================ #

configure_file("${CMAKE_SOURCE_DIR}/cudaq/include/nvqpp_config.h.in"
"${CUDAQ_BINARY_DIR}/include/nvqpp_config.h"
@ONLY)

include(HandleLLVMOptions)
add_subdirectory(Optimizer)
add_subdirectory(Support)
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

#pragma once

#include "cudaq/Frontend/nvqpp/AttributeNames.h"
#include "cudaq/Optimizer/Builder/Runtime.h"
#include "cudaq/Optimizer/Dialect/CC/CCOps.h"
#include "cudaq/Todo.h"
#include "Frontend/nvqpp/AttributeNames.h"
#include "Optimizer/Builder/Runtime.h"
#include "Optimizer/Dialect/CC/CCOps.h"
#include "Todo.h"
#include "clang/AST/ASTConsumer.h"
#include "clang/AST/GlobalDecl.h"
#include "clang/AST/Mangle.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include "cudaq/Optimizer/Dialect/CC/CCOps.h"
#include "Optimizer/Dialect/CC/CCOps.h"
#include "mlir/Dialect/Arith/IR/Arith.h"
#include "mlir/Dialect/Func/IR/FuncOps.h"
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include "cudaq/Optimizer/Builder/Factory.h"
#include "Optimizer/Builder/Factory.h"

namespace cudaq {
namespace cc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#pragma once

#include "cudaq/Optimizer/Builder/Factory.h"
#include "cudaq/Optimizer/Dialect/CC/CCOps.h"
#include "cudaq/Optimizer/Dialect/Quake/QuakeOps.h"
#include "Optimizer/Builder/Factory.h"
#include "Optimizer/Dialect/CC/CCOps.h"
#include "Optimizer/Dialect/Quake/QuakeOps.h"

namespace cudaq::opt::marshal {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#pragma once

#include "cudaq/Optimizer/Builder/Factory.h"
#include "cudaq/Optimizer/Builder/RuntimeNames.h"
#include "Optimizer/Builder/Factory.h"
#include "Optimizer/Builder/RuntimeNames.h"

//===----------------------------------------------------------------------===//
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
// Generated logic
//===----------------------------------------------------------------------===//

#include "cudaq/Optimizer/CodeGen/CodeGenDialect.h.inc"
#include "Optimizer/CodeGen/CodeGenDialect.h.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef CUDAQ_OPTIMIZER_CODEGEN_OPS
#define CUDAQ_OPTIMIZER_CODEGEN_OPS

include "cudaq/Optimizer/CodeGen/CodeGenDialect.td"
include "Optimizer/CodeGen/CodeGenDialect.td"
include "mlir/Interfaces/InferTypeOpInterface.td"
include "cudaq/Optimizer/Dialect/Common/Traits.td"
include "cudaq/Optimizer/Dialect/CC/CCTypes.td"
include "cudaq/Optimizer/Dialect/Quake/QuakeTypes.td"
include "Optimizer/Dialect/Common/Traits.td"
include "Optimizer/Dialect/CC/CCTypes.td"
include "Optimizer/Dialect/Quake/QuakeTypes.td"

//===----------------------------------------------------------------------===//
// The codegen quake dialect is a transitory set of operations used exclusively
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef CUDAQ_OPTIMIZER_CODEGEN_TYPES
#define CUDAQ_OPTIMIZER_CODEGEN_TYPES

include "cudaq/Optimizer/CodeGen/CodeGenDialect.td"
include "Optimizer/CodeGen/CodeGenDialect.td"
include "mlir/Interfaces/DataLayoutInterfaces.td"
include "mlir/IR/AttrTypeBase.td"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,6 @@ void createPipelineTransformsForPythonToOpenQASM(mlir::OpPassManager &pm);
// declarative passes
#define GEN_PASS_DECL
#define GEN_PASS_REGISTRATION
#include "cudaq/Optimizer/CodeGen/Passes.h.inc"
#include "Optimizer/CodeGen/Passes.h.inc"

} // namespace cudaq::opt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#pragma once

#include "cudaq/Optimizer/CodeGen/QIRFunctionNames.h"
#include "cudaq/Optimizer/CodeGen/QIROpaqueStructTypes.h"
#include "cudaq/Optimizer/Dialect/Quake/QuakeOps.h"
#include "Optimizer/CodeGen/QIRFunctionNames.h"
#include "Optimizer/CodeGen/QIROpaqueStructTypes.h"
#include "Optimizer/Dialect/Quake/QuakeOps.h"
#include "llvm/ADT/StringRef.h"
#include "mlir/IR/ValueRange.h"
#include "mlir/Support/LLVM.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
/// This file provides the opaque struct types to be used with the obsolete LLVM
/// typed pointer type.

#include "cudaq/Optimizer/Builder/Factory.h"
#include "cudaq/Optimizer/Dialect/CC/CCTypes.h"
#include "Optimizer/Builder/Factory.h"
#include "Optimizer/Dialect/CC/CCTypes.h"
#include "mlir/Conversion/LLVMCommon/TypeConverter.h"
#include "mlir/Dialect/LLVMIR/LLVMTypes.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include "cudaq/Optimizer/Dialect/CC/CCTypes.h"
#include "Optimizer/Dialect/CC/CCTypes.h"

namespace mlir {
class RewritePatternSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
// Generated logic
//===----------------------------------------------------------------------===//

#include "cudaq/Optimizer/Dialect/CC/CCDialect.h.inc"
#include "Optimizer/Dialect/CC/CCDialect.h.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include "cudaq/Optimizer/Dialect/Common/InlinerInterface.h"
#include "Optimizer/Dialect/Common/InlinerInterface.h"

using CCInlinerInterface = cudaq::EnableInlinerInterface;

Expand All @@ -30,4 +30,4 @@ class LinearTypeArgsTrait
// Generated logic
//===----------------------------------------------------------------------===//

#include "cudaq/Optimizer/Dialect/CC/CCInterfaces.h.inc"
#include "Optimizer/Dialect/CC/CCInterfaces.h.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#pragma once

#include "cudaq/Optimizer/Dialect/CC/CCInterfaces.h"
#include "cudaq/Optimizer/Dialect/CC/CCTypes.h"
#include "cudaq/Optimizer/Dialect/Common/Traits.h"
#include "Optimizer/Dialect/CC/CCInterfaces.h"
#include "Optimizer/Dialect/CC/CCTypes.h"
#include "Optimizer/Dialect/Common/Traits.h"
#include "mlir/Dialect/Arith/IR/Arith.h"
#include "mlir/Dialect/Func/IR/FuncOps.h"
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
Expand Down Expand Up @@ -57,7 +57,7 @@ mlir::Value getByteSizeOfType(mlir::OpBuilder &builder, mlir::Location loc,
//===----------------------------------------------------------------------===//

#define GET_OP_CLASSES
#include "cudaq/Optimizer/Dialect/CC/CCOps.h.inc"
#include "Optimizer/Dialect/CC/CCOps.h.inc"

namespace cudaq::cc {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

include "mlir/Interfaces/InferTypeOpInterface.td"
include "mlir/IR/SymbolInterfaces.td"
include "cudaq/Optimizer/Dialect/Common/Traits.td"
include "cudaq/Optimizer/Dialect/CC/CCDialect.td"
include "cudaq/Optimizer/Dialect/CC/CCInterfaces.td"
include "cudaq/Optimizer/Dialect/CC/CCTypes.td"
include "cudaq/Optimizer/Dialect/Quake/QuakeTypes.td"
include "Optimizer/Dialect/Common/Traits.td"
include "Optimizer/Dialect/CC/CCDialect.td"
include "Optimizer/Dialect/CC/CCInterfaces.td"
include "Optimizer/Dialect/CC/CCTypes.td"
include "Optimizer/Dialect/Quake/QuakeTypes.td"

def AnyPointerType : Type<CPred<"isa<mlir::LLVM::LLVMPointerType,"
"cudaq::cc::PointerType>($_self)">,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include "cudaq/Support/SmallVector.h"
#include "Support/SmallVector.h"
#include "mlir/IR/BuiltinAttributes.h"
#include "mlir/IR/BuiltinTypes.h"
#include "mlir/IR/Types.h"
Expand All @@ -30,7 +30,7 @@ class SpanLikeType : public mlir::Type {
//===----------------------------------------------------------------------===//

#define GET_TYPEDEF_CLASSES
#include "cudaq/Optimizer/Dialect/CC/CCTypes.h.inc"
#include "Optimizer/Dialect/CC/CCTypes.h.inc"

namespace cudaq::cc {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef CUDAQ_DIALECT_CC_TYPES
#define CUDAQ_DIALECT_CC_TYPES

include "cudaq/Optimizer/Dialect/CC/CCDialect.td"
include "Optimizer/Dialect/CC/CCDialect.td"
include "mlir/Interfaces/DataLayoutInterfaces.td"
include "mlir/IR/AttrTypeBase.td"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#pragma once

#include "cudaq/Optimizer/Dialect/CC/CCOps.h"
#include "cudaq/Optimizer/Dialect/Quake/QuakeOps.h"
#include "Optimizer/Dialect/CC/CCOps.h"
#include "Optimizer/Dialect/Quake/QuakeOps.h"

namespace cudaq::opt {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include "cudaq/Frontend/nvqpp/AttributeNames.h"
#include "Frontend/nvqpp/AttributeNames.h"
#include "mlir/Dialect/Func/IR/FuncOps.h"
#include "mlir/IR/Operation.h"
#include "mlir/IR/Region.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
// Generated logic
//===----------------------------------------------------------------------===//

#include "cudaq/Optimizer/Dialect/Quake/QuakeDialect.h.inc"
#include "Optimizer/Dialect/Quake/QuakeDialect.h.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include "cudaq/Optimizer/Dialect/Common/InlinerInterface.h"
#include "Optimizer/Dialect/Common/InlinerInterface.h"
#include "mlir/IR/OpDefinition.h"

using QuakeInlinerInterface = cudaq::EnableInlinerInterface;
Expand All @@ -17,4 +17,4 @@ using QuakeInlinerInterface = cudaq::EnableInlinerInterface;
// Generated logic
//===----------------------------------------------------------------------===//

#include "cudaq/Optimizer/Dialect/Quake/QuakeInterfaces.h.inc"
#include "Optimizer/Dialect/Quake/QuakeInterfaces.h.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

#pragma once

#include "cudaq/Optimizer/Dialect/CC/CCTypes.h"
#include "cudaq/Optimizer/Dialect/Common/Traits.h"
#include "cudaq/Optimizer/Dialect/Quake/QuakeInterfaces.h"
#include "cudaq/Optimizer/Dialect/Quake/QuakeTypes.h"
#include "Optimizer/Dialect/CC/CCTypes.h"
#include "Optimizer/Dialect/Common/Traits.h"
#include "Optimizer/Dialect/Quake/QuakeInterfaces.h"
#include "Optimizer/Dialect/Quake/QuakeTypes.h"
#include "mlir/Dialect/Arith/IR/Arith.h"
#include "mlir/Dialect/Func/IR/FuncOps.h"
#include "mlir/IR/BuiltinOps.h"
Expand Down Expand Up @@ -60,7 +60,7 @@ void genericOpPrinter(mlir::OpAsmPrinter &_odsPrinter, mlir::Operation *op,
//===----------------------------------------------------------------------===//

#define GET_OP_CLASSES
#include "cudaq/Optimizer/Dialect/Quake/QuakeOps.h.inc"
#include "Optimizer/Dialect/Quake/QuakeOps.h.inc"

//===----------------------------------------------------------------------===//
// Utility functions to test the form of an operation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ include "mlir/Interfaces/LoopLikeInterface.td"
include "mlir/Interfaces/SideEffectInterfaces.td"
include "mlir/Interfaces/ViewLikeInterface.td"
include "mlir/IR/RegionKindInterface.td"
include "cudaq/Optimizer/Dialect/CC/CCTypes.td"
include "cudaq/Optimizer/Dialect/Common/Traits.td"
include "cudaq/Optimizer/Dialect/Quake/QuakeDialect.td"
include "cudaq/Optimizer/Dialect/Quake/QuakeInterfaces.td"
include "cudaq/Optimizer/Dialect/Quake/QuakeTypes.td"
include "Optimizer/Dialect/CC/CCTypes.td"
include "Optimizer/Dialect/Common/Traits.td"
include "Optimizer/Dialect/Quake/QuakeDialect.td"
include "Optimizer/Dialect/Quake/QuakeInterfaces.td"
include "Optimizer/Dialect/Quake/QuakeTypes.td"

//===----------------------------------------------------------------------===//
// Base operation definition.
Expand Down
Loading
Loading