Move all headers from dir 'proxnlp' to dir 'proxsuite-nlp'

Simple-Robotics · Dec 18, 2023 · 6b0fb3a · 6b0fb3a
1 parent 394ad73
commit 6b0fb3a
Show file tree

Hide file tree

Showing 134 changed files with 285 additions and 286 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -141,7 +141,7 @@ if(BUILD_WITH_PINOCCHIO_SUPPORT)
 endif(BUILD_WITH_PINOCCHIO_SUPPORT)
 
 # --- MAIN LIBRARY ----------------------------------------
-set(LIB_HEADER_DIR ${PROJECT_SOURCE_DIR}/include/proxnlp)
+set(LIB_HEADER_DIR ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
 file(GLOB_RECURSE LIB_HEADERS ${LIB_HEADER_DIR}/*.hpp ${LIB_HEADER_DIR}/*.hxx)
 
 set(LIB_SOURCES ${PROJECT_SOURCE_DIR}/src/block-kind.cpp)
@@ -242,7 +242,6 @@ add_header_group(LIB_HEADERS)
 install(
   TARGETS ${PROJECT_NAME}
   EXPORT ${TARGETS_EXPORT_NAME}
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
   INCLUDES
   DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}

diff --git a/examples/circle.cpp b/examples/circle.cpp
@@ -2,13 +2,13 @@
  * Optimize a quadratic function on a circle, or on a disk.
  *
  */
-#include "proxnlp/cost-function.hpp"
-#include "proxnlp/pdal.hpp"
-#include "proxnlp/modelling/spaces/vector-space.hpp"
-#include "proxnlp/modelling/costs/squared-distance.hpp"
-#include "proxnlp/modelling/costs/quadratic-residual.hpp"
-#include "proxnlp/modelling/constraints/negative-orthant.hpp"
-#include "proxnlp/prox-solver.hpp"
+#include "proxsuite-nlp/cost-function.hpp"
+#include "proxsuite-nlp/pdal.hpp"
+#include "proxsuite-nlp/modelling/spaces/vector-space.hpp"
+#include "proxsuite-nlp/modelling/costs/squared-distance.hpp"
+#include "proxsuite-nlp/modelling/costs/quadratic-residual.hpp"
+#include "proxsuite-nlp/modelling/constraints/negative-orthant.hpp"
+#include "proxsuite-nlp/prox-solver.hpp"
 
 #include "example-base.hpp"
 

diff --git a/examples/equality-qp.cpp b/examples/equality-qp.cpp
@@ -1,10 +1,10 @@
 /* Copyright (C) 2022 LAAS-CNRS, INRIA
  */
-#include "proxnlp/modelling/costs/squared-distance.hpp"
-#include "proxnlp/modelling/residuals/linear.hpp"
-#include "proxnlp/modelling/constraints/equality-constraint.hpp"
-#include "proxnlp/modelling/spaces/vector-space.hpp"
-#include "proxnlp/prox-solver.hpp"
+#include "proxsuite-nlp/modelling/costs/squared-distance.hpp"
+#include "proxsuite-nlp/modelling/residuals/linear.hpp"
+#include "proxsuite-nlp/modelling/constraints/equality-constraint.hpp"
+#include "proxsuite-nlp/modelling/spaces/vector-space.hpp"
+#include "proxsuite-nlp/prox-solver.hpp"
 
 #include "example-base.hpp"
 

diff --git a/examples/so2.cpp b/examples/so2.cpp
@@ -2,9 +2,9 @@
  * Optimize a quadratic function on a circle, or on a disk.
  *
  */
-#include "proxnlp/modelling/spaces/pinocchio-groups.hpp"
-#include "proxnlp/modelling/costs/squared-distance.hpp"
-#include "proxnlp/prox-solver.hpp"
+#include "proxsuite-nlp/modelling/spaces/pinocchio-groups.hpp"
+#include "proxsuite-nlp/modelling/costs/squared-distance.hpp"
+#include "proxsuite-nlp/prox-solver.hpp"
 
 #include <pinocchio/multibody/liegroup/special-orthogonal.hpp>
 #include "example-base.hpp"

diff --git a/examples/ur5-ik.cpp b/examples/ur5-ik.cpp
@@ -5,12 +5,12 @@
 #include <pinocchio/multibody/data.hpp>
 #include <pinocchio/parsers/urdf.hpp>
 
-#include <proxnlp/modelling/spaces/multibody.hpp>
-#include <proxnlp/modelling/costs/quadratic-residual.hpp>
-#include <proxnlp/modelling/costs/squared-distance.hpp>
-#include <proxnlp/cost-sum.hpp>
-#include <proxnlp/prox-solver.hpp>
-#include <proxnlp/modelling/constraints.hpp>
+#include <proxsuite-nlp/modelling/spaces/multibody.hpp>
+#include <proxsuite-nlp/modelling/costs/quadratic-residual.hpp>
+#include <proxsuite-nlp/modelling/costs/squared-distance.hpp>
+#include <proxsuite-nlp/cost-sum.hpp>
+#include <proxsuite-nlp/prox-solver.hpp>
+#include <proxsuite-nlp/modelling/constraints.hpp>
 
 #include <boost/filesystem/path.hpp>
 

diff --git a/include/proxnlp/modelling/spaces/cartesian-product.txx b/include/proxnlp/modelling/spaces/cartesian-product.txx
diff --git a/include/proxnlp/bcl-params.hpp → include/proxsuite-nlp/bcl-params.hpp b/include/proxnlp/bcl-params.hpp → include/proxsuite-nlp/bcl-params.hpp
diff --git a/include/proxnlp/constraint-base.hpp → include/proxsuite-nlp/constraint-base.hpp b/include/proxnlp/constraint-base.hpp → include/proxsuite-nlp/constraint-base.hpp
@@ -2,7 +2,7 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/function-base.hpp"
+#include "proxsuite-nlp/function-base.hpp"
 
 namespace proxnlp {
 
@@ -139,4 +139,4 @@ template <typename _Scalar> struct ConstraintObjectTpl {
 
 } // namespace proxnlp
 
-#include "proxnlp/constraint-base.hxx"
+#include "proxsuite-nlp/constraint-base.hxx"
diff --git a/include/proxnlp/constraint-base.hxx → include/proxsuite-nlp/constraint-base.hxx b/include/proxnlp/constraint-base.hxx → include/proxsuite-nlp/constraint-base.hxx
diff --git a/include/proxnlp/context.hpp → include/proxsuite-nlp/context.hpp b/include/proxnlp/context.hpp → include/proxsuite-nlp/context.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "proxnlp/fwd.hpp"
+#include "proxsuite-nlp/fwd.hpp"
 
 namespace proxnlp {
 namespace context {

diff --git a/include/proxnlp/cost-function.hpp → include/proxsuite-nlp/cost-function.hpp b/include/proxnlp/cost-function.hpp → include/proxsuite-nlp/cost-function.hpp
@@ -2,8 +2,8 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/manifold-base.hpp"
-#include "proxnlp/function-base.hpp"
+#include "proxsuite-nlp/manifold-base.hpp"
+#include "proxsuite-nlp/function-base.hpp"
 
 #include <boost/core/demangle.hpp>
 #include <ostream>
@@ -119,5 +119,5 @@ template <typename _Scalar> struct func_to_cost : CostFunctionBaseTpl<_Scalar> {
 } // namespace proxnlp
 
 #ifdef PROXSUITE_NLP_ENABLE_TEMPLATE_INSTANTIATION
-#include "proxnlp/cost-function.txx"
+#include "proxsuite-nlp/cost-function.txx"
 #endif
diff --git a/include/proxnlp/cost-function.txx → include/proxsuite-nlp/cost-function.txx b/include/proxnlp/cost-function.txx → include/proxsuite-nlp/cost-function.txx
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "proxnlp/cost-function.hpp"
+#include "proxsuite-nlp/cost-function.hpp"
 
 namespace proxnlp {
 

diff --git a/include/proxnlp/cost-sum.hpp → include/proxsuite-nlp/cost-sum.hpp b/include/proxnlp/cost-sum.hpp → include/proxsuite-nlp/cost-sum.hpp
@@ -2,7 +2,7 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/cost-function.hpp"
+#include "proxsuite-nlp/cost-function.hpp"
 
 namespace proxnlp {
 
@@ -112,8 +112,8 @@ template <typename _Scalar> struct CostSumTpl : CostFunctionBaseTpl<_Scalar> {
 
 } // namespace proxnlp
 
-#include "proxnlp/cost-sum.hxx"
+#include "proxsuite-nlp/cost-sum.hxx"
 
 #ifdef PROXSUITE_NLP_ENABLE_TEMPLATE_INSTANTIATION
-#include "proxnlp/cost-sum.txx"
+#include "proxsuite-nlp/cost-sum.txx"
 #endif
diff --git a/include/proxnlp/cost-sum.hxx → include/proxsuite-nlp/cost-sum.hxx b/include/proxnlp/cost-sum.hxx → include/proxsuite-nlp/cost-sum.hxx
@@ -2,7 +2,7 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/cost-sum.hpp"
+#include "proxsuite-nlp/cost-sum.hpp"
 
 namespace proxnlp {
 

diff --git a/include/proxnlp/cost-sum.txx → include/proxsuite-nlp/cost-sum.txx b/include/proxnlp/cost-sum.txx → include/proxsuite-nlp/cost-sum.txx
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "./cost-sum.hpp"
-#include "proxnlp/context.hpp"
+#include "proxsuite-nlp/context.hpp"
 
 namespace proxnlp {
 

diff --git a/include/proxnlp/exceptions.hpp → include/proxsuite-nlp/exceptions.hpp b/include/proxnlp/exceptions.hpp → include/proxsuite-nlp/exceptions.hpp
diff --git a/include/proxnlp/fmt-eigen.hpp → include/proxsuite-nlp/fmt-eigen.hpp b/include/proxnlp/fmt-eigen.hpp → include/proxsuite-nlp/fmt-eigen.hpp
diff --git a/include/proxnlp/function-base.hpp → include/proxsuite-nlp/function-base.hpp b/include/proxnlp/function-base.hpp → include/proxsuite-nlp/function-base.hpp
@@ -3,7 +3,7 @@
 /// @brief     Base definitions for function classes.
 #pragma once
 
-#include "proxnlp/fwd.hpp"
+#include "proxsuite-nlp/fwd.hpp"
 
 namespace proxnlp {
 /**
@@ -85,5 +85,5 @@ struct C2FunctionTpl : public C1FunctionTpl<_Scalar> {
 } // namespace proxnlp
 
 #ifdef PROXSUITE_NLP_ENABLE_TEMPLATE_INSTANTIATION
-#include "proxnlp/function-base.txx"
+#include "proxsuite-nlp/function-base.txx"
 #endif
diff --git a/include/proxnlp/function-base.txx → include/proxsuite-nlp/function-base.txx b/include/proxnlp/function-base.txx → include/proxsuite-nlp/function-base.txx
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "proxnlp/context.hpp"
-#include "proxnlp/function-base.hpp"
+#include "proxsuite-nlp/context.hpp"
+#include "proxsuite-nlp/function-base.hpp"
 
 namespace proxnlp {
 

diff --git a/include/proxnlp/function-ops.hpp → include/proxsuite-nlp/function-ops.hpp b/include/proxnlp/function-ops.hpp → include/proxsuite-nlp/function-ops.hpp
@@ -2,7 +2,7 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/function-base.hpp"
+#include "proxsuite-nlp/function-base.hpp"
 
 #include <utility>
 
@@ -60,5 +60,5 @@ auto compose(const shared_ptr<C2FunctionTpl<Scalar>> &left,
 } // namespace proxnlp
 
 #ifdef PROXSUITE_NLP_ENABLE_TEMPLATE_INSTANTIATION
-#include "proxnlp/function-ops.txx"
+#include "proxsuite-nlp/function-ops.txx"
 #endif
diff --git a/include/proxnlp/function-ops.txx → include/proxsuite-nlp/function-ops.txx b/include/proxnlp/function-ops.txx → include/proxsuite-nlp/function-ops.txx
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "proxnlp/context.hpp"
-#include "proxnlp/function-ops.hpp"
+#include "proxsuite-nlp/context.hpp"
+#include "proxsuite-nlp/function-ops.hpp"
 
 namespace proxnlp {
 

diff --git a/include/proxnlp/fwd.hpp → include/proxsuite-nlp/fwd.hpp b/include/proxnlp/fwd.hpp → include/proxsuite-nlp/fwd.hpp
@@ -30,9 +30,9 @@ using std::unique_ptr;
 
 } // namespace proxnlp
 
-#include "proxnlp/math.hpp"
-#include "proxnlp/exceptions.hpp"
-#include "proxnlp/macros.hpp"
+#include "proxsuite-nlp/math.hpp"
+#include "proxsuite-nlp/exceptions.hpp"
+#include "proxsuite-nlp/macros.hpp"
 #include "proxsuite-nlp/config.hpp"
 #include "proxsuite-nlp/deprecated.hpp"
 #include "proxsuite-nlp/warning.hpp"

diff --git a/include/proxnlp/helpers-base.hpp → include/proxsuite-nlp/helpers-base.hpp b/include/proxnlp/helpers-base.hpp → include/proxsuite-nlp/helpers-base.hpp
@@ -2,7 +2,7 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/fwd.hpp"
+#include "proxsuite-nlp/fwd.hpp"
 
 namespace proxnlp {
 namespace helpers {

diff --git a/include/proxnlp/helpers/history-callback.hpp → ...roxsuite-nlp/helpers/history-callback.hpp b/include/proxnlp/helpers/history-callback.hpp → ...roxsuite-nlp/helpers/history-callback.hpp
@@ -2,10 +2,10 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/fwd.hpp"
-#include "proxnlp/helpers-base.hpp"
-#include "proxnlp/workspace.hpp"
-#include "proxnlp/results.hpp"
+#include "proxsuite-nlp/fwd.hpp"
+#include "proxsuite-nlp/helpers-base.hpp"
+#include "proxsuite-nlp/workspace.hpp"
+#include "proxsuite-nlp/results.hpp"
 
 namespace proxnlp {
 namespace helpers {

diff --git a/include/proxnlp/helpers/print-callback.hpp → .../proxsuite-nlp/helpers/print-callback.hpp b/include/proxnlp/helpers/print-callback.hpp → .../proxsuite-nlp/helpers/print-callback.hpp
@@ -2,7 +2,7 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/helpers-base.hpp"
+#include "proxsuite-nlp/helpers-base.hpp"
 
 namespace proxnlp {
 namespace helpers {

diff --git a/include/proxnlp/ldlt-allocator.hpp → include/proxsuite-nlp/ldlt-allocator.hpp b/include/proxnlp/ldlt-allocator.hpp → include/proxsuite-nlp/ldlt-allocator.hpp
@@ -4,10 +4,10 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/linalg/block-ldlt.hpp"
-#include "proxnlp/linalg/bunchkaufman.hpp"
+#include "proxsuite-nlp/linalg/block-ldlt.hpp"
+#include "proxsuite-nlp/linalg/bunchkaufman.hpp"
 #ifdef PROXSUITE_NLP_USE_PROXSUITE_LDLT
-#include "proxnlp/linalg/proxsuite-ldlt-wrap.hpp"
+#include "proxsuite-nlp/linalg/proxsuite-ldlt-wrap.hpp"
 #endif
 #include <boost/variant.hpp>
 #include <array>

diff --git a/include/proxnlp/linalg/block-kind.hpp → include/proxsuite-nlp/linalg/block-kind.hpp b/include/proxnlp/linalg/block-kind.hpp → include/proxsuite-nlp/linalg/block-kind.hpp
diff --git a/include/proxnlp/linalg/block-ldlt.hpp → include/proxsuite-nlp/linalg/block-ldlt.hpp b/include/proxnlp/linalg/block-ldlt.hpp → include/proxsuite-nlp/linalg/block-ldlt.hpp
@@ -5,10 +5,10 @@
 /// @copyright Copyright (C) 2022-2023 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/linalg/dense.hpp"
-#include "proxnlp/linalg/block-triangular.hpp"
+#include "proxsuite-nlp/linalg/dense.hpp"
+#include "proxsuite-nlp/linalg/block-triangular.hpp"
 
-#include "proxnlp/linalg/gemmt.hpp"
+#include "proxsuite-nlp/linalg/gemmt.hpp"
 
 #include <numeric>
 

diff --git a/include/proxnlp/linalg/block-ldlt.hxx → include/proxsuite-nlp/linalg/block-ldlt.hxx b/include/proxnlp/linalg/block-ldlt.hxx → include/proxsuite-nlp/linalg/block-ldlt.hxx
diff --git a/include/proxnlp/linalg/block-ldlt.txx → include/proxsuite-nlp/linalg/block-ldlt.txx b/include/proxnlp/linalg/block-ldlt.txx → include/proxsuite-nlp/linalg/block-ldlt.txx
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "proxnlp/context.hpp"
+#include "proxsuite-nlp/context.hpp"
 #include "./block-ldlt.hpp"
 
 namespace proxnlp {

diff --git a/include/proxnlp/linalg/block-triangular.hpp → ...proxsuite-nlp/linalg/block-triangular.hpp b/include/proxnlp/linalg/block-triangular.hpp → ...proxsuite-nlp/linalg/block-triangular.hpp
@@ -2,9 +2,9 @@
 /// @copyright Copyright (C) 2023 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/linalg/block-kind.hpp"
-#include "proxnlp/math.hpp"
-#include "proxnlp/linalg/gemmt.hpp"
+#include "proxsuite-nlp/linalg/block-kind.hpp"
+#include "proxsuite-nlp/math.hpp"
+#include "proxsuite-nlp/linalg/gemmt.hpp"
 
 namespace proxnlp {
 namespace linalg {

diff --git a/include/proxnlp/linalg/bunchkaufman.hpp → ...ude/proxsuite-nlp/linalg/bunchkaufman.hpp b/include/proxnlp/linalg/bunchkaufman.hpp → ...ude/proxsuite-nlp/linalg/bunchkaufman.hpp
diff --git a/include/proxnlp/linalg/dense.hpp → include/proxsuite-nlp/linalg/dense.hpp b/include/proxnlp/linalg/dense.hpp → include/proxsuite-nlp/linalg/dense.hpp
@@ -5,7 +5,7 @@
 /// @copyright Copyright (C) 2022-2023 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/linalg/ldlt-base.hpp"
+#include "proxsuite-nlp/linalg/ldlt-base.hpp"
 
 namespace proxnlp {
 namespace linalg {

diff --git a/include/proxnlp/linalg/gemmt.hpp → include/proxsuite-nlp/linalg/gemmt.hpp b/include/proxnlp/linalg/gemmt.hpp → include/proxsuite-nlp/linalg/gemmt.hpp
@@ -2,7 +2,7 @@
 /// @copyright Copyright (C) 2022 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/linalg/block-kind.hpp"
+#include "proxsuite-nlp/linalg/block-kind.hpp"
 
 namespace proxnlp {
 namespace linalg {

diff --git a/include/proxnlp/linalg/ldlt-base.hpp → include/proxsuite-nlp/linalg/ldlt-base.hpp b/include/proxnlp/linalg/ldlt-base.hpp → include/proxsuite-nlp/linalg/ldlt-base.hpp
@@ -4,9 +4,9 @@
 /// @copyright Copyright (C) 2022-2023 LAAS-CNRS, INRIA
 #pragma once
 
-#include "proxnlp/math.hpp"
-#include "proxnlp/exceptions.hpp"
-#include "proxnlp/macros.hpp"
+#include "proxsuite-nlp/math.hpp"
+#include "proxsuite-nlp/exceptions.hpp"
+#include "proxsuite-nlp/macros.hpp"
 
 #include <Eigen/Cholesky>
 

diff --git a/...de/proxnlp/linalg/proxsuite-ldlt-wrap.hpp → ...xsuite-nlp/linalg/proxsuite-ldlt-wrap.hpp b/...de/proxnlp/linalg/proxsuite-ldlt-wrap.hpp → ...xsuite-nlp/linalg/proxsuite-ldlt-wrap.hpp
@@ -4,7 +4,7 @@
 
 #include <proxsuite/linalg/dense/ldlt.hpp>
 
-#include "proxnlp/linalg/ldlt-base.hpp"
+#include "proxsuite-nlp/linalg/ldlt-base.hpp"
 
 namespace {
 

diff --git a/include/proxnlp/linesearch-armijo.hpp → include/proxsuite-nlp/linesearch-armijo.hpp b/include/proxnlp/linesearch-armijo.hpp → include/proxsuite-nlp/linesearch-armijo.hpp
@@ -3,8 +3,8 @@
 /// @brief  Implements a basic Armijo back-tracking strategy.
 #pragma once
 
-#include "proxnlp/linesearch-base.hpp"
-#include "proxnlp/exceptions.hpp"
+#include "proxsuite-nlp/linesearch-base.hpp"
+#include "proxsuite-nlp/exceptions.hpp"
 
 #include <Eigen/QR>