From 47d1bcb7841485584bbefe09e0dd8b7aef5931c3 Mon Sep 17 00:00:00 2001 From: Ben Howe Date: Wed, 4 Dec 2024 01:03:03 +0000 Subject: [PATCH 1/3] Enable nvq++ for more cpp files --- libs/qec/CMakeLists.txt | 2 -- libs/solvers/CMakeLists.txt | 2 -- 2 files changed, 4 deletions(-) diff --git a/libs/qec/CMakeLists.txt b/libs/qec/CMakeLists.txt index 68b3ad7c..b02fe622 100644 --- a/libs/qec/CMakeLists.txt +++ b/libs/qec/CMakeLists.txt @@ -56,8 +56,6 @@ option(CUDAQX_QEC_INSTALL_PYTHON # ============================================================================== if (CUDAQX_QEC_STANDALONE_BUILD) - # FIXME for now, we only use library mode - set(CUDAQ_LIBRARY_MODE ON) find_package(CUDAQ REQUIRED) # FIXME diff --git a/libs/solvers/CMakeLists.txt b/libs/solvers/CMakeLists.txt index 4d265bca..357e1541 100644 --- a/libs/solvers/CMakeLists.txt +++ b/libs/solvers/CMakeLists.txt @@ -87,8 +87,6 @@ FetchContent_Declare( FetchContent_MakeAvailable(cppitertools json) if (CUDAQX_SOLVERS_STANDALONE_BUILD) - # FIXME for now, we only use library mode - set(CUDAQ_LIBRARY_MODE ON) find_package(CUDAQ REQUIRED) # FIXME From 1d6a502f83ec92ec04d837016e6f4ac50ee11bc5 Mon Sep 17 00:00:00 2001 From: Ben Howe Date: Mon, 12 May 2025 19:21:52 +0000 Subject: [PATCH 2/3] Add debug Signed-off-by: Ben Howe --- .github/actions/build-lib/build_qec.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/build-lib/build_qec.sh b/.github/actions/build-lib/build_qec.sh index 15e6d850..b065970b 100755 --- a/.github/actions/build-lib/build_qec.sh +++ b/.github/actions/build-lib/build_qec.sh @@ -1,5 +1,7 @@ #!/bin/sh +echo cmake -S libs/qec -B "$1" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCUDAQ_DIR=/cudaq-install/lib/cmake/cudaq/ -DCUDAQX_INCLUDE_TESTS=ON -DCUDAQX_BINDINGS_PYTHON=ON -DCMAKE_INSTALL_PREFIX=$HOME/.cudaqx + cmake -S libs/qec -B "$1" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=gcc-11 \ From 239d3a0cddf5882a633595665363eaa81c21d18e Mon Sep 17 00:00:00 2001 From: Ben Howe Date: Mon, 12 May 2025 20:10:04 +0000 Subject: [PATCH 3/3] Compilation issue Signed-off-by: Ben Howe --- libs/core/include/cuda-qx/core/tensor_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/core/include/cuda-qx/core/tensor_impl.h b/libs/core/include/cuda-qx/core/tensor_impl.h index c9339307..247f3d4d 100644 --- a/libs/core/include/cuda-qx/core/tensor_impl.h +++ b/libs/core/include/cuda-qx/core/tensor_impl.h @@ -73,7 +73,7 @@ class tensor_impl : public extension_point, const Scalar *, scalar_type *scalar_data = new scalar_type[size](); auto result = iter->second(scalar_data, {num_rows, num_cols}); for (size_t r = 0; r < num_rows; r++) { - Scalar __restrict__ *resultRow = &result->at({r, 0}); + Scalar *__restrict__ resultRow = &result->at({r, 0}); for (size_t c = 0; c < num_cols; c++) { resultRow[c] = data[r][c] - '0'; }