From c8236dfdfd33902e98b74a35bc181e641b443b3c Mon Sep 17 00:00:00 2001 From: Surbhi Vijayvargeeya Date: Thu, 2 Nov 2023 20:04:29 +0530 Subject: [PATCH] Use VELOX_HOME instead of GLUTEN_HOME while setting ARROW_HOME --- .github/workflows/velox_be.yml | 3 +-- cpp/CMakeLists.txt | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/velox_be.yml b/.github/workflows/velox_be.yml index ffc41319e025..099d44076abb 100644 --- a/.github/workflows/velox_be.yml +++ b/.github/workflows/velox_be.yml @@ -28,7 +28,6 @@ on: - 'shims/**' - 'tools/gluten-it/**' - 'tools/gluten-te/**' - - 'ep/build-arrow/**' - 'ep/build-velox/**' - 'cpp/*' - 'cpp/CMake/**' @@ -62,7 +61,7 @@ jobs: run: | docker exec ubuntu2004-test-$GITHUB_RUN_ID bash -c ' cd /opt/gluten/cpp && \ - ./compile.sh --build_velox_backend=ON --velox_home=/opt/velox --build_examples=ON --build_benchmarks=ON' + ./compile.sh --build_velox_backend=ON --velox_home=/opt/velox --build_tests=ON --build_examples=ON --build_benchmarks=ON' - name: Run CPP unit test run: | docker exec ubuntu2004-test-$GITHUB_RUN_ID bash -c 'cd /opt/gluten/cpp/build && \ diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 99ca3867de9a..88805c30eeed 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -54,12 +54,10 @@ option(ENABLE_ORC "Enable ORC" OFF) set(root_directory ${PROJECT_BINARY_DIR}) get_filename_component(GLUTEN_HOME ${CMAKE_SOURCE_DIR} DIRECTORY) -if (NOT DEFINED ARROW_HOME) - if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") - set(ARROW_HOME ${GLUTEN_HOME}/ep/build-velox/build/velox_ep/_build/debug/third_party/arrow_ep) - else() - set(ARROW_HOME ${GLUTEN_HOME}/ep/build-velox/build/velox_ep/_build/release/third_party/arrow_ep) - endif() +if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") + set(ARROW_HOME ${VELOX_HOME}/_build/debug/third_party/arrow_ep) +else() + set(ARROW_HOME ${VELOX_HOME}/_build/release/third_party/arrow_ep) endif() #