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

included update_warm_start functionality #37

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

included update_warm_start functionality #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions codegen/files_to_generate/emosqp_mex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,34 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
return;
}

// update warm_start
if (!strcmp("update_warm_start", cmd)) {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if (!strcmp("update_warm_start", cmd)) {
if (!strcmp("warm_start", cmd)) {

The class wrapper doesn't call update_warm_start actually, it will call warm_start when it wants to update both vectors.

Copy link
Member

Choose a reason for hiding this comment

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

Actually, I may have gotten confused here because I didn't see this was the emosqp file, so this change probably isn't actually needed (although we need to document this now in https://github.com/oxfordcontrol/osqp/blob/master/docs/codegen/matlab.rst as well).


// Fill l, u
const mxArray *x = prhs[1];
const mxArray *y = prhs[2];

// Copy vectors to ensure they are cast as c_float
c_float *x_vec;
c_float *y_vec;
if(!mxIsEmpty(x)){
x_vec = copyToCfloatVector(mxGetPr(x), (&workspace)->data->m);
}
if(!mxIsEmpty(y)){
y_vec = copyToCfloatVector(mxGetPr(y), (&workspace)->data->m);
}

if(!mxIsEmpty(y)){
Copy link
Member

@imciner2 imciner2 May 28, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Is there a reason the call to warm starting is guarded against y being non-empty? As another note, with the update above to make this function callable from the wrapper, it should be guaranteed to get both an x and y to warm start.

osqp_warm_start(&workspace, x_vec, y_vec);
}

// Free
if(!mxIsEmpty(x)) mxFree(x_vec);
if(!mxIsEmpty(y)) mxFree(y_vec);

return;
}

#if EMBEDDED != 1
// update matrix P
if (!strcmp("update_P", cmd)) {
Expand Down