Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

Update to Arrow 13 #713

Merged
merged 2 commits into from
Nov 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@ RUN apt-get update && apt-get install -y \
RUN wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
apt-get update && apt-get install -y -V \
libarrow-dev=11* \
libparquet-dev=11* \
libarrow-dataset-dev=11* \
libarrow-flight-dev=11* \
libarrow-dev=13* \
libparquet-dev=13* \
libarrow-dataset-dev=13* \
libarrow-acero-dev=13* \
libarrow-flight-dev=13* \
--

RUN apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.clang-cpu
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb && \
dpkg -i cuda-keyring_1.1-1_all.deb && \
apt-get update && \
apt-get install -y cuda-toolkit-12-2 cuda-drivers-535 libarrow-cuda-dev=11.*
apt-get install -y cuda-toolkit-12-2 cuda-drivers-535 libarrow-cuda-dev=13.*

ENV PATH=/usr/local/cuda/bin${PATH:+:${PATH}}

2 changes: 1 addition & 1 deletion docker/Dockerfile.cuda
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb && \
dpkg -i cuda-keyring_1.1-1_all.deb && \
apt-get update && \
apt-get install -y cuda-toolkit-12-2 cuda-drivers-535 libarrow-cuda-dev=11.*
apt-get install -y cuda-toolkit-12-2 cuda-drivers-535 libarrow-cuda-dev=13.*

ENV PATH=/usr/local/cuda/bin${PATH:+:${PATH}}

5 changes: 0 additions & 5 deletions docker/requirements.txt

This file was deleted.

4 changes: 2 additions & 2 deletions omniscidb/scripts/mapd-deps-conda-dev-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ dependencies:
- gcc_linux-64 12.*
- ccache
- sysroot_linux-64 >=2.14
- arrow-cpp 11.0
- pyarrow 11.0
- arrow-cpp 13.0
- pyarrow 13.0
- pandas 1.5.3
- llvmdev 16.*
- openjdk 20.*
Expand Down
4 changes: 2 additions & 2 deletions omniscidb/scripts/mapd-deps-conda-windows-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ channels:
dependencies:
- git
- ccache
- arrow-cpp 11.0
- pyarrow 11.0
- arrow-cpp 13.0
- pyarrow 13.0
- pandas 1.5.3
- llvmdev 16.*
- openjdk 20.*
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{% set py_build_string_ext = "py{}{}_{}".format(CONDA_PY, build_string, build_ext) %}
{% set py_build_string = "py{}{}".format(CONDA_PY, build_string) %}
{% set install_base = "opt/hdk" %}
{% set arrow_version = "11.*" %}
{% set arrow_version = "13.*" %}
{% set arrow_proc_version = "3.*" %}
{% set llvm_version = "16" %}

Expand Down