Merge branch 'main' into fix/macos-ci-timeout

Author: taalexander

.github/pre-commit/spelling_allowlist.txt

@@ -131,6 +131,7 @@ Superpositions
 Superstaq
 TBI
 TCP
+TII
 TableGen
 Toffoli
 Toshiko
@@ -367,7 +368,9 @@ toolchain
 toolchains
 toolset
 transmon
+transpilation
 transpile
+trixie
 trotterization
 uccsd
 unary
@@ -381,6 +384,7 @@ unmarshal
 unmarshalling
 unoptimized
 upvote
+url
 variadic
 variational
 vazirani

.github/workflows/build_package_sources.yml

@@ -322,6 +322,38 @@ jobs:
           fi
           ls -la "$d"/*trimmed* 2>/dev/null || true
 
+      - name: Generate pip attribution (NOTICE_PIP per variant + CUDA version)
+        run: |
+          cuda_major=$(echo "${{ matrix.cuda }}" | cut -d. -f1)
+          suffix="_cu${cuda_major}"
+          python3 scripts/generate_pip_attribution.py \
+            package-source-diff/pip_packages_cudaq.txt \
+            -o "NOTICE_PIP_cudaq${suffix}"
+
+          python3 scripts/generate_pip_attribution.py \
+            package-source-diff/pip_packages_cudaqx.txt \
+            -o "NOTICE_PIP_cudaqx${suffix}"
+
+          python3 scripts/generate_pip_attribution.py \
+            package-source-diff/pip_packages_macos.txt \
+            -o "NOTICE_PIP_macos${suffix}"
+          ls -la NOTICE_PIP_*
+          head -50 "NOTICE_PIP_cudaq${suffix}"
+
+      - name: Generate apt attribution (NOTICE_APT per variant + CUDA version)
+        run: |
+          cuda_major=$(echo "${{ matrix.cuda }}" | cut -d. -f1)
+          suffix="_cu${cuda_major}"
+          python3 scripts/generate_apt_attribution.py \
+            package-source-diff/apt_packages_cudaq.txt \
+            -o "NOTICE_APT_cudaq${suffix}"
+
+          python3 scripts/generate_apt_attribution.py \
+            package-source-diff/apt_packages_cudaqx.txt \
+            -o "NOTICE_APT_cudaqx${suffix}"
+          ls -la NOTICE_APT_*
+          head -50 "NOTICE_APT_cudaq${suffix}"
+
       - name: Generate tpls lock file
         run: |
           chmod +x scripts/generate_tpls_lock.sh

.github/workflows/integration_tests.yml

@@ -27,6 +27,7 @@ on:
           - qci
           - quantinuum
           - scaleway
+          - tii
       single_test_name:
         type: string
         required: false
@@ -190,7 +191,7 @@ jobs:
         run: |
           # Determine which providers to test based on inputs and event type
           if [[ "${{ github.event_name }}" == "schedule" || "${{ inputs.target }}" == "nightly" ]]; then
-            providers='["anyon", "fermioniq", "infleqtion", "ionq", "iqm", "oqc", "orca", "pasqal", "qci", "quantinuum", "scaleway"]'
+            providers='["anyon", "fermioniq", "infleqtion", "ionq", "iqm", "oqc", "orca", "pasqal", "qci", "quantinuum", "scaleway", "tii"]'
           else
             # Just run the specified target provider
             providers="[\"${{ inputs.target }}\"]"
@@ -270,6 +271,9 @@ jobs:
               scaleway)
                 filelist="targettests/scaleway/*.cpp docs/sphinx/targets/python/scaleway.py"
                 ;;
+              tii)
+                filelist="docs/sphinx/targets/cpp/tii.cpp docs/sphinx/targets/python/tii.py"
+                ;;
             esac
             echo "testlist=$filelist" >> $GITHUB_OUTPUT
           fi
@@ -417,6 +421,13 @@ jobs:
               echo "SCW_PROJECT_ID=${{ secrets.SCW_PROJECT_ID }}" >> $GITHUB_ENV
               echo "SCW_SECRET_KEY=${{ secrets.SCW_SECRET_KEY }}" >> $GITHUB_ENV
               ;;
+            tii)
+              echo "### Setting up TII account" >> $GITHUB_STEP_SUMMARY
+              echo "::add-mask::${{ secrets.TII_AUTH_TOKEN }}"
+              echo "::add-mask::${{ secrets.TII_PROJECT }}"
+              echo "TII_AUTH_TOKEN=${{ secrets.TII_AUTH_TOKEN }}" >> $GITHUB_ENV
+              echo "TII_PROJECT=${{ secrets.TII_PROJECT }}" >> $GITHUB_ENV
+              ;;
           esac
         shell: bash
 
@@ -704,7 +715,7 @@ jobs:
 
               scaleway)
                 if [[ "$filename" == *.cpp ]]; then
-                  nvq++ -v $filename --target scaleway --scaleway-machine EMU-CUDAQ-64C-512M
+                  nvq++ -v $filename --target scaleway --scaleway-machine EMU-CUDAQ-64C-512M --scaleway-deduplication-id ghci-workflow-testing
                   test_status=$?
                   if [ $test_status -eq 0 ]; then
                     ./a.out
@@ -734,6 +745,38 @@ jobs:
                   test_skip_sum=$((test_skip_sum+1))
                 fi
                 ;;
+
+              tii)
+                if [[ "$filename" == *.cpp ]]; then
+                  nvq++ -v $filename --target tii --tii-device tii-sim --tii-project ${{ secrets.TII_PROJECT }}
+                  test_status=$?
+                  if [ $test_status -eq 0 ]; then
+                    ./a.out
+                    test_status=$?
+                    if [ $test_status -eq 0 ]; then
+                      echo ":white_check_mark: Successfully ran test: $filename" >> $GITHUB_STEP_SUMMARY
+                    else
+                      echo ":x: Test failed (failed to execute): $filename" >> $GITHUB_STEP_SUMMARY
+                      test_err_sum=$((test_err_sum+1))
+                    fi
+                  else
+                    echo ":x: Test failed (failed to compile): $filename" >> $GITHUB_STEP_SUMMARY
+                    test_err_sum=$((test_err_sum+1))
+                  fi
+                elif [[ "$filename" == *.py ]]; then
+                  python3 $filename 1> /dev/null
+                  test_status=$?
+                  if [ $test_status -eq 0 ]; then
+                    echo ":white_check_mark: Successfully ran test: $filename" >> $GITHUB_STEP_SUMMARY
+                  else
+                    echo ":x: Test failed (failed to execute): $filename" >> $GITHUB_STEP_SUMMARY
+                    test_err_sum=$((test_err_sum+1))
+                  fi
+                else
+                  echo "::warning::Unsupported file type: $filename"
+                  echo ":warning: Test skipped (unsupported file type): $filename" >> $GITHUB_STEP_SUMMARY
+                  test_skip_sum=$((test_skip_sum+1))
+                ;;
             esac
           done
 

CMakeLists.txt

@@ -60,10 +60,10 @@ get_filename_component(REAL_PROJECT_BINARY_DIR "${PROJECT_BINARY_DIR}" REALPATH)
 
 if("${REAL_PROJECT_SOURCE_DIR}" STREQUAL "${REAL_PROJECT_BINARY_DIR}")
   message(FATAL_ERROR
-    "In-source builds are not permitted. You must run cmake in a separeted "
+    "In-source builds are not permitted. You must run cmake in a separated "
     "directory, e.g.:\n"
     "    mkdir build && cd build && cmake ..\n"
-    "NOTE: Remeber to clean up the source tree by deleting the files already "
+    "NOTE: Remember to clean up the source tree by deleting the files already "
     "created by CMake, e.g, CMakeCache.txt and cmake.check_cache")
 endif()
 
@@ -73,7 +73,7 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 
-# Set warnings as errors by default. 
+# Set warnings as errors by default.
 # Individual targets and the command line invocation can override this behavior.
 if(NOT DEFINED CMAKE_COMPILE_WARNING_AS_ERROR)
   set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
@@ -95,7 +95,7 @@ endif()
 
 # Enable Amazon Braket backends by default.
 if (NOT DEFINED CUDAQ_ENABLE_BRAKET_BACKEND)
-  set(CUDAQ_ENABLE_BRAKET_BACKEND ON CACHE BOOL "Enable building AWS SDK for Amazon Braket backends.")
+  set(CUDAQ_ENABLE_BRAKET_BACKEND ON CACHE BOOL "Enable building AWS SDK for Amazon Bracket backends.")
 endif()
 
 # Enable Pasqal target by default.
@@ -108,6 +108,11 @@ if (NOT DEFINED CUDAQ_ENABLE_QCI_BACKEND)
   set(CUDAQ_ENABLE_QCI_BACKEND ON CACHE BOOL "Enable building the Quantum Circuits, Inc. target.")
 endif()
 
+# Enable TII target by default.
+if (NOT DEFINED CUDAQ_ENABLE_TII_BACKEND)
+  set(CUDAQ_ENABLE_TII_BACKEND ON CACHE BOOL "Enable building the TII target.")
+endif()
+
 # Enable Quantum Machines target by default.
 if (NOT DEFINED CUDAQ_ENABLE_QUANTUM_MACHINES_BACKEND)
   set(CUDAQ_ENABLE_QUANTUM_MACHINES_BACKEND ON CACHE BOOL "Enable building the Quantum Machines target.")
@@ -173,7 +178,7 @@ if(NOT LLVM_DIR AND EXISTS "$ENV{LLVM_INSTALL_PREFIX}/lib/cmake/llvm")
 endif()
 if(NOT BLAS_LIBRARIES AND EXISTS "$ENV{BLAS_INSTALL_PREFIX}/libblas.a")
   # CACHE INTERNAL is needed due to how FindBLAS.cmake works...
-  SET(BLAS_LIBRARIES "$ENV{BLAS_INSTALL_PREFIX}/libblas.a" CACHE INTERNAL "")	
+  SET(BLAS_LIBRARIES "$ENV{BLAS_INSTALL_PREFIX}/libblas.a" CACHE INTERNAL "")
 endif()
 if(NOT CUSTATEVEC_ROOT)
   SET(CUSTATEVEC_ROOT "$ENV{CUQUANTUM_INSTALL_PREFIX}" CACHE PATH "Path to cuStateVec installation")
@@ -190,7 +195,7 @@ endif()
 if(NOT ZLIB_ROOT)
   SET(ZLIB_ROOT "$ENV{ZLIB_INSTALL_PREFIX}" CACHE PATH "Path to zlib installation")
 endif()
-if(NOT OPENSSL_ROOT_DIR)	
+if(NOT OPENSSL_ROOT_DIR)
   SET(OPENSSL_ROOT_DIR "$ENV{OPENSSL_INSTALL_PREFIX}" CACHE PATH "Path to OpenSSL installation")
 endif()
 if (NOT crypto_LIBRARY AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND EXISTS "$ENV{OPENSSL_INSTALL_PREFIX}/lib64/libcrypto.a")
@@ -249,9 +254,9 @@ else()
   # flat_namespace makes all symbols global, allowing shared libraries to see
   # each other's registrations. This is not a very graceful fix.
   # Alternatives might be:
-  # A. Restructuring libraries to avoid multiple symbol definitions 
+  # A. Restructuring libraries to avoid multiple symbol definitions
   #    (but this still might struggle due to how plugin systems are used).
-  # B. Using LLVM/MLIR dylibs. This won't work until later versions of LLVM are used as 
+  # B. Using LLVM/MLIR dylibs. This won't work until later versions of LLVM are used as
   #    the first versions of this setting did not appropriately link all libraries to the dylibs.
   add_link_options("-Wl,-flat_namespace")
 endif()
@@ -275,7 +280,7 @@ if (CUDAQ_ENABLE_STATIC_LINKING)
   # then using -static (for exe) and -staic-pie (for linker).
   # At the time of writing, there wasn't any benefit to using those over -static.
   # When we only link libstdc++ and libgcc statically, we still have a dependency
-  # on GLIBC on the target system, but linking it statically is likely to cause issues. 
+  # on GLIBC on the target system, but linking it statically is likely to cause issues.
   # A better option might be to include the required GNU C Library and have the nvq++
   # compiler dynamically pick the newer one of the included or system one.
   # See also these posts:
@@ -284,10 +289,10 @@ if (CUDAQ_ENABLE_STATIC_LINKING)
   # If the final application loads multiple dynamic libraries, and two or more
   # of those dynamic libraries are linked to different versions of the same static
   # libraries, then the different copies of those static libraries will conflict with
-  # each other. If we were to link everything statically, it is probably advisable to 
-  # set CMAKE_<LANG>_VISIBILITY_PRESET to hidden and CMAKE_VISIBILITY_INLINES_HIDDEN 
+  # each other. If we were to link everything statically, it is probably advisable to
+  # set CMAKE_<LANG>_VISIBILITY_PRESET to hidden and CMAKE_VISIBILITY_INLINES_HIDDEN
   # to 1, to avoid some of these issues.
-  # We don't set these configurations here, since the LLVM runtime libraries that we 
+  # We don't set these configurations here, since the LLVM runtime libraries that we
   # build from source are already configured to hide symbols and include dependencies.
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
   SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
@@ -299,7 +304,7 @@ else()
   message(STATUS "CUDA Quantum static linking disabled.")
 endif()
 
-# ZLIB is required when we build LLVM with zlib support. 
+# ZLIB is required when we build LLVM with zlib support.
 # ZLIB support in LLVM is good to have e.g. for the linker,
 # since some binaries will use zlib compression to store symbols.
 find_package(ZLIB REQUIRED)
@@ -394,7 +399,7 @@ if(NOT Clang_DIR)
 endif()
 
 find_package(Clang CONFIG)
-if (NOT Clang_FOUND) 
+if (NOT Clang_FOUND)
   message(STATUS "Clang not found, turning off C++ Frontend.")
   set (CUDAQ_DISABLE_CPP_FRONTEND ON)
 endif()
@@ -508,7 +513,7 @@ execute_process(COMMAND git rev-parse --verify HEAD
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     OUTPUT_VARIABLE CUDA_QUANTUM_COMMIT_SHA OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-configure_file("${CMAKE_SOURCE_DIR}/include/cudaq/Support/Version.h.in" 
+configure_file("${CMAKE_SOURCE_DIR}/include/cudaq/Support/Version.h.in"
                "${CUDAQ_BINARY_DIR}/include/cudaq/Support/Version.h" @ONLY)
 
 # Check optional dependencies
@@ -538,7 +543,7 @@ add_subdirectory(tpls/fmt)
 cmake_policy(POP)
 include_directories(SYSTEM tpls/json/include)
 
-# Add spdlog 
+# Add spdlog
 set(SPDLOG_BUILD_SHARED OFF)
 set(SPDLOG_FMT_EXTERNAL ON)
 set(SPDLOG_BUILD_PIC ON)
@@ -663,7 +668,7 @@ endif()
 
 if (CUDAQ_ENABLE_PYTHON)
   find_package(Python 3 COMPONENTS Interpreter Development)
-  
+
   # Apply specific patch to pybind11 for our documentation.
   # Only apply the patch if not already applied.
   execute_process(COMMAND ${GIT_EXECUTABLE} -C tpls/pybind11/ apply ../customizations/pybind11/pybind.h.diff --ignore-whitespace --reverse --check
@@ -693,8 +698,8 @@ if (CUDAQ_ENABLE_PYTHON)
     message(FATAL_ERROR "Applying LTO patch to submodule failed with ${GIT_PATCH_RESULT}, please update patch")
   endif()
 
-  # Regarding the use of PyBind, we need to be careful that the same STL is used for any 
-  # Python bindings generated as part of the CUDA-Q build and bindings generated for 
+  # Regarding the use of PyBind, we need to be careful that the same STL is used for any
+  # Python bindings generated as part of the CUDA-Q build and bindings generated for
   # third party CUDA-Q libraries; see also https://github.com/pybind/pybind11/issues/1262
   add_subdirectory(tpls/pybind11)
   add_subdirectory(python)
@@ -706,8 +711,8 @@ if(CUDAQ_BUILD_TESTS AND NOT CUDAQ_DISABLE_CPP_FRONTEND)
   add_subdirectory(tpls/googletest-src)
   # Bug in GCC 12 leads to spurious warnings (-Wrestrict)
   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105329
-  if (CMAKE_COMPILER_IS_GNUCXX 
-    AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0.0 
+  if (CMAKE_COMPILER_IS_GNUCXX
+    AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0.0
     AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0.0)
     target_compile_options(gtest PUBLIC --param=evrp-mode=legacy)
   endif()
@@ -725,7 +730,7 @@ if(CUDAQ_BUILD_TESTS AND NOT CUDAQ_DISABLE_CPP_FRONTEND)
   umbrella_lit_testsuite_end(check-all)
 endif()
 
-if (CUDAQ_EXTERNAL_NVQIR_SIMS) 
+if (CUDAQ_EXTERNAL_NVQIR_SIMS)
   while(CUDAQ_EXTERNAL_NVQIR_SIMS)
     list(POP_FRONT CUDAQ_EXTERNAL_NVQIR_SIMS LIB_SO_OR_CONFIG_FILE)
     add_target_libs_to_wheel(${LIB_SO_OR_CONFIG_FILE})