GH-37523: [C++][CI][CUDA] Don't use newer API and add missing CUDA dependencies #37497

zeroshade · 2023-08-31T15:07:51Z

Rationale for this change

#37365 was built locally using a newer version of the CUDA driver API than the crossbow builds run with causing the crossbow build to fail due to a change in macro names. This puts the macro name back to allow it to build with the older version of the cuda driver api.

Closes: [C++][CI][CUDA] CUDA Crossbow build failure #37523

zeroshade · 2023-08-31T15:09:11Z

@github-actions crossbow submit ubuntu-cuda-cpp

github-actions · 2023-08-31T15:10:37Z

Unable to match any tasks for `ubuntu-cuda-cpp`
The Archery job run can be found at: https://github.com/apache/arrow/actions/runs/6039155877

zeroshade · 2023-08-31T15:24:55Z

@github-actions crossbow submit *cuda*

github-actions · 2023-08-31T15:27:38Z

Revision: 6626ee6

Submitted crossbow builds: ursacomputing/crossbow @ actions-b539647434

Task	Status
conda-linux-aarch64-cuda-py3
conda-linux-ppc64le-cuda-py3
conda-linux-x64-cuda-py3
conda-win-x64-cuda-py3
test-cuda-cpp
test-cuda-python

github-actions · 2023-08-31T15:27:44Z

Revision: 6626ee6

Submitted crossbow builds: ursacomputing/crossbow @ actions-ccf9bbe515

Task	Status
conda-linux-aarch64-cuda-py3
conda-linux-ppc64le-cuda-py3
conda-linux-x64-cuda-py3
conda-win-x64-cuda-py3
test-cuda-cpp
test-cuda-python

zeroshade · 2023-08-31T16:30:04Z

@github-actions crossbow submit *cuda*

github-actions · 2023-08-31T16:32:46Z

Revision: 65d8df8

Submitted crossbow builds: ursacomputing/crossbow @ actions-f74ba67795

Task	Status
conda-linux-aarch64-cuda-py3
conda-linux-ppc64le-cuda-py3
conda-linux-x64-cuda-py3
conda-win-x64-cuda-py3
test-cuda-cpp
test-cuda-python

zeroshade · 2023-08-31T21:03:56Z

@github-actions crossbow submit test-cuda-python

kou · 2023-08-31T21:06:10Z

It seems that this has many changes to say "MINOR".
https://github.com/apache/arrow/blob/main/CONTRIBUTING.md#Minor-Fixes

Could you open an issue for this?

github-actions · 2023-08-31T21:06:50Z

Revision: 4e6835b

Submitted crossbow builds: ursacomputing/crossbow @ actions-b39bc0bebc

Task	Status
test-cuda-python

zeroshade · 2023-08-31T21:26:56Z

@pitrou @AlenkaF @jorisvandenbossche I haven't been able to work out why the include path for cuda.h isn't getting included properly for the pyarrow python build here. The change I made caused the cuda.h include to now be exposed to the cython build (previously it was only in a .cc file on the C++ side so the cython build never needed to include it through cuda_api.h). Unfortunately it seems i'm not familiar enough with the cython/pyarrow build to work this out on my own.

Running tests myself locally I don't have any problems building it with a mamba environment, so I'm not sure what I'm missing. Any of you have any ideas?

AlenkaF · 2023-09-01T05:10:49Z

First thing I would try is adding the header file in the install of the cmake

arrow/cpp/src/arrow/gpu/CMakeLists.txt

Line 84 in c0998b1

arrow_install_all_headers("arrow/gpu")

