Update Honeywell and IonQ backend info

.github/workflows/ci-linux-python.yml

@@ -28,7 +28,7 @@ jobs:
         run: sudo apt-get -y update && sudo apt-get install -y --no-install-recommends ninja-build libssl-dev libcurl4-openssl-dev python3 libpython3-dev python3-pip libblas-dev liblapack-dev
 
       - name: Install optional Python Packages 
-        run: python3 -m pip install numpy pyscf cma
+        run: python3 -m pip install "numpy<=1.26.4" pyscf cma
 
       - name: Configure
         working-directory: build/
@@ -40,4 +40,4 @@ jobs:
 
       - name: Test
         working-directory: python/tests
-        run: export PYTHONPATH=$PYTHONPATH:~/.xacc && python3 -m unittest discover -s . -p '*_testing.py'
+        run: export PYTHONPATH=$PYTHONPATH:~/.xacc && python3 -m unittest discover -s . -p '*_testing.py'

.gitignore

@@ -28,6 +28,9 @@
 *.out
 *.app
 /build/
+/build-*/
+/install/
+/install-*/
 /plugins/
 /.cproject
 /.project
@@ -49,4 +52,4 @@ compile_commands.json
 .vscode/*
 .theia/*
 # Python test cache
-__pycache__/
+__pycache__/

.gitmodules

@@ -6,12 +6,12 @@
 	url = https://github.com/ornl-qci/boost-cmake
 [submodule "tpls/cppmicroservices"]
 	path = tpls/cppmicroservices
-	url = https://github.com/ornl-qci/cppmicroservices
+	url = https://github.com/ORNL-QCI/CppMicroServices.git
 [submodule "quantum/plugins/dwave/embedding/minorminer"]
 	path = quantum/plugins/dwave/embedding/minorminer
 	url = https://github.com/dwavesystems/minorminer
-[submodule "xacc/optimizer/nlopt-optimizers/nlopt"]
-	path = xacc/optimizer/nlopt-optimizers/nlopt
+[submodule "tpls/nlopt"]
+	path = tpls/nlopt
 	url = https://github.com/stevengj/nlopt
 [submodule "quantum/plugins/dwave/tpls/legacy-sapi-clients"]
 	path = quantum/plugins/dwave/tpls/legacy-sapi-clients
@@ -21,7 +21,7 @@
 	url = https://github.com/ORNL-QCI/TriQ.git
 [submodule "tpls/qsim"]
 	path = tpls/qsim
-	url = https://github.com/ORNL-QCI/qsim.git
+	url = https://github.com/quantumlib/qsim.git
 [submodule "tpls/pybind11"]
 	path = tpls/pybind11
 	url = https://github.com/pybind/pybind11.git

CMakeLists.txt

@@ -16,10 +16,58 @@ set(CMAKE_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD 17)
 message(STATUS "C++ version ${CXX_STANDARD} configured.")
 
+if(NOT WIN32)
+  string(ASCII 27 Esc)
+  set(ColorReset "${Esc}[m")
+  set(ColorBold "${Esc}[1m")
+  set(Red "${Esc}[31m")
+  set(Green "${Esc}[32m")
+  set(Yellow "${Esc}[33m")
+  set(Blue "${Esc}[34m")
+  set(Magenta "${Esc}[35m")
+  set(Cyan "${Esc}[36m")
+  set(White "${Esc}[37m")
+  set(BoldRed "${Esc}[1;31m")
+  set(BoldGreen "${Esc}[1;32m")
+  set(BoldYellow "${Esc}[1;33m")
+  set(BoldBlue "${Esc}[1;34m")
+  set(BoldMagenta "${Esc}[1;35m")
+  set(BoldCyan "${Esc}[1;36m")
+  set(BoldWhite "${Esc}[1;37m")
+endif()
+
 option(XACC_BUILD_TESTS "Build test programs" OFF)
 option(XACC_BUILD_EXAMPLES "Build example programs" OFF)
 option(XACC_ENSMALLEN_INCLUDE_DIR "Path to ensmallen.hpp for mlpack optimizer" "")
 option(XACC_ARMADILLO_INCLUDE_DIR "Path to armadillo header for mlpack optimizer" "")
+option(XACC_BUILD_SCIPY "Build Scipy optimizer plugin" OFF)
+option(XACC_BUILD_ANNEALING "Build annealing libraries" OFF)
+option(XACC_BUILD_GSL "Build GNU Scientific Library optimizer plugin" OFF)
+option(XACC_BUILD_IONTRAP "Build the iontrap plugin" OFF)
+option(XACC_BUILD_SCIKIT_QUANT "Build the Scikit-quant plugin" OFF)
+option(XACC_BUILD_ATOS "Build the Atos QLM plugin" OFF)
+option(XACC_BUILD_QFACTOR "Build the QFactor plugin" OFF)
+option(XACC_BUILD_QSEARCH "Build the QSearch plugin" OFF)
+option(XACC_BUILD_QRACK "Build the Qrack plugin" OFF)
+
+if(XACC_BUILD_ANNEALING)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DANNEALING_ENABLED")
+else()
+  message(STATUS "${BoldYellow}Skipping Annealing libraries by default. You can turn it on with -DXACC_BUILD_ANNEALING=ON${ColorReset}")
+endif()
+
+option(QIREE_MINIMAL_BUILD "Build only components for QIREE CI" OFF)
+option(XACC_DEPS_EXTERNAL "Try find external dependencies (system installation) rather than tpls" OFF)
+
+if(QIREE_MINIMAL_BUILD)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQIREE_BUILD")
+endif()
+
+option(XACC_REMOTE_ACCELERATORS "Build remove (cloud) accelerators" ON)
+if(NOT XACC_REMOTE_ACCELERATORS)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DREMOTE_DISABLED")
+  message(STATUS "${BoldYellow}Skipping remote accelerators. Only local simulators are now enabled.{ColorReset}")
+endif()
 
 if(FROM_SETUP_PY AND NOT APPLE)
   message(STATUS "Running build from setup.py, linking to static libstdc++")
@@ -79,26 +127,6 @@ include(format)
 include(cxxFlags)
 include(ExternalProject)
 
-if(NOT WIN32)
-  string(ASCII 27 Esc)
-  set(ColorReset "${Esc}[m")
-  set(ColorBold "${Esc}[1m")
-  set(Red "${Esc}[31m")
-  set(Green "${Esc}[32m")
-  set(Yellow "${Esc}[33m")
-  set(Blue "${Esc}[34m")
-  set(Magenta "${Esc}[35m")
-  set(Cyan "${Esc}[36m")
-  set(White "${Esc}[37m")
-  set(BoldRed "${Esc}[1;31m")
-  set(BoldGreen "${Esc}[1;32m")
-  set(BoldYellow "${Esc}[1;33m")
-  set(BoldBlue "${Esc}[1;34m")
-  set(BoldMagenta "${Esc}[1;35m")
-  set(BoldCyan "${Esc}[1;36m")
-  set(BoldWhite "${Esc}[1;37m")
-endif()
-
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/.xacc" CACHE PATH "default install path" FORCE)
 endif()
@@ -138,7 +166,9 @@ add_compile_flags_if_supported(-Wno-maybe-uninitialized)
 # Check MPI status
 # if MPI_CXX_COMPILER is not empty and XACC_ENABLE_MPI is set
 # turn MPI_ENABLED on
-if(NOT MPI_CXX_COMPILER STREQUAL "" AND XACC_ENABLE_MPI)
+# Update: we don't really need to give the path to the compiler
+# because if MPI is found, MPI_CXX_COMPILER is populated
+if(XACC_ENABLE_MPI)
   find_package(MPI)
 
   if(MPI_FOUND)
@@ -148,6 +178,15 @@ if(NOT MPI_CXX_COMPILER STREQUAL "" AND XACC_ENABLE_MPI)
   endif()
 endif()
 
+if (XACC_DEPS_EXTERNAL)
+  find_package(Boost COMPONENTS graph)
+  find_package(cpr)
+  if(cpr_FOUND)
+    set(XACC_USE_EXTERNAL_CPR ON)
+  endif()
+  find_package(GTest)
+endif()
+
 include_directories(${CMAKE_BINARY_DIR}/tpls/cppmicroservices/include)
 add_subdirectory(tpls)
 
@@ -160,28 +199,27 @@ ENDIF()
 find_package(LAPACK)
 
 # Dependencies:
-option(XACC_DEPS_EXTERNAL "Try find external dependencies (system installation) rather than tpls" OFF)
-
-set(SPDLOG_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/tpls/spdlog/include/)
-if (XACC_DEPS_EXTERNAL) 
-  find_package(spdlog) 
-  if (spdlog_FOUND) 
-    get_target_property(SPDLOG_TARGET_INC_DIR spdlog::spdlog_header_only INTERFACE_INCLUDE_DIRECTORIES)
-    if (EXISTS ${SPDLOG_TARGET_INC_DIR}/spdlog/spdlog.h) 
-    # Found a seemingly valid spdlog installation, use it when XACC_DEPS_EXTERNAL is set
-    message(STATUS "${BoldGreen}spdlog: Found system installation at ${SPDLOG_TARGET_INC_DIR}/spdlog${ColorReset}")
-    set(SPDLOG_INCLUDE_DIR "${SPDLOG_TARGET_INC_DIR}")
-    endif()
-  endif()
+
+
+if (XACC_DEPS_EXTERNAL)
+  find_package(spdlog)
+endif()
+if(NOT spdlog_FOUND)
+  # Create an interface target to the vendored spdlog
+  set(SPDLOG_INCLUDE_DIR "${SPDLOG_TARGET_INC_DIR}")
+  add_library(spdlog::spdlog INTERFACE IMPORTED)
+  target_include_directories(spdlog::spdlog INTERFACE
+    "${PROJECT_SOURCE_DIR}/tpls/spdlog/include"
+  )
 endif()
 
 set(NLOHMANN_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/tpls/nlohmann/single_include)
-if (XACC_DEPS_EXTERNAL) 
-  find_package(nlohmann_json) 
-  if (nlohmann_json_FOUND) 
-    get_target_property(NLOHMANN_TARGET_INC_DIR nlohmann_json::nlohmann_json INTERFACE_INCLUDE_DIRECTORIES)
+if (XACC_DEPS_EXTERNAL)
+  find_package(nlohmann_json)
+  if (nlohmann_json_FOUND)
+    get_target_property(NLOHMANN_TARGET_INC_DIR nlohmann_json INTERFACE_INCLUDE_DIRECTORIES)
     list(GET NLOHMANN_TARGET_INC_DIR 0 NLOHMANN_TARGET_INC_DIR)
-    if (EXISTS ${NLOHMANN_TARGET_INC_DIR}/nlohmann/json.hpp) 
+    if (EXISTS ${NLOHMANN_TARGET_INC_DIR}/nlohmann/json.hpp)
       # Found a seemingly valid nlohmann installation, use it when XACC_DEPS_EXTERNAL is set
       message(STATUS "${BoldGreen}nlohmann: Found system installation at ${NLOHMANN_TARGET_INC_DIR}/nlohmann${ColorReset}")
       set(NLOHMANN_INCLUDE_DIR "${NLOHMANN_TARGET_INC_DIR}")
@@ -190,9 +228,9 @@ if (XACC_DEPS_EXTERNAL)
 endif()
 
 set(EIGEN_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/tpls/eigen)
-if (XACC_DEPS_EXTERNAL) 
-  find_package(Eigen3) 
-  if (Eigen3_FOUND) 
+if (XACC_DEPS_EXTERNAL)
+  find_package(Eigen3)
+  if (Eigen3_FOUND)
     message(STATUS "${BoldGreen}Eigen3: Found system installation (version ${EIGEN3_VERSION_STRING}) config at ${Eigen3_DIR}; include directory: ${EIGEN3_INCLUDE_DIR}.${ColorReset}")
     set(EIGEN_INCLUDE_DIR ${EIGEN3_INCLUDE_DIR})
   endif()
@@ -201,37 +239,47 @@ endif()
 add_subdirectory(xacc)
 add_subdirectory(quantum)
 
-find_package(Python COMPONENTS Interpreter Development)
-
-if(Python_FOUND)
-  if(${Python_VERSION} VERSION_GREATER_EQUAL 3.0.0)
-    message(STATUS "${BoldGreen}Found Python version ${Python_VERSION}. Building XACC Python API with ${Python_INCLUDE_DIRS}${ColorReset}")
-    add_subdirectory(python)
-    add_subdirectory(${CMAKE_SOURCE_DIR}/quantum/python)
-
-    # Double check we have module ipopo installed, contributes pelix
-    execute_process(COMMAND ${Python_EXECUTABLE} -c "import pelix" RESULT_VARIABLE PELIX_EXISTS)
+# qiree doesn't need python, so we can ignore this and everything else that is python related
+if(NOT QIREE_MINIMAL_BUILD)
 
-    if(PELIX_EXISTS EQUAL "1")
-      # if not, check we have pip
-      execute_process(COMMAND ${Python_EXECUTABLE} -c "import pip" RESULT_VARIABLE PIP_EXISTS)
+find_package(Python COMPONENTS Interpreter Development)
 
-      if(PIP_EXISTS EQUAL "0")
-        # we have pip, son just install ipopo
-        message(STATUS "${BoldGreen}Installing Pelix OSGi framework.${ColorReset}")
-        execute_process(COMMAND ${Python_EXECUTABLE} -m pip install ipopo)
+  if(Python_FOUND)
+    if(${Python_VERSION} VERSION_GREATER_EQUAL 3.0.0)
+      message(STATUS "${BoldGreen}Found Python version ${Python_VERSION}. Building XACC Python API with ${Python_INCLUDE_DIRS}${ColorReset}")
+      add_subdirectory(python)
+      add_subdirectory(${CMAKE_SOURCE_DIR}/quantum/python)
+
+      # Double check we have module ipopo installed, contributes pelix
+      execute_process(COMMAND ${Python_EXECUTABLE} -c "import pelix" RESULT_VARIABLE PELIX_EXISTS)
+
+      if(PELIX_EXISTS EQUAL "1")
+        # if not, check we have pip
+        execute_process(COMMAND ${Python_EXECUTABLE} -c "import pip" RESULT_VARIABLE PIP_EXISTS)
+
+        if(PIP_EXISTS EQUAL "0")
+          # we have pip, son just install ipopo
+          message(STATUS "${BoldGreen}Installing Pelix OSGi framework.${ColorReset}")
+          # iPOPO 3.0 only works with python 3.10+
+          if(${Python_VERSION} VERSION_GREATER_EQUAL 3.10.0)
+            execute_process(COMMAND ${Python_EXECUTABLE} -m pip install ipopo)
+          else()
+            execute_process(COMMAND ${Python_EXECUTABLE} -m pip install ipopo==1.0.2)
+          endif()
+        else()
+          # we dont have pip, so warn the user
+          message(STATUS "${BoldYellow}Pelix Framework not found, but can't install via pip. Ensure you install ipopo module before using XACC Python API.${ColorReset}")
+        endif()
       else()
-        # we dont have pip, so warn the user
-        message(STATUS "${BoldYellow}Pelix Framework not found, but can't install via pip. Ensure you install ipopo module before using XACC Python API.${ColorReset}")
+        message(STATUS "${BoldGreen}Found Pelix framework.${ColorReset}")
       endif()
     else()
-      message(STATUS "${BoldGreen}Found Pelix framework.${ColorReset}")
+      message(STATUS "${BoldYellow}Found Python version ${Python_VERSION}. Version must be greater than 3.0.0, skipping Python API build.${ColorReset}")
     endif()
   else()
-    message(STATUS "${BoldYellow}Found Python version ${Python_VERSION}. Version must be greater than 3.0.0, skipping Python API build.${ColorReset}")
+    message(STATUS "${BoldYellow}Python interpreter or development headers not found. Skipping Python API build.${ColorReset}")
   endif()
-else()
-  message(STATUS "${BoldYellow}Python interpreter or development headers not found. Skipping Python API build.${ColorReset}")
+
 endif()
 
 # Version info
@@ -244,17 +292,28 @@ set(PATCH_VERSION 0)
 # their CMake builds, and pass -DXACC_DIR=/path/to/install/xacc
 # and CMake loads include paths, libs, etc
 configure_file("${CMAKE_SOURCE_DIR}/cmake/xacc-config.cmake.in" "${CMAKE_BINARY_DIR}/xacc-config.cmake" @ONLY)
+configure_file("${CMAKE_SOURCE_DIR}/cmake/xacc-config-version.cmake.in" "${CMAKE_BINARY_DIR}/xacc-config-version.cmake" @ONLY)
 install(FILES "${CMAKE_BINARY_DIR}/xacc-config.cmake" DESTINATION .)
+install(FILES "${CMAKE_BINARY_DIR}/xacc-config-version.cmake" DESTINATION .)
 install(FILES "${CMAKE_SOURCE_DIR}/cmake/Modules/format.cmake" DESTINATION share/xacc/)
 install(FILES "${CMAKE_SOURCE_DIR}/tpls/mpark-variant/variant.hpp" DESTINATION include/xacc/)
 install(FILES "${CMAKE_SOURCE_DIR}/tpls/taocpp/operators.hpp" DESTINATION include/xacc/)
-install(FILES "${NLOHMANN_INCLUDE_DIR}/nlohmann/json.hpp" DESTINATION include/xacc/)
+if(NOT XACC_DEPS_EXTERNAL OR NOT nlohmann_json_FOUND)
+  install(FILES "${NLOHMANN_INCLUDE_DIR}/nlohmann/json.hpp" DESTINATION include/xacc/)
+endif()
 
-install(DIRECTORY "${SPDLOG_INCLUDE_DIR}" DESTINATION include/spdlog/)
+if(NOT XACC_DEPS_EXTERNAL OR NOT spdlog_FOUND)
+  install(DIRECTORY "${SPDLOG_INCLUDE_DIR}" DESTINATION include/spdlog/)
+endif()
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/exprtk" DESTINATION include)
-install(DIRECTORY "${EIGEN_INCLUDE_DIR}" DESTINATION include)
+if(NOT XACC_DEPS_EXTERNAL OR NOT Eigen3_FOUND)
+  install(DIRECTORY "${EIGEN_INCLUDE_DIR}" DESTINATION include)
+endif()
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/rapidjson" DESTINATION include)
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/pybind11" DESTINATION include)
+
+if(NOT QIREE_MINIMAL_BUILD)
+  install(DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/pybind11" DESTINATION include)
+endif()
 
 if(XACC_CPACK_DEB_PLATFORM)
   message(STATUS "CPack DEB Build Enabled.")

README.md

@@ -3,8 +3,7 @@
 
 | Branch | Status |
 |:-------|:-------|
-|master | [![Linux CI](https://github.com/eclipse/xacc/actions/workflows/ci-linux.yml/badge.svg?branch=master)](https://github.com/eclipse/xacc/actions/workflows/ci-linux.yml) [![Mac CI](https://github.com/eclipse/xacc/actions/workflows/ci-mac.yml/badge.svg?branch=master)](https://github.com/eclipse/xacc/actions/workflows/ci-mac.yml) |
-|devel | [![Linux CI](https://github.com/eclipse/xacc/actions/workflows/ci-linux.yml/badge.svg?branch=xacc-devel)](https://github.com/eclipse/xacc/actions/workflows/ci-linux.yml) [![Mac CI](https://github.com/eclipse/xacc/actions/workflows/ci-mac.yml/badge.svg?branch=xacc-devel)](https://github.com/eclipse/xacc/actions/workflows/ci-mac.yml)|
+|master | [![Linux CI](https://github.com/ORNL-QCI/xacc/actions/workflows/ci-linux.yml/badge.svg?branch=master)](https://github.com/ORNL-QCI/xacc/actions/workflows/ci-linux.yml) [![Mac CI](https://github.com/ORNL-QCI/xacc/actions/workflows/ci-mac.yml/badge.svg?branch=master)](https://github.com/ORNL-QCI/xacc/actions/workflows/ci-mac.yml) |
 
 
 ## Language and Hardware Independent Quantum Programming Framework

cmake/xacc-config-version.cmake.in

@@ -0,0 +1,8 @@
+set(PACKAGE_VERSION "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@")
+# The quotes for the right operand are intentional here: if CMake executes this
+# file without ${PACKAGE_FIND_VERSION} set, then if() will still get three
+# operands. Without the quotes, if() will only get two operands in that case,
+# throwing an error.
+if(${PACKAGE_VERSION} VERSION_GREATER_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_COMPATIBLE 1)
+endif()

cmake/xacc-config.cmake.in

@@ -20,11 +20,7 @@ if(NOT TARGET format)
 endif()
 
 # Set version info
-set(XACC_VERSION_MAJOR @MAJOR_VERSION@)
-set(XACC_VERSION_MINOR @MINOR_VERSION@)
-set(XACC_VERSION_PATCH @PATCH_VERSION@)
 set(XACC_VERSION_SUFFIX @XACC_BUILD_VERSION@)
-set(XACC_VERSION "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@-@XACC_BUILD_VERSION@")
 
 set(XACC_LIBRARY_DIR "${XACC_ROOT}/lib")
 

python/compiler/CMakeLists.txt

@@ -42,7 +42,11 @@ usFunctionEmbedResources(TARGET ${LIBRARY_NAME}
 
 target_include_directories(${LIBRARY_NAME} PRIVATE . generated
                                   ${CMAKE_SOURCE_DIR}/tpls/antlr/runtime/src)
-target_link_libraries(${LIBRARY_NAME} PUBLIC xacc xacc-quantum-gate xacc-quantum-annealing ${ANTLR_LIB})
+if(XACC_BUILD_ANNEALING)
+  target_link_libraries(${LIBRARY_NAME} PUBLIC xacc xacc-quantum-gate xacc-quantum-annealing ${ANTLR_LIB})
+else()
+  target_link_libraries(${LIBRARY_NAME} PUBLIC xacc xacc-quantum-gate ${ANTLR_LIB})
+endif()
 
 if(APPLE)
    set_target_properties(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH "@loader_path/../lib")