Merge pull request #381 from alphaville/fix/380-pkg-resources

Fix 378 and 380

Author: alphaville

CHANGELOG.md

@@ -9,13 +9,19 @@ Note: This is the main Changelog file for the Rust solver. The Changelog file fo
 
 
 <!-- ---------------------
-      Unreleased
+      v0.10.0
      --------------------- -->
-## [v0.9.2] - Unreleased
+## [v0.10.0] - 2026-03-10
+
+### Added
+
+- Custom implementation of Cholesky factorisation (and solver); this is used in `AffineSpace` now.
+- New function in `matrix_operations` to compute AA' given a matrix A
 
 ### Changed
 
-- Update version of `rand`, `ndarray`, and `modcholesky` in `Cargo.toml`
+- Update version of `ndarray`, in `Cargo.toml`
+- Removed `modcholesky` because it was causing a bug (see issue #378)
 
 <!-- ---------------------
       v0.9.0
@@ -302,7 +308,7 @@ This is a breaking API change.
      --------------------- -->
 
 <!-- Releases -->
-[v0.9.2]: https://github.com/alphaville/optimization-engine/compare/v0.9.1...v0.9.2
+[v0.10.0]: https://github.com/alphaville/optimization-engine/compare/v0.9.1...v0.10.0
 [v0.9.1]: https://github.com/alphaville/optimization-engine/compare/v0.9.0...v0.9.1
 [v0.9.0]: https://github.com/alphaville/optimization-engine/compare/v0.8.1...v0.9.0
 [v0.8.1]: https://github.com/alphaville/optimization-engine/compare/v0.8.0...v0.8.1

Cargo.toml

@@ -42,7 +42,7 @@ homepage = "https://alphaville.github.io/optimization-engine/"
 repository = "https://github.com/alphaville/optimization-engine"
 
 # Version of this crate (SemVer)
-version = "0.9.1"
+version = "0.10.0"
 
 edition = "2018"
 
@@ -80,7 +80,7 @@ rustdoc-args = ["--html-in-header", "katex-header.html"]
 num = "0.4"
 
 # Our own stuff - L-BFGS: limited-memory BFGS directions
-lbfgs = "0.2"
+lbfgs = "0.3"
 
 # Instant is a generic timer that works on Wasm (with wasm-bindgen)
 instant = { version = "0.1" }
@@ -98,10 +98,7 @@ rpmalloc = { version = "0.2", features = [
 # epigraph of the squared Euclidean norm
 roots = "0.0.8"
 
-# Least squares solver (NOTE: ndarray must be version 0.15 - not 0.16)
-# Bug report: https://github.com/argmin-rs/modcholesky/issues/34
-ndarray = { version = "=0.16.1", features = ["approx"] }
-modcholesky = "0.2"
+ndarray = { version = "=0.17.2", features = ["approx"] }
 
 # jemallocator is an optional feature; it will only be loaded if the feature 
 # `jem` is used (i.e., if we compile with `cargo build --features jem`)
@@ -127,15 +124,15 @@ wasm = ["wasm-bindgen", "instant/wasm-bindgen", "instant/inaccurate"]
 # --------------------------------------------------------------------------
 # These dependencies are only used for testing
 [dev-dependencies]
-unit_test_utils = "0.1.3"
+unit_test_utils = "0.1.4"
 # Note: path dependencies (even dev-dependencies) cannot be local in order
 #       to publish a crate, so the following line can only be used when
 #       testing locally
 # icasadi_test = { path = "test/icasadi_test/" }
 #       instead, use:
-icasadi_test = "0.0.2"
+icasadi_test = "0.0.3"
 # Random number generators for unit tests:
-rand = "0.9"
+rand = "0.10"
 
 
 # --------------------------------------------------------------------------

appveyor.yml

@@ -70,6 +70,5 @@ build: false
 test_script:
   - cargo add roots
   - cargo add ndarray --features approx
-  - cargo add modcholesky
   - cargo build
   - cargo test --verbose %cargoflags%

open-codegen/CHANGELOG.md

@@ -11,6 +11,7 @@ Note: This is the Changelog file of `opengen` - the Python interface of OpEn
 
 ### Changed 
 
+- Removed dependence on `pkg_resources` (issue #380)
 - Additional unit tests: increased coverage to 92%
 
 ## [0.9.4] - 2025-05-08

open-codegen/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

open-codegen/opengen/builder/optimizer_builder.py

@@ -9,9 +9,9 @@
 import os
 import jinja2
 import logging
-import pkg_resources
 import sys
 
+from importlib.metadata import version
 from .ros_builder import RosBuilder
 
 _AUTOGEN_COST_FNAME = 'auto_casadi_cost.c'
@@ -750,7 +750,7 @@ def __generate_yaml_data_file(self):
 
         target_yaml_file_path = os.path.join(target_dir, "optimizer.yml")
 
-        opengen_version = pkg_resources.require("opengen")[0].version
+        opengen_version = version("opengen")
 
         tcp_details = None if tcp_config is None \
             else {'ip': tcp_config.bind_ip, 'port': tcp_config.bind_port}

open-codegen/opengen/definitions.py

@@ -1,21 +1,22 @@
-import pkg_resources
+from importlib.resources import files, as_file
 
 
 def templates_dir():
     """Directory where the templates are found (for internal use, mainly)"""
-    return pkg_resources.resource_filename('opengen', 'templates/')
+    return files("opengen") / "templates"
 
 
 def templates_subdir(subdir=None):
     """
     Directory where the templates are found and subfolder relative
-    to that path(for internal use, mainly)
+    to that path (for internal use, mainly)
     """
-    if subdir is None:
-        return templates_dir()
-    return pkg_resources.resource_filename('opengen', 'templates/%s/' % subdir)
+    resource = files("opengen") / "templates"
+    if subdir is not None:
+        resource = resource / subdir
+    return resource
 
 
 def original_icasadi_dir():
     """Directory where the original icasadi files are found (for internal use)"""
-    return pkg_resources.resource_filename('opengen', 'icasadi/')
+    return files("opengen") / "icasadi"

open-codegen/opengen/tcp/optimizer_tcp_manager.py

@@ -6,11 +6,10 @@
 import logging
 import time
 import math
-import pkg_resources
 from threading import Thread
 from retry import retry
 from .solver_response import SolverResponse
-
+from importlib.metadata import version
 
 class OptimizerTcpManager:
     """Client for TCP interface of parametric optimizers
@@ -66,8 +65,7 @@ def __init__(self, optimizer_path=None, ip=None, port=None):
             # Check whether the optimizer was built with the current version of opengen
             # We can only check the optimizer version if the optimizer runs locally
             opengen_version = self.__optimizer_details['build']['opengen_version']
-            current_opengen_version = pkg_resources.require("opengen")[
-                0].version
+            current_opengen_version = version("opengen")
             if current_opengen_version != opengen_version:
                 logging.warn(
                     'the target optimizer was build with a different version of opengen (%s)' % opengen_version)

open-codegen/test/test_raspberry_pi.py

@@ -1,3 +1,4 @@
+import os
 import opengen as og
 import unittest
 import casadi.casadi as cs
@@ -7,6 +8,11 @@
 
 class RaspberryPiTest(unittest.TestCase):
 
+    @staticmethod
+    def get_open_local_absolute_path():
+        cwd = os.getcwd()
+        return cwd.split('open-codegen')[0]
+
     # -----------------------------------------------------------------------
     # Cross-compile to Raspberry Pi
     # -----------------------------------------------------------------------
@@ -25,6 +31,7 @@ def test_compile_rpi(self):
         meta = og.config.OptimizerMeta()\
             .with_optimizer_name(optimizer_name)
         build_config = og.config.BuildConfiguration() \
+            .with_open_version(local_path=RaspberryPiTest.get_open_local_absolute_path()) \
             .with_build_directory(optimizers_dir) \
             .with_build_mode(og.config.BuildConfiguration.DEBUG_MODE) \
             .with_tcp_interface_config() \

src/alm/alm_cache.rs

@@ -51,7 +51,7 @@ impl AlmCache {
     /// # Arguments
     ///
     /// - `panoc_cache`: an instance of `PANOCCache` that will be used by
-    ///    the inner problem
+    ///   the inner problem
     /// - `n1`, `n2`: range dimensions of mappings `F1` and `F2` respectively
     ///
     /// # Panics
@@ -77,9 +77,9 @@ impl AlmCache {
             w_pm: if n2 > 0 { Some(vec![0.0; n2]) } else { None },
             iteration: 0,
             delta_y_norm: 0.0,
-            delta_y_norm_plus: std::f64::INFINITY,
+            delta_y_norm_plus: f64::INFINITY,
             f2_norm: 0.0,
-            f2_norm_plus: std::f64::INFINITY,
+            f2_norm_plus: f64::INFINITY,
             inner_iteration_count: 0,
             last_inner_problem_norm_fpr: -1.0,
             available_time: None,