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.

Sign up for GitHub

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

Jump to bottom

Add osqp-matlab #585

Merged
merged 7 commits into from
Mar 23, 2021
Merged

Add osqp-matlab #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6421204
Create Buildosqp-eigen.cmake
traversaro Jan 14, 2021
14b7b18
Update 2021.02.yaml
traversaro Jan 14, 2021
f4595a0
Update RobotologySuperbuildLogic.cmake
traversaro Jan 14, 2021
94e8b69
Merge branch 'master' into add-osqp-matlab
traversaro Mar 11, 2021
ef10795
Update and rename Buildosqp-eigen.cmake to Buildosqp-matlab.cmake
traversaro Mar 19, 2021
cc2ba01
Update Buildosqp-matlab.cmake
traversaro Mar 19, 2021
27f8bc9
Update latest.releases.yaml
traversaro Mar 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions cmake/Buildosqp-matlab.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright (C) Fondazione Istituto Italiano di Tecnologia
# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
include(YCMEPHelper)
include(FindOrBuildPackage)

find_or_build_package(osqp QUIET)

ycm_ep_helper(osqp-matlab TYPE GIT
STYLE GITHUB
REPOSITORY dic-iit/osqp-matlab-cmake-buildsystem.git
TAG main
COMPONENT dynamics
FOLDER src
CMAKE_ARGS -DOSQP_MATLAB_USES_MATLAB:BOOL=${ROBOTOLOGY_USES_MATLAB}
DEPENDS osqp)

# Metadata for conda package generation
# If we do not set the package name, by default the repo name would be used
# so in this case osqp-matlab-cmake-buildsystem that is not descriptive of the
# generated artifact that is contained in the conda package
set(osqp-matlab_CONDA_PKG_NAME "osqp-matlab")
3 changes: 3 additions & 0 deletions cmake/RobotologySuperbuildLogic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ if(ROBOTOLOGY_ENABLE_DYNAMICS)
find_or_build_package(whole-body-controllers)
find_or_build_package(matio-cpp)
find_or_build_package(bipedal-locomotion-framework)
if(ROBOTOLOGY_USES_MATLAB)
find_or_build_package(osqp-matlab)
endif()
endif()

# Teleoperation
Expand Down
1 change: 1 addition & 0 deletions releases/2021.02.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,4 @@ repositories:
type: git
url: https://github.com/robotology/diagnostic-daemon.git
version: v1.0.0

Copy link
Collaborator

Choose a reason for hiding this comment

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

osqp-matlab disappeared after the merge from master. Was this intended?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. The PR was opened before the 2021.02 release, but as the 2021.02 release has passed, it does not make sense to add a release for osqp-matlab here. Furthermore, we now have the latest releases file: #596 , so once osqp-matlab has a release we can add it there.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Indeed, I had seen that one. Great.

Copy link
Collaborator

Choose a reason for hiding this comment

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

once osqp-matlab has a release we can add it there.

Do we do it in a new issue or we hold this PR until then?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think we can review ami-iit/osqp-matlab-cmake-buildsystem#2 and then I will release a first version of osqp-matlab so that we can add its release here.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok. I took a look at robotologyUpdateLatestReleases.sh and saw that in this line

robotology-superbuild/scripts/robotologyUpdateLatestReleases.sh

Line 72 in ac6952e

yq -i eval ".repositories.${package_name}.version=\"${latest_tag}\"" ${latest_releases_yaml_file}

it assumes that the entry for the package exists, so if I understood it well, I guess we'll have to add it manually the first time.

Copy link
Collaborator

Choose a reason for hiding this comment

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

looking at ami-iit/osqp-matlab-cmake-buildsystem#2 now...

Copy link
Member Author

Choose a reason for hiding this comment

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

it assumes that the entry for the package exists, so if I understood it well, I guess we'll have to add it manually the first time.

Yes!

5 changes: 5 additions & 0 deletions releases/latest.releases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,8 @@ repositories:
type: git
url: https://github.com/robotology/diagnostic-daemon.git
version: v1.0.0
osqp-matlab:
type: git
url: https://github.com/dic-iit/osqp-matlab-cmake-buildsystem.git
version: v0.6.2.0