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

[submodule-sync] bot-submodule-sync-branch-24.04 to branch-24.04 [skip ci] [bot] #1855

Merged
merged 6 commits into from
Mar 11, 2024

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Mar 9, 2024

submodule-sync to create a PR keeping thirdparty/cudf up-to-date.
HEAD commit SHA: 337f080, cudf commit SHA: rapidsai/cudf@b08dd9b

This PR will be auto-merged if test passed. If failed, it will remain open until test pass or manually fix.

@nvauto
Copy link
Collaborator Author

nvauto commented Mar 9, 2024

HEAD commit SHA: 337f080, CUDF commit SHA: rapidsai/cudf@b08dd9b
Test passed: False

3 similar comments
@nvauto
Copy link
Collaborator Author

nvauto commented Mar 9, 2024

HEAD commit SHA: 337f080, CUDF commit SHA: rapidsai/cudf@b08dd9b
Test passed: False

@nvauto
Copy link
Collaborator Author

nvauto commented Mar 9, 2024

HEAD commit SHA: 337f080, CUDF commit SHA: rapidsai/cudf@b08dd9b
Test passed: False

@nvauto
Copy link
Collaborator Author

nvauto commented Mar 9, 2024

HEAD commit SHA: 337f080, CUDF commit SHA: rapidsai/cudf@b08dd9b
Test passed: False

@abellina
Copy link
Collaborator

abellina commented Mar 9, 2024

Broken due to cuDF change around how NVTX is included:

[INFO] [exec] CMake Error: install(EXPORT "cudf-exports" ...) includes target "cudf" which requires target "nvtx3-cpp" that is not in any export set.
[INFO] [exec] CMake Error in CMakeLists.txt:
[INFO] [exec] export called with target "cudf" which requires target "nvtx3-cpp" that is
[INFO] [exec] not in any export set.

I tried following the recommendation in the PR (rapidsai/cudf#15178) to add nvtx3-cpp explicitly to our targets but it doesn't seem to work.

diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
index 3baf384..46e7d6f 100644
--- a/src/main/cpp/CMakeLists.txt
+++ b/src/main/cpp/CMakeLists.txt
@@ -96,6 +96,8 @@ include(cmake/Modules/ConfigureCUDA.cmake) # set other CUDA compilation flags
 
 # find CCCL
 include(${CUDF_DIR}/cpp/cmake/thirdparty/get_cccl.cmake)
+# find NVTX
+include(${CUDF_DIR}/cpp/cmake/thirdparty/get_nvtx.cmake)
 
 # JNI
 find_package(JNI REQUIRED)
@@ -220,7 +222,7 @@ if(CUDF_USE_PER_THREAD_DEFAULT_STREAM)
 endif()
 
 target_link_libraries(
-  spark_rapids_jni PRIVATE
+  spark_rapids_jni PRIVATE nvtx3-cpp
   -Wl,--whole-archive
     ${CUDFJNI_LIB}
     cudf::cudf
@@ -258,7 +260,7 @@ if(USE_GDS)
                CXX_STANDARD_REQUIRED ON
   )
   target_link_libraries(
-    cufilejni PRIVATE
+    cufilejni PRIVATE nvtx3-cpp
     -Wl,--whole-archive
       ${CUFILEJNI_LIB}
     -Wl,--no-whole-archive

Adding @bdice for visibility.

@nvauto
Copy link
Collaborator Author

nvauto commented Mar 9, 2024

HEAD commit SHA: 337f080, CUDF commit SHA: rapidsai/cudf@b08dd9b
Test passed: False

1 similar comment
@nvauto
Copy link
Collaborator Author

nvauto commented Mar 10, 2024

HEAD commit SHA: 337f080, CUDF commit SHA: rapidsai/cudf@b08dd9b
Test passed: False

@nvauto
Copy link
Collaborator Author

nvauto commented Mar 11, 2024

HEAD commit SHA: 359bb80, CUDF commit SHA: rapidsai/cudf@6a03827
Test passed: False

2 similar comments
@nvauto
Copy link
Collaborator Author

nvauto commented Mar 11, 2024

HEAD commit SHA: 359bb80, CUDF commit SHA: rapidsai/cudf@6a03827
Test passed: False

@nvauto
Copy link
Collaborator Author

nvauto commented Mar 11, 2024

HEAD commit SHA: 359bb80, CUDF commit SHA: rapidsai/cudf@6a03827
Test passed: False

@nvauto
Copy link
Collaborator Author

nvauto commented Mar 11, 2024

HEAD commit SHA: b553005, CUDF commit SHA: rapidsai/cudf@dfaa41c
Test passed: False

@nvauto
Copy link
Collaborator Author

nvauto commented Mar 11, 2024

HEAD commit SHA: f26266e, CUDF commit SHA: rapidsai/cudf@8ed3e20
Test passed: True

@nvauto nvauto merged commit 0ae2398 into branch-24.04 Mar 11, 2024
2 checks passed
@nvauto
Copy link
Collaborator Author

nvauto commented Mar 11, 2024

SUCCESS - auto-merge

@nvauto nvauto deleted the bot-submodule-sync-branch-24.04 branch March 11, 2024 23:35
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