-
Notifications
You must be signed in to change notification settings - Fork 9
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
Improve CMake II #164
base: master
Are you sure you want to change the base?
Improve CMake II #164
Conversation
Codecov Report
@@ Coverage Diff @@
## master #164 +/- ##
=======================================
Coverage 89.51% 89.51%
=======================================
Files 53 53
Lines 2622 2622
=======================================
Hits 2347 2347
Misses 275 275
Continue to review full report at Codecov.
|
@@ -2,23 +2,39 @@ | |||
# the list of CUDA libraries that we are using | |||
FUNCTION(SET_CUDA_LIBRARIES) | |||
ADD_DEFINITIONS(-DMFMG_WITH_CUDA) | |||
FIND_LIBRARY(CUSPARSE cusparse PATH ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES}) | |||
FIND_LIBRARY(CUSOLVER cusolver PATH ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES}) | |||
MESSAGE("implicit ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES}") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you mean to leave that print statement?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just rebased and didn't touch anything yet.
PARENT_SCOPE | ||
) | ||
SET(AMGX_INCLUDE_DIR "${AMGX_DIR}/include" PARENT_SCOPE) | ||
ADD_DEFINITIONS(-DMFMG_WITH_AMGX) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NOOO. Add it to the target.
ci/compile_and_run.sh
Outdated
cd $1 || exit 1 | ||
rm -rf build | ||
export LD_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/5.4.0:${LD_LIBRARY_PATH} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you setting this environment variable?
"cusparse" | ||
"cusolver" | ||
${CUSPARSE} | ||
${CUSOLVER} | ||
PARENT_SCOPE | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Rombur It feels really wrong to have to set in the parent scope without even checking that we actually found the libraries or/and the include directories. What was the rational to not define modules? If we were to do so, we would be able to call find_package_handle_standard_args()
and crash at configure time if REQUIRED
was specified.
This is a rebase of WIP PR. I made it work on my machine and I've hacked docker so that it will work but that's not the real problem. |
This is a rebased version of #82. I'd just like to see if there are still problems.
Locally, everything looks fine.