as it is not being installed currently (https://github.com/ursacomputing/crossbow/actions/runs/6042448301/job/16397574982#step:5:6699).
I think this has to be updated here

arrow/cpp/src/arrow/gpu/CMakeLists.txt

Line 45 in c0998b1

    
           set(ARROW_CUDA_SRCS cuda_arrow_ipc.cc cuda_context.cc cuda_internal.cc cuda_memory.cc)

or here:

arrow/cpp/src/arrow/gpu/CMakeLists.txt

Lines 81 to 84 in c0998b1

    
           install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cuda_version.h" 
        
                   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/gpu") 
        
           arrow_install_all_headers("arrow/gpu")

kou · 2023-09-01T05:29:23Z

How about this?

diff --git a/cpp/src/arrow/gpu/ArrowCUDAConfig.cmake.in b/cpp/src/arrow/gpu/ArrowCUDAConfig.cmake.in
index bb36abf24..626c536a0 100644
--- a/cpp/src/arrow/gpu/ArrowCUDAConfig.cmake.in
+++ b/cpp/src/arrow/gpu/ArrowCUDAConfig.cmake.in
@@ -30,6 +30,10 @@ include(CMakeFindDependencyMacro)
 find_dependency(Arrow)
 if(CMAKE_VERSION VERSION_LESS 3.17)
   find_package(CUDA REQUIRED)
+  add_library(ArrowCUDA::cuda_driver SHARED IMPORTED)
+  set_target_properties(ArrowCUDA::cuda_driver
+                        PROPERTIES IMPORTED_LOCATION "${CUDA_CUDA_LIBRARY}"
+                                   INTERFACE_INCLUDE_DIRECTORIES "${CUDA_INCLUDE_DIRS}")
 else()
   find_package(CUDAToolkit REQUIRED)
 endif()
diff --git a/cpp/src/arrow/gpu/CMakeLists.txt b/cpp/src/arrow/gpu/CMakeLists.txt
index 2556f30f0..a5b176793 100644
--- a/cpp/src/arrow/gpu/CMakeLists.txt
+++ b/cpp/src/arrow/gpu/CMakeLists.txt
@@ -32,8 +32,11 @@ endif()
 set(ARROW_CUDA_LINK_LIBS arrow::flatbuffers)
 if(CMAKE_VERSION VERSION_LESS 3.17)
   find_package(CUDA REQUIRED)
-  set(ARROW_CUDA_SHARED_LINK_LIBS ${CUDA_CUDA_LIBRARY})
-  include_directories(SYSTEM ${CUDA_INCLUDE_DIRS})
+  add_library(ArrowCUDA::cuda_driver SHARED IMPORTED)
+  set_target_properties(ArrowCUDA::cuda_driver
+                        PROPERTIES IMPORTED_LOCATION "${CUDA_CUDA_LIBRARY}"
+                                   INTERFACE_INCLUDE_DIRECTORIES "${CUDA_INCLUDE_DIRS}")
+  set(ARROW_CUDA_SHARED_LINK_LIBS ArrowCUDA::cuda_driver)
 else()
   # find_package(CUDA) is deprecated, and for newer CUDA, it doesn't
   # recognize that the CUDA driver library is in the "stubs" dir, but
@@ -61,6 +64,7 @@ add_arrow_lib(arrow_cuda
               ${ARROW_CUDA_SHARED_LINK_LIBS}
               SHARED_INSTALL_INTERFACE_LIBS
               Arrow::arrow_shared
+              ${ARROW_CUDA_SHARED_LINK_LIBS}
               # Static arrow_cuda must also link against CUDA shared libs
               STATIC_LINK_LIBS
               ${ARROW_CUDA_LINK_LIBS}
diff --git a/cpp/src/arrow/gpu/arrow-cuda.pc.in b/cpp/src/arrow/gpu/arrow-cuda.pc.in
index 84c8c5889..173d7d91e 100644
--- a/cpp/src/arrow/gpu/arrow-cuda.pc.in
+++ b/cpp/src/arrow/gpu/arrow-cuda.pc.in
@@ -22,6 +22,6 @@ libdir=@ARROW_PKG_CONFIG_LIBDIR@
 Name: Apache Arrow CUDA
 Description: CUDA integration library for Apache Arrow
 Version: @ARROW_VERSION@
-Requires: arrow
+Requires: arrow cuda
 Libs: -L${libdir} -larrow_cuda
 Cflags: -I${includedir}

zeroshade · 2023-09-01T16:33:55Z

@github-actions crossbow submit test-cuda-python

github-actions · 2023-09-01T16:36:36Z

Revision: 78ccfb9

Submitted crossbow builds: ursacomputing/crossbow @ actions-0ca7a3d49d

Task	Status
test-cuda-python

zeroshade · 2023-09-01T17:07:26Z

@kou thanks! Your cmake changes fixed it perfectly! also I agree completely that this has expanded beyond the scope of a MINOR change. I'll create an issue for it.

github-actions · 2023-09-01T17:11:52Z

⚠️ GitHub issue #37523 has been automatically assigned in GitHub to PR creator.

kou

+1

kou · 2023-09-01T22:10:34Z

ci/scripts/python_build.sh

@@ -70,6 +70,7 @@ export PYARROW_WITH_SUBSTRAIT=${ARROW_SUBSTRAIT:-OFF}
 export PYARROW_PARALLEL=${n_jobs}

 export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH}
+export CMAKE_PREFIX_PATH=${ARROW_HOME}:${CMAKE_PREFIX_PATH}


Do we need this?
If we don't need this, I want to revert this before we merge this.

that fixed one of the build errors, but I haven't tried without it since adding your fix. I'll try removing it and re-run the crossbow build, if all works fine then we're good.

looks good with it reverted! all is passing. Thanks for the help!

zeroshade · 2023-09-05T14:29:18Z

@github-actions crossbow submit test-cuda-python

github-actions · 2023-09-05T14:31:59Z

Revision: f204bab

Submitted crossbow builds: ursacomputing/crossbow @ actions-00d8e7b991

Task	Status
test-cuda-python

conbench-apache-arrow · 2023-09-07T02:26:13Z

After merging your PR, Conbench analyzed the 5 benchmarking runs that have been run so far on merge-commit 13f0cd8.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details.

…UDA dependencies (apache#37497) ### Rationale for this change apache#37365 was built locally using a newer version of the CUDA driver API than the crossbow builds run with causing the crossbow build to fail due to a change in macro names. This puts the macro name back to allow it to build with the older version of the cuda driver api. * Closes: apache#37523 Authored-by: Matt Topol <[email protected]> Signed-off-by: Matt Topol <[email protected]>

MINOR: fix cuda crossbow build

ed1837a

zeroshade requested a review from pitrou August 31, 2023 15:07

github-actions bot added Component: C++ awaiting committer review Awaiting committer review labels Aug 31, 2023

add a comment explaining the default flag

6626ee6

kkraus14 approved these changes Aug 31, 2023

View reviewed changes

zeroshade added 2 commits August 31, 2023 11:30

linting

e62f2c6

remove RecordWithFlags

65d8df8

zeroshade added 3 commits August 31, 2023 12:38

more lint

3a3f3fd

more linting whitespace

7be0ea1

try adding CMAKE_PREFIX_PATH

4e6835b

zeroshade requested review from assignUser, kou and raulcd as code owners August 31, 2023 21:03

trying cuda include cmake

78ccfb9

lint cmake

89408bf

zeroshade changed the title ~~MINOR: fix cuda crossbow build~~ GH-37523: [C++][CI][CUDA] fix cuda crossbow build Sep 1, 2023

kou changed the title ~~GH-37523: [C++][CI][CUDA] fix cuda crossbow build~~ GH-37523: [C++][CI][CUDA] Don't use newer API and add missing CUDA dependencies Sep 1, 2023

kou approved these changes Sep 1, 2023

View reviewed changes

github-actions bot added awaiting merge Awaiting merge awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review awaiting merge Awaiting merge labels Sep 1, 2023

remove cmake prefix path from python build

f204bab

github-actions bot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Sep 5, 2023

zeroshade merged commit 13f0cd8 into apache:main Sep 5, 2023
34 checks passed

zeroshade removed the awaiting change review Awaiting change review label Sep 5, 2023

zeroshade deleted the cuda-macro-build-fix branch September 5, 2023 15:33

github-actions bot added the awaiting changes Awaiting changes label Sep 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GH-37523: [C++][CI][CUDA] Don't use newer API and add missing CUDA dependencies #37497

GH-37523: [C++][CI][CUDA] Don't use newer API and add missing CUDA dependencies #37497

zeroshade commented Aug 31, 2023 •

edited by github-actions bot

Loading

zeroshade commented Aug 31, 2023

github-actions bot commented Aug 31, 2023

zeroshade commented Aug 31, 2023 •

edited

Loading

github-actions bot commented Aug 31, 2023

github-actions bot commented Aug 31, 2023

zeroshade commented Aug 31, 2023

github-actions bot commented Aug 31, 2023

zeroshade commented Aug 31, 2023

kou commented Aug 31, 2023

github-actions bot commented Aug 31, 2023

zeroshade commented Aug 31, 2023

AlenkaF commented Sep 1, 2023

kou commented Sep 1, 2023 •

edited

Loading

zeroshade commented Sep 1, 2023

github-actions bot commented Sep 1, 2023

zeroshade commented Sep 1, 2023

github-actions bot commented Sep 1, 2023

kou left a comment

kou Sep 1, 2023

zeroshade Sep 5, 2023

zeroshade Sep 5, 2023

zeroshade commented Sep 5, 2023

github-actions bot commented Sep 5, 2023

conbench-apache-arrow bot commented Sep 7, 2023

GH-37523: [C++][CI][CUDA] Don't use newer API and add missing CUDA dependencies #37497

GH-37523: [C++][CI][CUDA] Don't use newer API and add missing CUDA dependencies #37497

Conversation

zeroshade commented Aug 31, 2023 • edited by github-actions bot Loading

Rationale for this change

zeroshade commented Aug 31, 2023

github-actions bot commented Aug 31, 2023

zeroshade commented Aug 31, 2023 • edited Loading

github-actions bot commented Aug 31, 2023

github-actions bot commented Aug 31, 2023

zeroshade commented Aug 31, 2023

github-actions bot commented Aug 31, 2023

zeroshade commented Aug 31, 2023

kou commented Aug 31, 2023

github-actions bot commented Aug 31, 2023

zeroshade commented Aug 31, 2023

AlenkaF commented Sep 1, 2023

kou commented Sep 1, 2023 • edited Loading

zeroshade commented Sep 1, 2023

github-actions bot commented Sep 1, 2023

zeroshade commented Sep 1, 2023

github-actions bot commented Sep 1, 2023

kou left a comment

Choose a reason for hiding this comment

kou Sep 1, 2023

Choose a reason for hiding this comment

zeroshade Sep 5, 2023

Choose a reason for hiding this comment

zeroshade Sep 5, 2023

Choose a reason for hiding this comment

zeroshade commented Sep 5, 2023

github-actions bot commented Sep 5, 2023

conbench-apache-arrow bot commented Sep 7, 2023

zeroshade commented Aug 31, 2023 •

edited by github-actions bot

Loading

zeroshade commented Aug 31, 2023 •

edited

Loading

kou commented Sep 1, 2023 •

edited

Loading