Skip to content

Commit

Permalink
[Cylon] Add Arrow Path
Browse files Browse the repository at this point in the history
Signed-off-by: Arup Sarker <[email protected]>
  • Loading branch information
arupcsedu committed Jun 9, 2024
1 parent 4cc1d7b commit 5973935
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Conda Init
run: conda init $(basename ${SHELL})

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda
with:
activate-environment: cylon_dev
environment-file: conda/environments/cylon_MacOS.yml
Expand Down
8 changes: 4 additions & 4 deletions conda/environments/gcylon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ channels:
- defaults
dependencies:
- cudf
- cuda-toolkit=11.8
- cuda-runtime=11.8
- cuda-nvcc=11.8
- cuda-cudart=11.8
- cuda-toolkit=11.5
- cuda-runtime=11.5
- cuda-nvcc=11.5
- cuda-cudart=11.5
- python=3.11
- cmake
#- arrow-cpp=9
Expand Down
5 changes: 4 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ if (NOT HAVE_EXCLUSIVE_SCAN)
add_definitions(-DNEED_EXCLUSIVE_SCAN)
endif ()



# check for conda environment
if ("$ENV{CONDA_BUILD}" STREQUAL "1")
message("CONDA_BUILD detected. BUILD_PREFIX: $ENV{BUILD_PREFIX} PREFIX: $ENV{PREFIX}")
Expand Down Expand Up @@ -398,17 +400,18 @@ if (${ARROW_BUILD_TYPE} STREQUAL "SYSTEM")
message(STATUS "Arrow dataset lib: ${ARROW_DATASET_LIB}")

if (PYCYLON_BUILD)
set(ARROW_PY_LIB ${ARROW_LIB_DIR})
find_library(ARROW_PY_LIB arrow_python ${CYLON_ARROW_VERSION} REQUIRED)
message(STATUS "Arrow py lib: ${ARROW_PY_LIB}")
endif (PYCYLON_BUILD)

elseif (${ARROW_BUILD_TYPE} STREQUAL "SOURCE")
message("Building Arrow from SOURCE")
set(CMAKE_PREFIX_PATH ${ARROW_ROOT})
include(ConfigureArrow)
include_directories(SYSTEM "${ARROW_INCLUDE_DIR}")
elseif (${ARROW_BUILD_TYPE} STREQUAL "CUSTOM")
message("Using CUSTOM Arrow installation")

if (NOT ARROW_LIB_DIR)
message(FATAL_ERROR "ARROW_BUILD_TYPE is set to CUSTOM, ARROW_LIB_DIR should be set")
endif ()
Expand Down

0 comments on commit 5973935

Please sign in to comment.