Merge pull request #434 from nim65s/bump

flake.lock: Update

Author: nim65s

.github/workflows/nix.yml

@@ -13,37 +13,23 @@ jobs:
     runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
-        os: ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-15-intel", "macos-14"]
+        os: ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-15-intel", "macos-15"]
+        eigen: ["", "-eigen_5"]
     steps:
       - uses: actions/checkout@v6
       - uses: cachix/install-nix-action@v31
       - uses: cachix/cachix-action@v16
         with:
           name: gepetto
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - run: nix build -L .#proxsuite
-
-  nix-eigen5:
-    runs-on: "${{ matrix.os }}"
-    strategy:
-      matrix:
-        os: ["ubuntu-24.04", "macos-15"]
-    steps:
-      - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31
-      - uses: cachix/cachix-action@v16
-        with:
-          name: gepetto
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - run: nix build -L .#proxsuite-eigen_5
+      - run: nix build -L .#proxsuite${{ matrix.eigen }}
 
   check:
     if: always()
     name: check-macos-linux-nix
 
     needs:
       - nix
-      - nix-eigen5
 
     runs-on: Ubuntu-latest
 

flake.lock

@@ -30,30 +30,18 @@
                 ];
               };
               postPatch = "";
-              nativeCheckInputs = [
-                final.ctestCheckHook
-              ];
-              # ref. https://github.com/Simple-Robotics/proxsuite/issues/426
-              preCheck = ''
-                disabledTests+=(
-                  "ProxQP::dense: test primal infeasibility solving"
-                  "dense maros meszaros using the api"
-                  "sparse maros meszaros using the API"
-                )
-              '';
             };
           };
-          eigen5 = final: prev: {
-            eigen = prev.eigen.overrideAttrs (super: rec {
-              version = "5.0.0";
-              src = final.fetchFromGitLab {
-                inherit (super.src) owner repo;
-                tag = version;
-                hash = "sha256-L1KUFZsaibC/FD6abTXrT3pvaFhbYnw+GaWsxM2gaxM=";
-              };
-              patches = [ ];
-              postPatch = "";
-            });
+          eigen_5 = final: prev: {
+            eigen = final.eigen_5;
+            pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
+              (python-final: python-prev: {
+                scipy = python-prev.scipy.overrideAttrs {
+                  # broken on linux arm
+                  doInstallCheck = false;
+                };
+              })
+            ];
           };
         };
         perSystem =
@@ -73,7 +61,7 @@
               pkgs-eigen_5 = import inputs.nixpkgs {
                 inherit system;
                 overlays = [
-                  self.overlays.eigen5
+                  self.overlays.eigen_5
                   self.overlays.default
                 ];
               };

flake.nix

@@ -161,7 +161,7 @@ TEST_CASE("sparse maros meszaros using the API")
           preprocessed, qp.results, primal_feasibility, dual_feasibility);
 
         CHECK(primal_feasibility < qp.settings.eps_abs);
-        CHECK(dual_feasibility < 2 * qp.settings.eps_abs);
+        CHECK(dual_feasibility < 3 * qp.settings.eps_abs);
         CHECK(qp.results.info.pri_res < eps_abs_with_duality_gap);
         CHECK(qp.results.info.dua_res < eps_abs_with_duality_gap);
 
@@ -175,7 +175,7 @@ TEST_CASE("sparse maros meszaros using the API")
         CHECK(proxsuite::proxqp::dense::infty_norm(
                 H.selfadjointView<Eigen::Upper>() * qp.results.x + g +
                 AT * qp.results.y + CT * qp.results.z) <=
-              2 * eps_abs_no_duality_gap);
+              3 * eps_abs_no_duality_gap);
         CHECK(proxsuite::proxqp::dense::infty_norm(
                 AT.transpose() * qp.results.x - b) <= eps_abs_no_duality_gap);
         if (n_in > 0) {
@@ -208,7 +208,7 @@ TEST_CASE("sparse maros meszaros using the API")
           preprocessed, qp.results, primal_feasibility, dual_feasibility);
 
         CHECK(primal_feasibility < eps_abs_with_duality_gap);
-        CHECK(dual_feasibility < 2 * eps_abs_with_duality_gap);
+        CHECK(dual_feasibility < 3 * eps_abs_with_duality_gap);
         CHECK(qp.results.info.duality_gap < eps_abs_with_duality_gap);
       }
     }