Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

casadi: init at 3.6.6 #331343

Merged
merged 14 commits into from
Aug 8, 2024
Merged

casadi: init at 3.6.6 #331343

merged 14 commits into from
Aug 8, 2024

Conversation

nim65s
Copy link
Contributor

@nim65s nim65s commented Jul 31, 2024

Description of changes

Seems to build and import fine, but this require additional testing, and checking logs todos

ref. #326696

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Sigmanificient
Copy link
Member

Sigmanificient commented Aug 2, 2024

Best of luck with porting Casadi from source, I will rebase my pr when you got it merge, to only have neurafoil & aerosandbox

@nim65s nim65s changed the title casadi: init at 3.6.5 casadi: init at 3.6.6 Aug 6, 2024
@nim65s
Copy link
Contributor Author

nim65s commented Aug 6, 2024

My goal here is to get casadi working on pinocchio. It seems that is fine, at least on x86_64-linux with example-py-casadi-quadrotor-ocp which use casadi + ipopt + mumps from python:

pinocchio> EXIT: Optimal Solution Found.
pinocchio>       solver  :   t_proc      (avg)   t_wall      (avg)    n_eval
pinocchio>        nlp_f  | 103.75ms (  6.92ms)   4.73ms (315.28us)        15
pinocchio>        nlp_g  |  78.18ms (  5.21ms)   8.84ms (589.47us)        15
pinocchio>   nlp_grad_f  | 216.33ms ( 14.42ms)  12.38ms (825.32us)        15
pinocchio>    nlp_jac_g  |   2.40 s (160.20ms) 148.40ms (  9.89ms)        15
pinocchio>        total  | 300.93 s (300.93 s)  15.22 s ( 15.22 s)         1

I'll check what darwin says now.

Copy link
Member

@taktoa taktoa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes to osqp look fine

@ofborg ofborg bot requested review from abbradar, taktoa and wegank August 6, 2024 17:03
@nim65s nim65s marked this pull request as ready for review August 7, 2024 11:18
@nim65s nim65s requested a review from natsukium as a code owner August 7, 2024 11:18
@nim65s
Copy link
Contributor Author

nim65s commented Aug 7, 2024

@Sigmanificient : this lgtm now. Maybe you could double check that what you need in your PR is fine with this ?

@nim65s
Copy link
Contributor Author

nim65s commented Aug 7, 2024

Ok, this just broke after #327438

@nim65s nim65s marked this pull request as draft August 7, 2024 11:47
@nim65s

This comment was marked as outdated.

@nim65s
Copy link
Contributor Author

nim65s commented Aug 7, 2024

I rebased to fix conflict following #325214, and also removed some darwin support. I thought it was working, but some openmpi issues were hidden, ref. #332983

@nim65s nim65s force-pushed the casadi branch 2 times, most recently from fd74b43 to 6dc2ee7 Compare August 7, 2024 23:02
@nim65s nim65s force-pushed the casadi branch 2 times, most recently from b07e6b7 to 5cdcd1a Compare August 7, 2024 23:19
@nim65s
Copy link
Contributor Author

nim65s commented Aug 7, 2024

Result of nixpkgs-review pr 331343 run on aarch64-darwin 1

1 package marked as broken and skipped:
  • bonmin
34 packages built:
  • blasfeo
  • crocoddyl
  • fatrop
  • hpipm
  • ipopt
  • openturns
  • osqp
  • pinocchio
  • proxsuite
  • proxsuite.doc
  • python311Packages.crocoddyl
  • python311Packages.example-robot-data
  • python311Packages.fatrop
  • python311Packages.openturns
  • python311Packages.pinocchio
  • python311Packages.proxsuite
  • python311Packages.proxsuite.doc
  • python311Packages.pygmo
  • python311Packages.sleqp
  • python311Packages.trlib
  • python312Packages.crocoddyl
  • python312Packages.example-robot-data
  • python312Packages.fatrop
  • python312Packages.openturns
  • python312Packages.pinocchio
  • python312Packages.proxsuite
  • python312Packages.proxsuite.doc
  • python312Packages.pygmo
  • python312Packages.sleqp
  • python312Packages.trlib
  • sleqp
  • spral
  • superscs
  • trlib

@ofborg ofborg bot added 8.has: clean-up and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Aug 7, 2024
@ofborg ofborg bot requested a review from wegank August 8, 2024 00:04
@nim65s
Copy link
Contributor Author

nim65s commented Aug 8, 2024

Result of nixpkgs-review pr 331343 run on x86_64-linux 1

45 packages built:
  • blasfeo
  • bonmin
  • casadi
  • crocoddyl
  • fatrop
  • hpipm
  • ipopt
  • mumps
  • openturns
  • osqp
  • pagmo2
  • pinocchio
  • proxsuite
  • proxsuite.doc
  • python311Packages.casadi
  • python311Packages.crocoddyl
  • python311Packages.example-robot-data
  • python311Packages.fatrop
  • python311Packages.fenics
  • python311Packages.fenics.dist
  • python311Packages.openturns
  • python311Packages.pinocchio
  • python311Packages.proxsuite
  • python311Packages.proxsuite.doc
  • python311Packages.pygmo
  • python311Packages.sleqp
  • python311Packages.trlib
  • python312Packages.casadi
  • python312Packages.crocoddyl
  • python312Packages.example-robot-data
  • python312Packages.fatrop
  • python312Packages.fenics
  • python312Packages.fenics.dist
  • python312Packages.openturns
  • python312Packages.pinocchio
  • python312Packages.proxsuite
  • python312Packages.proxsuite.doc
  • python312Packages.pygmo
  • python312Packages.sleqp
  • python312Packages.trlib
  • scotch
  • sleqp
  • spral
  • superscs
  • trlib

@wegank wegank merged commit 6522b3d into NixOS:master Aug 8, 2024
24 checks passed
@nim65s nim65s deleted the casadi branch August 8, 2024 14:39
@nim65s nim65s mentioned this pull request Aug 8, 2024
10 tasks
@gepbird gepbird mentioned this pull request Oct 2, 2024
13 tasks
@mk3z mk3z added the backport release-24.05 Backport PR automatically label Oct 29, 2024
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-331343-to-release-24.05 origin/release-24.05
cd .worktree/backport-331343-to-release-24.05
git switch --create backport-331343-to-release-24.05
git cherry-pick -x 8b807a89ffbe4e9059af10ea1c13e7bb42f9c953 1c48fcff9c43a00a965e044df8fe226a1a4f781d 59573a150243af7582b277e1c972d5f1e885bb48 2064b01da307387d0546511157dd023d3b3c0017 af6c05456c406430736eb4de5dd8c4aaac9f5c82 640f5d612bebe755f2a69992fff7d23a8d2a8fd5 f7ea2a5f25a5ecde786acfcaa747c7cb58ee1d14 38f97d09b303d523098764f8b8b77f79871aeaa1 7788dbb2e53677e9f4029960d909108b3dcc007a 05fb9b070f5eede965f8b6e867a7ace0eef824ad e006f8483ebec4170f15431df4fcb2d04970efc3 7c9c23c5970ff42028195b70a58ba79168df6514 73f6b8ac942f8caa72f81142c57bc256227ffe42 5cdcd1a2051bb0013cc3e1e8f2bac4f7493f8235

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants