-
Notifications
You must be signed in to change notification settings - Fork 914
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
[REVIEW] Added IDE changes for JNI files to have intelliSense and changes for rapids-compose [skip ci] #5659
[REVIEW] Added IDE changes for JNI files to have intelliSense and changes for rapids-compose [skip ci] #5659
Conversation
Please update the changelog in order to start CI tests. View the gpuCI docs here. |
java/pom.xml
Outdated
<CUDA_STATIC_RUNTIME>OFF</CUDA_STATIC_RUNTIME> | ||
<PER_THREAD_DEFAULT_STREAM>OFF</PER_THREAD_DEFAULT_STREAM> | ||
<project.build.directory>target/${CUDA_VERSION}</project.build.directory> |
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.
not exactly sure if we should be modifying this variable. @tgravescs @revans2 @jlowe please comment
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.
Just a note, this isn't required for rapids-compose
. The script in compose only cares about the C++ build dir, and is setting -Dnative.build.path=
as part of the mvn package
command.
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.
Yes, but this will help manage the java bindings in a similar way cpp build is managed.
I still need to add the branch name to this property
…onal activation on multiple properties
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 am not a fan of us messing with the project.build.directory.
java/src/main/native/CMakeLists.txt
Outdated
@@ -129,6 +133,7 @@ set(CUDF_INCLUDE "${PROJECT_SOURCE_DIR}/../../../../cpp/include" | |||
|
|||
find_library(CUDF_LIBRARY "cudf" | |||
HINTS "$ENV{CUDF_ROOT}/lib" |
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.
Is this necessary? If others are OK I would like to remove this. I don't think we need this to build on the host directly.
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.
It follows the conventions of the other libraries. and is where we would find libcudf if it were installed instead of just being built.
tl;dr: these two commits are the minimal set of changes I've tested that work in compose: @jlowe The changes to the The loose pattern in our CI and
I've replicated this pattern in RMM_HOME=rapids/rmm
RMM_ROOT=rapids/rmm/build/release
CUDF_HOME=rapids/cudf
CUDF_ROOT=rapids/cudf/cpp/build/release With CMake I'd override the paths on the command line like this:
But @razajafri and I couldn't find a good way to use So the alternative is to have the |
Thanks for the clarification, @trxcllnt. That helps explain why |
@jlowe do you have any other comments? |
################################################################################################### | ||
# - CUDF ------------------------------------------------------------------------------------------ | ||
|
||
set(CUDF_INCLUDE "${PROJECT_SOURCE_DIR}/../../../../cpp/include" | ||
"${PROJECT_SOURCE_DIR}/../../../../cpp/src/") | ||
|
||
find_library(CUDF_LIBRARY "cudf" | ||
HINTS "$ENV{CUDF_ROOT}/lib" | ||
HINTS "$ENV{CUDF_ROOT}" |
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.
$CUDF_ROOT/lib should remain in case the user set this environment variable to be the install prefix.
This PR adds the ability to use intellisense with JNI code while using rapids-compose. Thank you @trxcllnt for all your help in setting this up