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 changes to allow building without lusol #168

Closed
wants to merge 2 commits into from

Conversation

cameronrutherford
Copy link
Collaborator

My editor screwed with formatting. I can force push to this PR with minimal changes once I disable CMake formatting in my editor...

option(RESOLVE_TEST_WITH_BSUB
"Use `jsrun` instead of `mpirun` commands when running tests" OFF)
option(RESOLVE_USE_KLU "Use KLU, AMD and COLAMD libraries from SuiteSparse" ON)
option(RESOLVE_USE_LUSOL "Build the LUSOL library" OFF)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Off by default...

Comment on lines +23 to +26
if(RESOLVE_USE_LUSOL)
add_executable(runLUSOLTests.exe runLUSOLTests.cpp)
target_link_libraries(runLUSOLTests.exe PRIVATE ReSolve resolve_matrix)
endif()
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Small changes needed in testing to disable LUSOL...

Comment on lines +29 to +33
set(installable_tests runMatrixIoTests.exe runMatrixHandlerTests.exe
runMatrixFactorizationTests.exe)
if(RESOLVE_USE_LUSOL)
list(APPEND installable_tests runLUSOLTests.exe)
endif()
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

And here

Comment on lines +43 to +45
if(RESOLVE_USE_LUSOL)
add_test(NAME lusol_test COMMAND $<TARGET_FILE:runLUSOLTests.exe>)
endif()
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

And here

@pelesh
Copy link
Collaborator

pelesh commented Jun 21, 2024

My editor screwed with formatting. I can force push to this PR with minimal changes once I disable CMake formatting in my editor...

Please do. Otherwise this is good to merge. Thank you!

@pelesh
Copy link
Collaborator

pelesh commented Jun 21, 2024

I believe we can close this PR because this issue was addressed in #118. Feel free to reopen, if needed.

@pelesh pelesh closed this Jun 21, 2024
@pelesh pelesh deleted the without-lusol-fixes branch October 15, 2024 04:31
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.

2 participants