[arrow] branch main updated: GH-33517: [C++][Flight] Exercise UCX on CI (#14667)

[apitrou]

This is an automated email from the ASF dual-hosted git repository.

apitrou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 99ef3aada1 GH-33517: [C++][Flight] Exercise UCX on CI (#14667)
99ef3aada1 is described below

commit 99ef3aada1d1589604da8905f3c9100ff1c997e9
Author: Antoine Pitrou <pit...@free.fr>
AuthorDate: Wed May 17 14:07:51 2023 +0200

    GH-33517: [C++][Flight] Exercise UCX on CI (#14667)
    
    
    * Closes: #33517
    
    Lead-authored-by: Antoine Pitrou <pit...@free.fr>
    Co-authored-by: Antoine Pitrou <anto...@python.org>
    Co-authored-by: Sutou Kouhei <k...@cozmixng.org>
    Signed-off-by: Antoine Pitrou <anto...@python.org>
---
 ci/docker/conda-cpp.dockerfile                    | 4 ++++
 ci/scripts/cpp_build.sh                           | 1 +
 cpp/src/arrow/flight/transport/ucx/CMakeLists.txt | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile
index ee06183861..5ad8d1d6b6 100644
--- a/ci/docker/conda-cpp.dockerfile
+++ b/ci/docker/conda-cpp.dockerfile
@@ -35,7 +35,10 @@ RUN mamba install -q -y \
         --file arrow/ci/conda_env_gandiva.txt \
         compilers \
         doxygen \
+        libnuma \
         python=${python} \
+        ucx \
+        ucx-proc=*=cpu \
         valgrind && \
     mamba clean --all
 
@@ -65,6 +68,7 @@ ENV ARROW_ACERO=ON \
     # Blocked on https://issues.apache.org/jira/browse/ARROW-15066
     ARROW_WITH_OPENTELEMETRY=OFF \
     ARROW_WITH_SNAPPY=ON \
+    ARROW_WITH_UCX=ON \
     ARROW_WITH_ZLIB=ON \
     ARROW_WITH_ZSTD=ON \
     GTest_SOURCE=BUNDLED \
diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh
index abeb654047..43e52181f0 100755
--- a/ci/scripts/cpp_build.sh
+++ b/ci/scripts/cpp_build.sh
@@ -125,6 +125,7 @@ cmake \
   -DARROW_WITH_OPENTELEMETRY=${ARROW_WITH_OPENTELEMETRY:-OFF} \
   -DARROW_WITH_MUSL=${ARROW_WITH_MUSL:-OFF} \
   -DARROW_WITH_SNAPPY=${ARROW_WITH_SNAPPY:-OFF} \
+  -DARROW_WITH_UCX=${ARROW_WITH_UCX:-OFF} \
   -DARROW_WITH_UTF8PROC=${ARROW_WITH_UTF8PROC:-ON} \
   -DARROW_WITH_ZLIB=${ARROW_WITH_ZLIB:-OFF} \
   -DARROW_WITH_ZSTD=${ARROW_WITH_ZSTD:-OFF} \
diff --git a/cpp/src/arrow/flight/transport/ucx/CMakeLists.txt 
b/cpp/src/arrow/flight/transport/ucx/CMakeLists.txt
index 75a21d5e5c..23f8850c3d 100644
--- a/cpp/src/arrow/flight/transport/ucx/CMakeLists.txt
+++ b/cpp/src/arrow/flight/transport/ucx/CMakeLists.txt
@@ -33,7 +33,7 @@ add_arrow_lib(arrow_flight_transport_ucx
               SOURCES
               ${ARROW_FLIGHT_TRANSPORT_UCX_SRCS}
               PRECOMPILED_HEADERS
-              "$<$<COMPILE_LANGUAGE:CXX>:arrow/flight/transport/ucx/pch.h>"
+              "$<$<COMPILE_LANGUAGE:CXX>:arrow/flight/pch.h>"
               DEPENDENCIES
               SHARED_LINK_FLAGS
               ${ARROW_VERSION_SCRIPT_FLAGS} # Defined in 
cpp/arrow/CMakeLists.txt