ARROW-18349: [C++][Flight] Exercise UCX on CI

pitrou · May 16, 2023 · 640ad5a · 640ad5a
1 parent af38263
commit 640ad5a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile
@@ -36,6 +36,7 @@ RUN mamba install -q -y \
         compilers \
         doxygen \
         python=${python} \
+        ucx-proc=*=cpu ucx libnuma \
         valgrind && \
     mamba clean --all
 
@@ -65,6 +66,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
@@ -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
@@ -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