Merge branch 'devel' into topic/manifold-polymorphic-value

Author: ManifoldFR

.github/workflows/gh-pages.yml

@@ -37,7 +37,7 @@ jobs:
           mamba install cmake make pkg-config doxygen graphviz
 
           # Main dependencies
-          mamba install eigen pinocchio fmt proxsuite-nlp
+          mamba install eigen pinocchio fmt proxsuite-nlp example-robot-data
 
       - name: Print environment
         shell: bash -l {0}

.pre-commit-config.yaml

@@ -28,7 +28,7 @@ repos:
             )$
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.6.1'
+    rev: 'v0.6.3'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

CHANGELOG.md

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Add the `polymorphic_cxx14.hpp` header from [jbcoe/value_types](https://github.com/jbcoe/value_types/blob/main/polymorphic_cxx14.h), [#90](https://github.com/Simple-Robotics/proxsuite-nlp/pull/90)
 * **Python:** add conversions (for values, versions) for the `polymorphic<T,A>` types in new `<proxsuite-nlp/python/polymorphic.hpp>` header
 * **Python:** add `PolymorphicVisitor` visitor and `register_polymorphic_to_python<T>()` template function to register conversions from/to the `polymorphic<T, A>` type
+* Allow use of installed jrl-cmakemodules & eigenrand ([#106](https://github.com/Simple-Robotics/proxsuite-nlp/pull/106))
+
+## [0.7.1] - 2024-09-04
+
+### Added
+* Add compatibility with jrl-cmakemodules workspace ([#99](https://github.com/Simple-Robotics/proxsuite-nlp/pull/99))
 
 ### Fixed
 
@@ -34,14 +40,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-* Solver: store problem instance as a raw pointer, change solver ctor ([#79](https://github.com/Simple-Robotics/proxsuite-nlp/pull/79))
 * Allow to build with fmt 11 ([#97](https://github.com/Simple-Robotics/proxsuite-nlp/pull/97))
 
 ## [0.6.1] - 2024-05-13
 
 ### Changed
 
 * Changes to includes and tests for linesearch methods ([#81](https://github.com/Simple-Robotics/proxsuite-nlp/pull/81))
+* Solver: store problem instance as a raw pointer, change solver ctor ([#79](https://github.com/Simple-Robotics/proxsuite-nlp/pull/79))
 
 ## [0.6.0] - 2024-05-02
 
@@ -113,7 +119,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * This is the first release of `proxsuite-nlp`. This library is a joint effort between LAAS-CNRS and INRIA, and will be maintained and expanded in the future. Please provide constructive feedback and contribute!
 
-[Unreleased]: https://github.com/Simple-Robotics/proxsuite-nlp/compare/v0.7.0...HEAD
+[Unreleased]: https://github.com/Simple-Robotics/proxsuite-nlp/compare/v0.7.1...HEAD
+[0.7.1]: https://github.com/Simple-Robotics/proxsuite-nlp/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/Simple-Robotics/proxsuite-nlp/compare/v0.6.1...v0.7.0
 [0.6.1]: https://github.com/Simple-Robotics/proxsuite-nlp/compare/v0.6.0...v0.6.1
 [0.6.0]: https://github.com/Simple-Robotics/proxsuite-nlp/compare/v0.5.0...v0.6.0

CITATION.cff

@@ -21,3 +21,6 @@ authors:
     email: [email protected]
     affiliation: LAAS-CNRS
     orcid: 'https://orcid.org/0000-0002-8090-0601'
+version: 0.7.1
+date-released: "2024-09-04"
+license: BSD-2-Clause

CMakeLists.txt

@@ -73,10 +73,10 @@ compute_project_args(PROJECT_ARGS LANGUAGES CXX)
 project(${PROJECT_NAME} ${PROJECT_ARGS})
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
-include(${CMAKE_CURRENT_LIST_DIR}/cmake/boost.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/cmake/ide.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/cmake/apple.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/cmake/python.cmake)
+include(${JRL_CMAKE_MODULES}/boost.cmake)
+include(${JRL_CMAKE_MODULES}/ide.cmake)
+include(${JRL_CMAKE_MODULES}/apple.cmake)
+include(${JRL_CMAKE_MODULES}/python.cmake)
 include(CMakeDependentOption)
 
 apply_default_apple_configuration()

cmake

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>proxsuite-nlp</name>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
   <maintainer email="[email protected]">Wilson Jallet</maintainer>
   <description> A primal-dual augmented Lagrangian-type solver for nonlinear programming on manifolds.</description>
   <license>tbd</license>

package.xml

@@ -4,27 +4,36 @@
 
 add_project_dependency(Boost COMPONENTS unit_test_framework REQUIRED)
 
-# Fetch private dependencies
-include(FetchContent)
-
-# Add eigenrand dependency
-# TODO use main bab2min/EigenRand when PR is merged
-FetchContent_Declare(
-  eigenrand
-  GIT_REPOSITORY https://github.com/ManifoldFR/EigenRand.git
-  GIT_TAG 23d287e
-  GIT_PROGRESS TRUE
-  EXCLUDE_FROM_ALL SYSTEM
+find_path(
+  EigenRand_INCLUDE_DIR
+  NAMES EigenRand
+  PATHS ${EigenRand_PREFIX}
+  PATH_SUFFIXES include/EigenRand
 )
-set(EIGENRAND_BUILD_TEST
-    OFF
-    CACHE INTERNAL "Enable EigenRand test"
-)
-set(EIGENRAND_BUILD_BENCHMARK
-    OFF
-    CACHE INTERNAL "Enable EigenRand benchmark"
-)
-FetchContent_MakeAvailable(eigenrand)
+
+if(NOT EigenRand_INCLUDE_DIR)
+  # Fetch private dependencies
+  include(FetchContent)
+
+  # Add eigenrand dependency
+  # TODO use main bab2min/EigenRand when PR is merged
+  FetchContent_Declare(
+    eigenrand
+    GIT_REPOSITORY https://github.com/ManifoldFR/EigenRand.git
+    GIT_TAG 23d287e
+    GIT_PROGRESS TRUE
+    EXCLUDE_FROM_ALL SYSTEM
+  )
+  set(EIGENRAND_BUILD_TEST
+      OFF
+      CACHE INTERNAL "Enable EigenRand test"
+  )
+  set(EIGENRAND_BUILD_BENCHMARK
+      OFF
+      CACHE INTERNAL "Enable EigenRand benchmark"
+  )
+  FetchContent_MakeAvailable(eigenrand)
+endif()
 
 # Add benchmark dependency
 if(BUILD_BENCHMARK)
@@ -49,7 +58,15 @@ install(
 set(TEST_UTIL_LIB ${PROJECT_NAME}-test_util)
 add_library(${TEST_UTIL_LIB} STATIC util.cpp)
 target_link_libraries(${TEST_UTIL_LIB} PUBLIC ${PROJECT_NAME})
-target_link_libraries(${TEST_UTIL_LIB} PUBLIC EigenRand::EigenRand)
+modernize_target_link_libraries(
+  ${TEST_UTIL_LIB}
+  SCOPE
+  PUBLIC
+  TARGETS
+  EigenRand::EigenRand
+  INCLUDE_DIRS
+  ${EigenRand_INCLUDE_DIR}
+)
 set_target_properties(${TEST_UTIL_LIB} PROPERTIES LINKER_LANGUAGE CXX)
 
 macro(ADD_TEST_CFLAGS test_name flag)