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

CMake updates for embedded code generation #174

Merged
merged 6 commits into from
Aug 24, 2019

Conversation

imciner2
Copy link
Member

The main portion of the PR is to clean up the CMake list creation so it can simplify the upkeep of the CMake for the code generation routines. This moves the list creation into a CMakeLists inside the src and include folders, so now in code generation frameworks the main CMakeLists should just add these directories instead of having to keep a separate list of the files (which can become out of date as changes are made).

Additionally, the first commit fixes a build error that was introduced recently in embedded mode, and the last commit adds building of the embedded code to the Travis script so that any changes that might break embedded compilation will be caught in CI.

This should help simplify the code generation CMake, since
now the code generation routines can just include the provided
CMakeLists.txt in each folder instead of maintaining their own
file lists.
Right now the printing fails the timeout test because it runs too
fast.
@imciner2 imciner2 changed the title WIP: CMake updates for embedded code generation CMake updates for embedded code generation Aug 23, 2019
@imciner2
Copy link
Member Author

Ok, this is ready for review now. I have also modified the printing test so now it should actually pass (it will timeout in that computation).

Once this is merged, it would be good to update the submodules for the develop branches in the repos with code generation. Once that is done, I will make the modifications to the Matlab generation scripts to work with this.

@gbanjac
Copy link
Collaborator

gbanjac commented Aug 24, 2019

Thanks a lot for this PR! I have made a branch cmake_fixes so it would probably be better to merge your PR there. We can then make similar branches in Matlab and Python to make sure everything works. Then we can easily merge the branches to develop or release-0.6.0.

@gbanjac gbanjac changed the base branch from develop to cmake_fixes August 24, 2019 20:56
@gbanjac gbanjac merged commit 7015fbb into osqp:cmake_fixes Aug 24, 2019
@imciner2 imciner2 deleted the cmake_fixes branch August 26, 2019 10:00
@gbanjac
Copy link
Collaborator

gbanjac commented Aug 26, 2019

Is this ready to be merged into develop? It seems that both Matlab and Python interfaces work.

@bstellato
Copy link
Collaborator

Sure. I will do that

@imciner2
Copy link
Member Author

Yes, I think this is ready to be merged (along with the associated branches in Matlab and Python).

@gbanjac
Copy link
Collaborator

gbanjac commented Aug 26, 2019

They are merged now.

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

Successfully merging this pull request may close these issues.

3 participants