ORNL-QCI · danclaudino · May 31, 2024 · May 31, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -10,8 +10,8 @@
 [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

diff --git a/quantum/plugins/CMakeLists.txt b/quantum/plugins/CMakeLists.txt
@@ -17,6 +17,7 @@ add_subdirectory(algorithms)
 add_subdirectory(decorators)
 add_subdirectory(circuits)
 add_subdirectory(optimizers)
+add_subdirectory(circuit_optimizers)
 add_subdirectory(iontrap)
 add_subdirectory(ionq)
 add_subdirectory(placement)

diff --git a/quantum/plugins/circuit_optimizers/CMakeLists.txt b/quantum/plugins/circuit_optimizers/CMakeLists.txt
@@ -0,0 +1,63 @@
+# *******************************************************************************
+# Copyright (c) 2019 UT-Battelle, LLC.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Eclipse Distribution License v.10 which accompany this distribution.
+# The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+# and the Eclipse Distribution License is available at
+# https://eclipse.org/org/documents/edl-v10.php
+#
+# Contributors:
+#   Alexander J. McCaskey - initial API and implementation
+# *******************************************************************************/
+set (LIBRARY_NAME xacc-circuit-optimizers)
+
+file (GLOB_RECURSE HEADERS *.hpp)
+file (GLOB SRC simple/*.cpp OptimizersActivator.cpp pulse/*.cpp gate_merge/*.cpp lnn_transform/*.cpp)
+
+# Set up dependencies to resources to track changes
+usFunctionGetResourceSource(TARGET ${LIBRARY_NAME} OUT SRC)
+# Generate bundle initialization code
+usFunctionGenerateBundleInit(TARGET ${LIBRARY_NAME} OUT SRC)
+
+add_library(${LIBRARY_NAME} SHARED ${SRC})
+
+set(_bundle_name xacc_circuit_optimizers)
+
+set_target_properties(${LIBRARY_NAME} PROPERTIES
+  # This is required for every bundle
+  COMPILE_DEFINITIONS US_BUNDLE_NAME=${_bundle_name}
+  # This is for convenience, used by other CMake functions
+  US_BUNDLE_NAME ${_bundle_name}
+  )
+
+# Embed meta-data from a manifest.json file
+usFunctionEmbedResources(TARGET ${LIBRARY_NAME}
+  WORKING_DIRECTORY
+    ${CMAKE_CURRENT_SOURCE_DIR}
+  FILES
+    manifest.json
+  )
+
+target_include_directories(${LIBRARY_NAME} PUBLIC simple pulse gate_merge lnn_transform ${EIGEN_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/tpls/exprtk)
+target_link_libraries(${LIBRARY_NAME} xacc xacc-quantum-gate)
+
+if(APPLE)
+   set_target_properties(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH "@loader_path/../lib;@loader_path")
+   set_target_properties(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+else()
+   set_target_properties(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN")
+   set_target_properties(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-shared")
+endif()
+
+install(TARGETS ${LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/plugins)
+
+# Gather tests
+if(XACC_BUILD_TESTS)
+  add_subdirectory(simple/tests)
+  add_subdirectory(pulse/tests)
+  add_subdirectory(gate_merge/tests)
+  add_subdirectory(lnn_transform/tests)
+endif()
+
+add_subdirectory(qsearch)
diff --git a/...lugins/optimizers/OptimizersActivator.cpp → ...ircuit_optimizers/OptimizersActivator.cpp b/...lugins/optimizers/OptimizersActivator.cpp → ...ircuit_optimizers/OptimizersActivator.cpp
diff --git a/...imizers/gate_merge/GateMergeOptimizer.cpp → ...imizers/gate_merge/GateMergeOptimizer.cpp b/...imizers/gate_merge/GateMergeOptimizer.cpp → ...imizers/gate_merge/GateMergeOptimizer.cpp
diff --git a/...imizers/gate_merge/GateMergeOptimizer.hpp → ...imizers/gate_merge/GateMergeOptimizer.hpp b/...imizers/gate_merge/GateMergeOptimizer.hpp → ...imizers/gate_merge/GateMergeOptimizer.hpp
diff --git a/...ptimizers/gate_merge/tests/CMakeLists.txt → ...ptimizers/gate_merge/tests/CMakeLists.txt b/...ptimizers/gate_merge/tests/CMakeLists.txt → ...ptimizers/gate_merge/tests/CMakeLists.txt
diff --git a/...rs/gate_merge/tests/GateMergingTester.cpp → ...rs/gate_merge/tests/GateMergingTester.cpp b/...rs/gate_merge/tests/GateMergingTester.cpp → ...rs/gate_merge/tests/GateMergingTester.cpp
diff --git a/...nn_transform/NearestNeighborTransform.cpp → ...nn_transform/NearestNeighborTransform.cpp b/...nn_transform/NearestNeighborTransform.cpp → ...nn_transform/NearestNeighborTransform.cpp
diff --git a/...nn_transform/NearestNeighborTransform.hpp → ...nn_transform/NearestNeighborTransform.hpp b/...nn_transform/NearestNeighborTransform.hpp → ...nn_transform/NearestNeighborTransform.hpp
diff --git a/...mizers/lnn_transform/tests/CMakeLists.txt → ...mizers/lnn_transform/tests/CMakeLists.txt b/...mizers/lnn_transform/tests/CMakeLists.txt → ...mizers/lnn_transform/tests/CMakeLists.txt
diff --git a/.../tests/NearestNeighborTransformTester.cpp → .../tests/NearestNeighborTransformTester.cpp b/.../tests/NearestNeighborTransformTester.cpp → .../tests/NearestNeighborTransformTester.cpp
diff --git a/quantum/plugins/optimizers/manifest.json → .../plugins/circuit_optimizers/manifest.json b/quantum/plugins/optimizers/manifest.json → .../plugins/circuit_optimizers/manifest.json
diff --git a/...ugins/optimizers/pulse/PulseTransform.cpp → ...rcuit_optimizers/pulse/PulseTransform.cpp b/...ugins/optimizers/pulse/PulseTransform.cpp → ...rcuit_optimizers/pulse/PulseTransform.cpp
diff --git a/...ugins/optimizers/pulse/PulseTransform.hpp → ...rcuit_optimizers/pulse/PulseTransform.hpp b/...ugins/optimizers/pulse/PulseTransform.hpp → ...rcuit_optimizers/pulse/PulseTransform.hpp
diff --git a/...ins/optimizers/pulse/tests/CMakeLists.txt → ...uit_optimizers/pulse/tests/CMakeLists.txt b/...ins/optimizers/pulse/tests/CMakeLists.txt → ...uit_optimizers/pulse/tests/CMakeLists.txt
diff --git a/...zers/pulse/tests/PulseTransformTester.cpp → ...zers/pulse/tests/PulseTransformTester.cpp b/...zers/pulse/tests/PulseTransformTester.cpp → ...zers/pulse/tests/PulseTransformTester.cpp
diff --git a/...plugins/optimizers/qsearch/CMakeLists.txt → ...circuit_optimizers/qsearch/CMakeLists.txt b/...plugins/optimizers/qsearch/CMakeLists.txt → ...circuit_optimizers/qsearch/CMakeLists.txt
diff --git a/.../plugins/optimizers/qsearch/manifest.json → .../circuit_optimizers/qsearch/manifest.json b/.../plugins/optimizers/qsearch/manifest.json → .../circuit_optimizers/qsearch/manifest.json
diff --git a/...um/plugins/optimizers/qsearch/qsearch.cpp → ...ns/circuit_optimizers/qsearch/qsearch.cpp b/...um/plugins/optimizers/qsearch/qsearch.cpp → ...ns/circuit_optimizers/qsearch/qsearch.cpp
diff --git a/...um/plugins/optimizers/qsearch/qsearch.hpp → ...ns/circuit_optimizers/qsearch/qsearch.hpp b/...um/plugins/optimizers/qsearch/qsearch.hpp → ...ns/circuit_optimizers/qsearch/qsearch.hpp
diff --git a/...s/optimizers/qsearch/tests/CMakeLists.txt → ...t_optimizers/qsearch/tests/CMakeLists.txt b/...s/optimizers/qsearch/tests/CMakeLists.txt → ...t_optimizers/qsearch/tests/CMakeLists.txt
diff --git a/.../qsearch/tests/QsearchOptimizerTester.cpp → .../qsearch/tests/QsearchOptimizerTester.cpp b/.../qsearch/tests/QsearchOptimizerTester.cpp → .../qsearch/tests/QsearchOptimizerTester.cpp
diff --git a/...ns/optimizers/simple/CircuitOptimizer.cpp → ...it_optimizers/simple/CircuitOptimizer.cpp b/...ns/optimizers/simple/CircuitOptimizer.cpp → ...it_optimizers/simple/CircuitOptimizer.cpp
diff --git a/...ns/optimizers/simple/CircuitOptimizer.hpp → ...it_optimizers/simple/CircuitOptimizer.hpp b/...ns/optimizers/simple/CircuitOptimizer.hpp → ...it_optimizers/simple/CircuitOptimizer.hpp
diff --git a/.../simple/PhasePolynomialRepresentation.cpp → .../simple/PhasePolynomialRepresentation.cpp b/.../simple/PhasePolynomialRepresentation.cpp → .../simple/PhasePolynomialRepresentation.cpp
diff --git a/.../simple/PhasePolynomialRepresentation.hpp → .../simple/PhasePolynomialRepresentation.hpp b/.../simple/PhasePolynomialRepresentation.hpp → .../simple/PhasePolynomialRepresentation.hpp
diff --git a/...s/optimizers/simple/default_placement.hpp → ...t_optimizers/simple/default_placement.hpp b/...s/optimizers/simple/default_placement.hpp → ...t_optimizers/simple/default_placement.hpp
diff --git a/...ns/optimizers/simple/tests/CMakeLists.txt → ...it_optimizers/simple/tests/CMakeLists.txt b/...ns/optimizers/simple/tests/CMakeLists.txt → ...it_optimizers/simple/tests/CMakeLists.txt
diff --git a/...s/simple/tests/CircuitOptimizerTester.cpp → ...s/simple/tests/CircuitOptimizerTester.cpp b/...s/simple/tests/CircuitOptimizerTester.cpp → ...s/simple/tests/CircuitOptimizerTester.cpp
diff --git a/quantum/plugins/optimizers/CMakeLists.txt b/quantum/plugins/optimizers/CMakeLists.txt
@@ -1,63 +1,2 @@
-# *******************************************************************************
-# Copyright (c) 2019 UT-Battelle, LLC.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Eclipse Distribution License v.10 which accompany this distribution.
-# The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
-# and the Eclipse Distribution License is available at
-# https://eclipse.org/org/documents/edl-v10.php
-#
-# Contributors:
-#   Alexander J. McCaskey - initial API and implementation
-# *******************************************************************************/
-set (LIBRARY_NAME xacc-circuit-optimizers)
-
-file (GLOB_RECURSE HEADERS *.hpp)
-file (GLOB SRC simple/*.cpp OptimizersActivator.cpp pulse/*.cpp gate_merge/*.cpp lnn_transform/*.cpp)
-
-# Set up dependencies to resources to track changes
-usFunctionGetResourceSource(TARGET ${LIBRARY_NAME} OUT SRC)
-# Generate bundle initialization code
-usFunctionGenerateBundleInit(TARGET ${LIBRARY_NAME} OUT SRC)
-
-add_library(${LIBRARY_NAME} SHARED ${SRC})
-
-set(_bundle_name xacc_circuit_optimizers)
-
-set_target_properties(${LIBRARY_NAME} PROPERTIES
-  # This is required for every bundle
-  COMPILE_DEFINITIONS US_BUNDLE_NAME=${_bundle_name}
-  # This is for convenience, used by other CMake functions
-  US_BUNDLE_NAME ${_bundle_name}
-  )
-
-# Embed meta-data from a manifest.json file
-usFunctionEmbedResources(TARGET ${LIBRARY_NAME}
-  WORKING_DIRECTORY
-    ${CMAKE_CURRENT_SOURCE_DIR}
-  FILES
-    manifest.json
-  )
-
-target_include_directories(${LIBRARY_NAME} PUBLIC simple pulse gate_merge lnn_transform ${EIGEN_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/tpls/exprtk)
-target_link_libraries(${LIBRARY_NAME} xacc xacc-quantum-gate)
-
-if(APPLE)
-   set_target_properties(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH "@loader_path/../lib;@loader_path")
-   set_target_properties(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-else()
-   set_target_properties(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN")
-   set_target_properties(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-shared")
-endif()
-
-install(TARGETS ${LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/plugins)
-
-# Gather tests
-if(XACC_BUILD_TESTS)
-  add_subdirectory(simple/tests)
-  add_subdirectory(pulse/tests)
-  add_subdirectory(gate_merge/tests)
-  add_subdirectory(lnn_transform/tests)
-endif()
-
-add_subdirectory(qsearch)
+add_subdirectory(nlopt-optimizers)
+add_subdirectory(mlpack)
diff --git a/xacc/optimizer/mlpack/CMakeLists.txt → .../plugins/optimizers/mlpack/CMakeLists.txt b/xacc/optimizer/mlpack/CMakeLists.txt → .../plugins/optimizers/mlpack/CMakeLists.txt
diff --git a/xacc/optimizer/mlpack/manifest.json → ...m/plugins/optimizers/mlpack/manifest.json b/xacc/optimizer/mlpack/manifest.json → ...m/plugins/optimizers/mlpack/manifest.json
diff --git a/xacc/optimizer/mlpack/mlpack_optimizer.cpp → ...ns/optimizers/mlpack/mlpack_optimizer.cpp b/xacc/optimizer/mlpack/mlpack_optimizer.cpp → ...ns/optimizers/mlpack/mlpack_optimizer.cpp
diff --git a/xacc/optimizer/mlpack/mlpack_optimizer.hpp → ...ns/optimizers/mlpack/mlpack_optimizer.hpp b/xacc/optimizer/mlpack/mlpack_optimizer.hpp → ...ns/optimizers/mlpack/mlpack_optimizer.hpp
diff --git a/xacc/optimizer/mlpack/tests/CMakeLists.txt → ...ns/optimizers/mlpack/tests/CMakeLists.txt b/xacc/optimizer/mlpack/tests/CMakeLists.txt → ...ns/optimizers/mlpack/tests/CMakeLists.txt
diff --git a/...er/mlpack/tests/MLPACKOptimizerTester.cpp → ...rs/mlpack/tests/MLPACKOptimizerTester.cpp b/...er/mlpack/tests/MLPACKOptimizerTester.cpp → ...rs/mlpack/tests/MLPACKOptimizerTester.cpp
diff --git a/...optimizer/nlopt-optimizers/CMakeLists.txt → ...ptimizers/nlopt-optimizers/CMakeLists.txt b/...optimizer/nlopt-optimizers/CMakeLists.txt → ...ptimizers/nlopt-optimizers/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(NLOPT_SWIG OFF CACHE BOOL "")
      set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE INTERNAL "No dev warnings")
    endif()
 set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
-add_subdirectory(nlopt)
+add_subdirectory(${CMAKE_SOURCE_DIR}/tpls/nlopt ${CMAKE_BINARY_DIR}/tpls/nlopt)
 
 set(LIBRARY_NAME xacc-optimizer-nlopt)
 
@@ -22,7 +22,7 @@ add_library(${LIBRARY_NAME} SHARED ${SRC})
 
 target_include_directories(
   ${LIBRARY_NAME}
-  PUBLIC . .. ${CMAKE_BUILD_DIR}/xacc/optimizer/nlopt-optimizers/nlopt/src/api)
+  PUBLIC . .. ${CMAKE_SOURCE_DIR}/tpls/nlopt/src/api)
 
 target_link_libraries(${LIBRARY_NAME} PUBLIC nlopt xacc CppMicroServices)
 

diff --git a/.../optimizer/nlopt-optimizers/manifest.json → ...optimizers/nlopt-optimizers/manifest.json b/.../optimizer/nlopt-optimizers/manifest.json → ...optimizers/nlopt-optimizers/manifest.json
diff --git a/...izer/nlopt-optimizers/nlopt_optimizer.cpp → ...zers/nlopt-optimizers/nlopt_optimizer.cpp b/...izer/nlopt-optimizers/nlopt_optimizer.cpp → ...zers/nlopt-optimizers/nlopt_optimizer.cpp
diff --git a/...izer/nlopt-optimizers/nlopt_optimizer.hpp → ...zers/nlopt-optimizers/nlopt_optimizer.hpp b/...izer/nlopt-optimizers/nlopt_optimizer.hpp → ...zers/nlopt-optimizers/nlopt_optimizer.hpp
diff --git a/...zer/nlopt-optimizers/tests/CMakeLists.txt → ...ers/nlopt-optimizers/tests/CMakeLists.txt b/...zer/nlopt-optimizers/tests/CMakeLists.txt → ...ers/nlopt-optimizers/tests/CMakeLists.txt
diff --git a/...pt-optimizers/tests/NLOptimizerTester.cpp → ...pt-optimizers/tests/NLOptimizerTester.cpp b/...pt-optimizers/tests/NLOptimizerTester.cpp → ...pt-optimizers/tests/NLOptimizerTester.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "xacc.hpp"
 #include "xacc_service.hpp"
-#include "nlopt_optimizer.hpp"
+//#include "nlopt_optimizer.hpp"
 
 using namespace xacc;
 

diff --git a/xacc/optimizer/nlopt-optimizers/nlopt → tpls/nlopt b/xacc/optimizer/nlopt-optimizers/nlopt → tpls/nlopt
diff --git a/xacc/CMakeLists.txt b/xacc/CMakeLists.txt
@@ -151,7 +151,6 @@ endif()
 install(FILES ${HEADERS} DESTINATION include/xacc)
 install(TARGETS xacc DESTINATION lib)
 
-add_subdirectory(optimizer)
 add_subdirectory(utils/exprtk_parsing)
 add_subdirectory(ir/graph-impl)
 add_subdirectory(utils/ini_config_parsing)
diff --git a/xacc/optimizer/CMakeLists.txt b/xacc/optimizer/CMakeLists.txt