[Cylon] fixing macos, win and conda side effect

Signed-off-by: Arup Sarker <arupcsedu@gmail.com>
cylondata · Jun 9, 2024 · 25990e3 · 25990e3
1 parent 1799faa
commit 25990e3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -32,7 +32,7 @@ jobs:
         run: conda init $(basename ${SHELL})
 
       - name: Include $CONDA in $PATH
-        run: echo ::add-path::$CONDA/bin
+        run: echo ::add-path::$CONDA/condabin
 
       - uses: conda-incubator/setup-miniconda@v2
         with:

diff --git a/conda/environments/gcylon.yml b/conda/environments/gcylon.yml
@@ -6,10 +6,10 @@ channels:
   - defaults
 dependencies:
   - cudf
-  - cuda-toolkit=11.5
-  - cuda-runtime=11.5
-  - cuda-nvcc=11.5
-  - cuda-cudart=11.5
+  - cuda-toolkit=12
+  - cuda-runtime=12
+  - cuda-nvcc=12
+  - cuda-cudart=12
   - python=3.11
   - cmake
   #- arrow-cpp=9

diff --git a/conda/environments/windows.yml b/conda/environments/windows.yml
@@ -4,14 +4,14 @@ channels:
   - defaults
 dependencies:
   - python>=3.8,<3.10
-  - cmake>=3.23.1,!=3.25.0
+  - cmake>=3.23.1
   #g- arrow-cpp=16.1.0
   - pyarrow=16.1.0
   - glog
   - msmpi
   - cython>=0.29.31,<3
   - numpy<1.24.4
-  - pandas>=1.0,<2.0.0
+  - pandas>=1.0
   - fsspec>=0.6.0
   - setuptools
   # they are not needed for using pygcylon or compiling it

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -400,13 +400,13 @@ if (${ARROW_BUILD_TYPE} STREQUAL "SYSTEM")
     message(STATUS "Arrow dataset lib: ${ARROW_DATASET_LIB}")
 
     if (PYCYLON_BUILD)
-        find_library(ARROW_PY_LIB pyarrow ${CYLON_ARROW_VERSION} REQUIRED)
+        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})
+    set(Arrow_DIR ${ARROW_ROOT}/cmake/arrow)
     include(ConfigureArrow)
     include_directories(SYSTEM "${ARROW_INCLUDE_DIR}")
 elseif (${ARROW_BUILD_TYPE} STREQUAL "CUSTOM")