Skip to content

ARROW-5631: [C++] Fix FindBoost targets with cmake3.2#4605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fsaintjacques wants to merge 8 commits into from
Closed

ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 #4605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
78e41cc
Fix trusty docker build
fsaintjacques Jun 18, 2019
bd85741
Add custom docker and vendor boost
fsaintjacques Jun 19, 2019
7544850
Remove debug docker command
fsaintjacques Jun 20, 2019
4b1c29f
ARROW-5653: [CI] Fix conda libraries
fsaintjacques Jun 21, 2019
3b70ff3
Fix rust docker image
fsaintjacques Jun 21, 2019
6c63207
Fix c_glib PKG_CONFIG_PATH in docker
fsaintjacques Jun 21, 2019
01f67dd
Fix R docker image
fsaintjacques Jun 21, 2019
9b946da
Code review feedback
wesm Jun 21, 2019
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
6 changes: 6 additions & 0 deletions ci/docker_build_and_test_cpp.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,11 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653 after install target, RPATH is modified on linux. Add this such
# that libraries are found with conda.
if [[ ! -z "${CONDA_PREFIX}" ]]; then
export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi

ninja unittest
popd
68 changes: 68 additions & 0 deletions cpp/Dockerfile.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
ca-certificates \
curl \
ccache \
g++ \
gcc \
git \
libidn11 \
ninja-build \
pkg-config \
tzdata \
wget \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# install conda and required packages
ARG EXTRA_CONDA_PKGS
ENV PATH=/opt/conda/bin:$PATH \
CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
ci/conda_env_cpp.yml \
ci/conda_env_unix.yml \
/arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
conda install -q -c conda-forge \
--file arrow/ci/conda_env_cpp.yml \
--file arrow/ci/conda_env_unix.yml \
$EXTRA_CONDA_PKGS && \
conda clean --all

ARG CMAKE_VERSION=3.2.3
ARG CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
RUN curl ${CMAKE_URL} -Lo cmake-${CMAKE_VERSION}.tar.gz && \
mkdir /opt/cmake && tar -zxvf cmake-${CMAKE_VERSION}.tar.gz -C /opt/cmake
ENV PATH=/opt/cmake/cmake-${CMAKE_VERSION}-Linux-x86_64/bin:$PATH

ENV CC=gcc \
CXX=g++ \
ARROW_GANDIVA=OFF \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=CONDA \
ARROW_HOME=$CONDA_PREFIX \
PARQUET_HOME=$CONDA_PREFIX

# build and test
CMD ["arrow/ci/docker_build_and_test_cpp.sh"]
1 change: 1 addition & 0 deletions cpp/Dockerfile.ubuntu-trusty
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ ENV CC=gcc \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_FLIGHT=OFF \
ARROW_WITH_OPENSSL=OFF \
ARROW_GANDIVA=OFF \
ARROW_GANDIVA_JAVA=OFF \
ARROW_ORC=OFF \
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/tests.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ tasks:
commands:
- docker-compose build cpp
- docker-compose build c_glib
- docker-compose run cpp
- docker-compose run c_glib

docker-go:
ci: circle
Expand Down
8 changes: 6 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,11 +149,15 @@ services:
shm_size: 2G
build:
context: .
dockerfile: cpp/Dockerfile
dockerfile: cpp/Dockerfile.cmake
args:
EXTRA_CONDA_PKGS: cmake=3.2
CMAKE_VERSION: 3.2.3
environment:
# Vendor boost to avoid dealing with stale FindBoost.
ARROW_BOOST_SOURCE: "BUNDLED"
ARROW_ORC: "OFF"
# uriparser requires cmake 3.3
ARROW_FLIGHT: "OFF"
PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
volumes: *ubuntu-volumes

Expand Down
18 changes: 11 additions & 7 deletions r/Dockerfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ ENV CC=gcc \

# r-base includes tzdata. Get around interactive stop in that package
ENV DEBIAN_FRONTEND=noninteractive
# workaround for install_github GitHub API rate limit
ENV CI=true

# Build R
# [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
Expand DownExpand Up@@ -50,7 +52,15 @@ RUN apt-get update -y && \
texlive-latex-base && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

RUN Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \
Rscript -e "devtools::install_github('romainfrancois/decor')" && \
Rscript -e "install.packages(c( \
'Rcpp', 'dplyr', 'stringr', 'glue', 'vctrs', \
Expand All@@ -65,12 +75,6 @@ RUN apt-get update -y && \
'lubridate'), \
repos = 'https://cran.rstudio.com')"

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

# build, install, test R package
CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \
Expand Down
4 changes: 2 additions & 2 deletions r/tests/testthat/test-json.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ test_that("Can read json file with scalars columns (ARROW-5503)", {
{ "hello": 3.25, "world": null }
{ "hello": 3.125, "world": null, "yo": "\u5fcd" }
{ "hello": 0.0, "world": true, "yo": null }
', tf)
', tf, useBytes=TRUE)

tab1 <- read_json_arrow(tf, as_tibble = FALSE)
tab2 <- read_json_arrow(mmap_open(tf), as_tibble = FALSE)
Expand DownExpand Up@@ -52,7 +52,7 @@ test_that("read_json_arrow() converts to tibble", {
{ "hello": 3.25, "world": null }
{ "hello": 3.125, "world": null, "yo": "\u5fcd" }
{ "hello": 0.0, "world": true, "yo": null }
', tf)
', tf, useBytes=TRUE)

tab1 <- read_json_arrow(tf)
tab2 <- read_json_arrow(mmap_open(tf))
Expand Down
3 changes: 3 additions & 0 deletions rust/Dockerfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,7 @@ ENV CARGO_TARGET_DIR=/build/rust
COPY rust/Cargo.toml /arrow/rust/Cargo.toml
WORKDIR /arrow/rust

ENV ARROW_TEST_DATA=/arrow/testing/data
ENV PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

CMD ["cargo", "test"]
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 by fsaintjacques · Pull Request #4605 · apache/arrow · GitHub
Skip to content
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2#4605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

fsaintjacques
wants to merge
8
commits into

from

 Closed


ARROW-5631: [C++] Fix FindBoost targets with cmake3.2
#4605
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78e41cc

Fix trusty docker build


fsaintjacques Jun 18, 2019
bd85741

Add custom docker and vendor boost


fsaintjacques Jun 19, 2019
7544850

Remove debug docker command


fsaintjacques Jun 20, 2019
4b1c29f

ARROW-5653: [CI] Fix conda libraries


fsaintjacques Jun 21, 2019
3b70ff3

Fix rust docker image


fsaintjacques Jun 21, 2019
6c63207

Fix c_glib PKG_CONFIG_PATH in docker


fsaintjacques Jun 21, 2019
01f67dd

Fix R docker image


fsaintjacques Jun 21, 2019
9b946da

Code review feedback


wesm Jun 21, 2019

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


6 changes: 6 additions & 0 deletions
ci/docker_build_and_test_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,11 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653 after install target, RPATH is modified on linux. Add this such
# that libraries are found with conda.
if [[ ! -z "${CONDA_PREFIX}" ]]; then
 export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi

ninja unittest
popd

68 changes: 68 additions & 0 deletions
cpp/Dockerfile.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 ca-certificates \
 curl \
 ccache \
 g++ \
 gcc \
 git \
 libidn11 \
 ninja-build \
 pkg-config \
 tzdata \
 wget \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/*

# install conda and required packages
ARG EXTRA_CONDA_PKGS
ENV PATH=/opt/conda/bin:$PATH \
 CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
 ci/conda_env_cpp.yml \
 ci/conda_env_unix.yml \
 /arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
 conda install -q -c conda-forge \
 --file arrow/ci/conda_env_cpp.yml \
 --file arrow/ci/conda_env_unix.yml \
 $EXTRA_CONDA_PKGS && \
 conda clean --all

ARG CMAKE_VERSION=3.2.3
ARG CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
RUN curl ${CMAKE_URL} -Lo cmake-${CMAKE_VERSION}.tar.gz && \
 mkdir /opt/cmake && tar -zxvf cmake-${CMAKE_VERSION}.tar.gz -C /opt/cmake
ENV PATH=/opt/cmake/cmake-${CMAKE_VERSION}-Linux-x86_64/bin:$PATH

ENV CC=gcc \
 CXX=g++ \
 ARROW_GANDIVA=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_HOME=$CONDA_PREFIX \
 PARQUET_HOME=$CONDA_PREFIX

# build and test
CMD ["arrow/ci/docker_build_and_test_cpp.sh"]

1 change: 1 addition & 0 deletions
cpp/Dockerfile.ubuntu-trusty

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ ENV CC=gcc \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=SYSTEM \
 ARROW_FLIGHT=OFF \
 ARROW_WITH_OPENSSL=OFF \
 ARROW_GANDIVA=OFF \
 ARROW_GANDIVA_JAVA=OFF \
 ARROW_ORC=OFF \
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ tasks:
 commands:
 - docker-compose build cpp
 - docker-compose build c_glib
 - docker-compose run cpp
 - docker-compose run c_glib

 docker-go:
 ci: circle
Expand Down

8 changes: 6 additions & 2 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,11 +149,15 @@ services:
 shm_size: 2G
 build:
 context: .
 dockerfile: cpp/Dockerfile
 dockerfile: cpp/Dockerfile.cmake
 args:
EXTRA_CONDA_PKGS: cmake=3.2
CMAKE_VERSION: 3.2.3
 environment:
 # Vendor boost to avoid dealing with stale FindBoost.
 ARROW_BOOST_SOURCE: "BUNDLED"
 ARROW_ORC: "OFF"
 # uriparser requires cmake 3.3
 ARROW_FLIGHT: "OFF"
 PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
 volumes: *ubuntu-volumes

Expand Down

18 changes: 11 additions & 7 deletions
r/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ ENV CC=gcc \

# r-base includes tzdata. Get around interactive stop in that package
ENV DEBIAN_FRONTEND=noninteractive
# workaround for install_github GitHub API rate limit
ENV CI=true

# Build R
# [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
Expand DownExpand Up@@ -50,7 +52,15 @@ RUN apt-get update -y && \
 texlive-latex-base && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists/* && \
 Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

RUN Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \
 Rscript -e "devtools::install_github('romainfrancois/decor')" && \
 Rscript -e "install.packages(c( \
 'Rcpp', 'dplyr', 'stringr', 'glue', 'vctrs', \
Expand All@@ -65,12 +75,6 @@ RUN apt-get update -y && \
 'lubridate'), \
 repos = 'https://cran.rstudio.com')"

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

# build, install, test R package
CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \
Expand Down

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ test_that("Can read json file with scalars columns (ARROW-5503)", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf, as_tibble = FALSE)
 tab2 <- read_json_arrow(mmap_open(tf), as_tibble = FALSE)
Expand DownExpand Up@@ -52,7 +52,7 @@ test_that("read_json_arrow() converts to tibble", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf)
 tab2 <- read_json_arrow(mmap_open(tf))
Expand Down

3 changes: 3 additions & 0 deletions
rust/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,7 @@ ENV CARGO_TARGET_DIR=/build/rust
COPY rust/Cargo.toml /arrow/rust/Cargo.toml
WORKDIR /arrow/rust

ENV ARROW_TEST_DATA=/arrow/testing/data
ENV PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

CMD ["cargo", "test"]

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 by fsaintjacques · Pull Request #4605 · apache/arrow · GitHub
Skip to content
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2#4605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

fsaintjacques
wants to merge
8
commits into

from

 Closed


ARROW-5631: [C++] Fix FindBoost targets with cmake3.2
#4605
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78e41cc

Fix trusty docker build


fsaintjacques Jun 18, 2019
bd85741

Add custom docker and vendor boost


fsaintjacques Jun 19, 2019
7544850

Remove debug docker command


fsaintjacques Jun 20, 2019
4b1c29f

ARROW-5653: [CI] Fix conda libraries


fsaintjacques Jun 21, 2019
3b70ff3

Fix rust docker image


fsaintjacques Jun 21, 2019
6c63207

Fix c_glib PKG_CONFIG_PATH in docker


fsaintjacques Jun 21, 2019
01f67dd

Fix R docker image


fsaintjacques Jun 21, 2019
9b946da

Code review feedback


wesm Jun 21, 2019

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


6 changes: 6 additions & 0 deletions
ci/docker_build_and_test_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,11 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653 after install target, RPATH is modified on linux. Add this such
# that libraries are found with conda.
if [[ ! -z "${CONDA_PREFIX}" ]]; then
 export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi

ninja unittest
popd

68 changes: 68 additions & 0 deletions
cpp/Dockerfile.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 ca-certificates \
 curl \
 ccache \
 g++ \
 gcc \
 git \
 libidn11 \
 ninja-build \
 pkg-config \
 tzdata \
 wget \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/*

# install conda and required packages
ARG EXTRA_CONDA_PKGS
ENV PATH=/opt/conda/bin:$PATH \
 CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
 ci/conda_env_cpp.yml \
 ci/conda_env_unix.yml \
 /arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
 conda install -q -c conda-forge \
 --file arrow/ci/conda_env_cpp.yml \
 --file arrow/ci/conda_env_unix.yml \
 $EXTRA_CONDA_PKGS && \
 conda clean --all

ARG CMAKE_VERSION=3.2.3
ARG CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
RUN curl ${CMAKE_URL} -Lo cmake-${CMAKE_VERSION}.tar.gz && \
 mkdir /opt/cmake && tar -zxvf cmake-${CMAKE_VERSION}.tar.gz -C /opt/cmake
ENV PATH=/opt/cmake/cmake-${CMAKE_VERSION}-Linux-x86_64/bin:$PATH

ENV CC=gcc \
 CXX=g++ \
 ARROW_GANDIVA=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_HOME=$CONDA_PREFIX \
 PARQUET_HOME=$CONDA_PREFIX

# build and test
CMD ["arrow/ci/docker_build_and_test_cpp.sh"]

1 change: 1 addition & 0 deletions
cpp/Dockerfile.ubuntu-trusty

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ ENV CC=gcc \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=SYSTEM \
 ARROW_FLIGHT=OFF \
 ARROW_WITH_OPENSSL=OFF \
 ARROW_GANDIVA=OFF \
 ARROW_GANDIVA_JAVA=OFF \
 ARROW_ORC=OFF \
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ tasks:
 commands:
 - docker-compose build cpp
 - docker-compose build c_glib
 - docker-compose run cpp
 - docker-compose run c_glib

 docker-go:
 ci: circle
Expand Down

8 changes: 6 additions & 2 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,11 +149,15 @@ services:
 shm_size: 2G
 build:
 context: .
 dockerfile: cpp/Dockerfile
 dockerfile: cpp/Dockerfile.cmake
 args:
EXTRA_CONDA_PKGS: cmake=3.2
CMAKE_VERSION: 3.2.3
 environment:
 # Vendor boost to avoid dealing with stale FindBoost.
 ARROW_BOOST_SOURCE: "BUNDLED"
 ARROW_ORC: "OFF"
 # uriparser requires cmake 3.3
 ARROW_FLIGHT: "OFF"
 PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
 volumes: *ubuntu-volumes

Expand Down

18 changes: 11 additions & 7 deletions
r/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ ENV CC=gcc \

# r-base includes tzdata. Get around interactive stop in that package
ENV DEBIAN_FRONTEND=noninteractive
# workaround for install_github GitHub API rate limit
ENV CI=true

# Build R
# [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
Expand DownExpand Up@@ -50,7 +52,15 @@ RUN apt-get update -y && \
 texlive-latex-base && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists/* && \
 Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

RUN Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \
 Rscript -e "devtools::install_github('romainfrancois/decor')" && \
 Rscript -e "install.packages(c( \
 'Rcpp', 'dplyr', 'stringr', 'glue', 'vctrs', \
Expand All@@ -65,12 +75,6 @@ RUN apt-get update -y && \
 'lubridate'), \
 repos = 'https://cran.rstudio.com')"

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

# build, install, test R package
CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \
Expand Down

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ test_that("Can read json file with scalars columns (ARROW-5503)", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf, as_tibble = FALSE)
 tab2 <- read_json_arrow(mmap_open(tf), as_tibble = FALSE)
Expand DownExpand Up@@ -52,7 +52,7 @@ test_that("read_json_arrow() converts to tibble", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf)
 tab2 <- read_json_arrow(mmap_open(tf))
Expand Down

3 changes: 3 additions & 0 deletions
rust/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,7 @@ ENV CARGO_TARGET_DIR=/build/rust
COPY rust/Cargo.toml /arrow/rust/Cargo.toml
WORKDIR /arrow/rust

ENV ARROW_TEST_DATA=/arrow/testing/data
ENV PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

CMD ["cargo", "test"]

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 by fsaintjacques · Pull Request #4605 · apache/arrow · GitHub
Skip to content
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2#4605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

fsaintjacques
wants to merge
8
commits into

from

 Closed


ARROW-5631: [C++] Fix FindBoost targets with cmake3.2
#4605
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78e41cc

Fix trusty docker build


fsaintjacques Jun 18, 2019
bd85741

Add custom docker and vendor boost


fsaintjacques Jun 19, 2019
7544850

Remove debug docker command


fsaintjacques Jun 20, 2019
4b1c29f

ARROW-5653: [CI] Fix conda libraries


fsaintjacques Jun 21, 2019
3b70ff3

Fix rust docker image


fsaintjacques Jun 21, 2019
6c63207

Fix c_glib PKG_CONFIG_PATH in docker


fsaintjacques Jun 21, 2019
01f67dd

Fix R docker image


fsaintjacques Jun 21, 2019
9b946da

Code review feedback


wesm Jun 21, 2019

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


6 changes: 6 additions & 0 deletions
ci/docker_build_and_test_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,11 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653 after install target, RPATH is modified on linux. Add this such
# that libraries are found with conda.
if [[ ! -z "${CONDA_PREFIX}" ]]; then
 export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi

ninja unittest
popd

68 changes: 68 additions & 0 deletions
cpp/Dockerfile.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 ca-certificates \
 curl \
 ccache \
 g++ \
 gcc \
 git \
 libidn11 \
 ninja-build \
 pkg-config \
 tzdata \
 wget \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/*

# install conda and required packages
ARG EXTRA_CONDA_PKGS
ENV PATH=/opt/conda/bin:$PATH \
 CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
 ci/conda_env_cpp.yml \
 ci/conda_env_unix.yml \
 /arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
 conda install -q -c conda-forge \
 --file arrow/ci/conda_env_cpp.yml \
 --file arrow/ci/conda_env_unix.yml \
 $EXTRA_CONDA_PKGS && \
 conda clean --all

ARG CMAKE_VERSION=3.2.3
ARG CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
RUN curl ${CMAKE_URL} -Lo cmake-${CMAKE_VERSION}.tar.gz && \
 mkdir /opt/cmake && tar -zxvf cmake-${CMAKE_VERSION}.tar.gz -C /opt/cmake
ENV PATH=/opt/cmake/cmake-${CMAKE_VERSION}-Linux-x86_64/bin:$PATH

ENV CC=gcc \
 CXX=g++ \
 ARROW_GANDIVA=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_HOME=$CONDA_PREFIX \
 PARQUET_HOME=$CONDA_PREFIX

# build and test
CMD ["arrow/ci/docker_build_and_test_cpp.sh"]

1 change: 1 addition & 0 deletions
cpp/Dockerfile.ubuntu-trusty

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ ENV CC=gcc \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=SYSTEM \
 ARROW_FLIGHT=OFF \
 ARROW_WITH_OPENSSL=OFF \
 ARROW_GANDIVA=OFF \
 ARROW_GANDIVA_JAVA=OFF \
 ARROW_ORC=OFF \
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ tasks:
 commands:
 - docker-compose build cpp
 - docker-compose build c_glib
 - docker-compose run cpp
 - docker-compose run c_glib

 docker-go:
 ci: circle
Expand Down

8 changes: 6 additions & 2 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,11 +149,15 @@ services:
 shm_size: 2G
 build:
 context: .
 dockerfile: cpp/Dockerfile
 dockerfile: cpp/Dockerfile.cmake
 args:
EXTRA_CONDA_PKGS: cmake=3.2
CMAKE_VERSION: 3.2.3
 environment:
 # Vendor boost to avoid dealing with stale FindBoost.
 ARROW_BOOST_SOURCE: "BUNDLED"
 ARROW_ORC: "OFF"
 # uriparser requires cmake 3.3
 ARROW_FLIGHT: "OFF"
 PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
 volumes: *ubuntu-volumes

Expand Down

18 changes: 11 additions & 7 deletions
r/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ ENV CC=gcc \

# r-base includes tzdata. Get around interactive stop in that package
ENV DEBIAN_FRONTEND=noninteractive
# workaround for install_github GitHub API rate limit
ENV CI=true

# Build R
# [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
Expand DownExpand Up@@ -50,7 +52,15 @@ RUN apt-get update -y && \
 texlive-latex-base && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists/* && \
 Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

RUN Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \
 Rscript -e "devtools::install_github('romainfrancois/decor')" && \
 Rscript -e "install.packages(c( \
 'Rcpp', 'dplyr', 'stringr', 'glue', 'vctrs', \
Expand All@@ -65,12 +75,6 @@ RUN apt-get update -y && \
 'lubridate'), \
 repos = 'https://cran.rstudio.com')"

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

# build, install, test R package
CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \
Expand Down

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ test_that("Can read json file with scalars columns (ARROW-5503)", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf, as_tibble = FALSE)
 tab2 <- read_json_arrow(mmap_open(tf), as_tibble = FALSE)
Expand DownExpand Up@@ -52,7 +52,7 @@ test_that("read_json_arrow() converts to tibble", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf)
 tab2 <- read_json_arrow(mmap_open(tf))
Expand Down

3 changes: 3 additions & 0 deletions
rust/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,7 @@ ENV CARGO_TARGET_DIR=/build/rust
COPY rust/Cargo.toml /arrow/rust/Cargo.toml
WORKDIR /arrow/rust

ENV ARROW_TEST_DATA=/arrow/testing/data
ENV PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

CMD ["cargo", "test"]

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 by fsaintjacques · Pull Request #4605 · apache/arrow · GitHub
Skip to content
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2#4605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

fsaintjacques
wants to merge
8
commits into

from

 Closed


ARROW-5631: [C++] Fix FindBoost targets with cmake3.2
#4605
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78e41cc

Fix trusty docker build


fsaintjacques Jun 18, 2019
bd85741

Add custom docker and vendor boost


fsaintjacques Jun 19, 2019
7544850

Remove debug docker command


fsaintjacques Jun 20, 2019
4b1c29f

ARROW-5653: [CI] Fix conda libraries


fsaintjacques Jun 21, 2019
3b70ff3

Fix rust docker image


fsaintjacques Jun 21, 2019
6c63207

Fix c_glib PKG_CONFIG_PATH in docker


fsaintjacques Jun 21, 2019
01f67dd

Fix R docker image


fsaintjacques Jun 21, 2019
9b946da

Code review feedback


wesm Jun 21, 2019

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


6 changes: 6 additions & 0 deletions
ci/docker_build_and_test_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,11 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653 after install target, RPATH is modified on linux. Add this such
# that libraries are found with conda.
if [[ ! -z "${CONDA_PREFIX}" ]]; then
 export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi

ninja unittest
popd

68 changes: 68 additions & 0 deletions
cpp/Dockerfile.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 ca-certificates \
 curl \
 ccache \
 g++ \
 gcc \
 git \
 libidn11 \
 ninja-build \
 pkg-config \
 tzdata \
 wget \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/*

# install conda and required packages
ARG EXTRA_CONDA_PKGS
ENV PATH=/opt/conda/bin:$PATH \
 CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
 ci/conda_env_cpp.yml \
 ci/conda_env_unix.yml \
 /arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
 conda install -q -c conda-forge \
 --file arrow/ci/conda_env_cpp.yml \
 --file arrow/ci/conda_env_unix.yml \
 $EXTRA_CONDA_PKGS && \
 conda clean --all

ARG CMAKE_VERSION=3.2.3
ARG CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
RUN curl ${CMAKE_URL} -Lo cmake-${CMAKE_VERSION}.tar.gz && \
 mkdir /opt/cmake && tar -zxvf cmake-${CMAKE_VERSION}.tar.gz -C /opt/cmake
ENV PATH=/opt/cmake/cmake-${CMAKE_VERSION}-Linux-x86_64/bin:$PATH

ENV CC=gcc \
 CXX=g++ \
 ARROW_GANDIVA=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_HOME=$CONDA_PREFIX \
 PARQUET_HOME=$CONDA_PREFIX

# build and test
CMD ["arrow/ci/docker_build_and_test_cpp.sh"]

1 change: 1 addition & 0 deletions
cpp/Dockerfile.ubuntu-trusty

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ ENV CC=gcc \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=SYSTEM \
 ARROW_FLIGHT=OFF \
 ARROW_WITH_OPENSSL=OFF \
 ARROW_GANDIVA=OFF \
 ARROW_GANDIVA_JAVA=OFF \
 ARROW_ORC=OFF \
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ tasks:
 commands:
 - docker-compose build cpp
 - docker-compose build c_glib
 - docker-compose run cpp
 - docker-compose run c_glib

 docker-go:
 ci: circle
Expand Down

8 changes: 6 additions & 2 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,11 +149,15 @@ services:
 shm_size: 2G
 build:
 context: .
 dockerfile: cpp/Dockerfile
 dockerfile: cpp/Dockerfile.cmake
 args:
EXTRA_CONDA_PKGS: cmake=3.2
CMAKE_VERSION: 3.2.3
 environment:
 # Vendor boost to avoid dealing with stale FindBoost.
 ARROW_BOOST_SOURCE: "BUNDLED"
 ARROW_ORC: "OFF"
 # uriparser requires cmake 3.3
 ARROW_FLIGHT: "OFF"
 PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
 volumes: *ubuntu-volumes

Expand Down

18 changes: 11 additions & 7 deletions
r/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ ENV CC=gcc \

# r-base includes tzdata. Get around interactive stop in that package
ENV DEBIAN_FRONTEND=noninteractive
# workaround for install_github GitHub API rate limit
ENV CI=true

# Build R
# [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
Expand DownExpand Up@@ -50,7 +52,15 @@ RUN apt-get update -y && \
 texlive-latex-base && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists/* && \
 Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

RUN Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \
 Rscript -e "devtools::install_github('romainfrancois/decor')" && \
 Rscript -e "install.packages(c( \
 'Rcpp', 'dplyr', 'stringr', 'glue', 'vctrs', \
Expand All@@ -65,12 +75,6 @@ RUN apt-get update -y && \
 'lubridate'), \
 repos = 'https://cran.rstudio.com')"

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

# build, install, test R package
CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \
Expand Down

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ test_that("Can read json file with scalars columns (ARROW-5503)", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf, as_tibble = FALSE)
 tab2 <- read_json_arrow(mmap_open(tf), as_tibble = FALSE)
Expand DownExpand Up@@ -52,7 +52,7 @@ test_that("read_json_arrow() converts to tibble", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf)
 tab2 <- read_json_arrow(mmap_open(tf))
Expand Down

3 changes: 3 additions & 0 deletions
rust/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,7 @@ ENV CARGO_TARGET_DIR=/build/rust
COPY rust/Cargo.toml /arrow/rust/Cargo.toml
WORKDIR /arrow/rust

ENV ARROW_TEST_DATA=/arrow/testing/data
ENV PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

CMD ["cargo", "test"]

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 by fsaintjacques · Pull Request #4605 · apache/arrow · GitHub
Skip to content
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2#4605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

fsaintjacques
wants to merge
8
commits into

from

 Closed


ARROW-5631: [C++] Fix FindBoost targets with cmake3.2
#4605
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78e41cc

Fix trusty docker build


fsaintjacques Jun 18, 2019
bd85741

Add custom docker and vendor boost


fsaintjacques Jun 19, 2019
7544850

Remove debug docker command


fsaintjacques Jun 20, 2019
4b1c29f

ARROW-5653: [CI] Fix conda libraries


fsaintjacques Jun 21, 2019
3b70ff3

Fix rust docker image


fsaintjacques Jun 21, 2019
6c63207

Fix c_glib PKG_CONFIG_PATH in docker


fsaintjacques Jun 21, 2019
01f67dd

Fix R docker image


fsaintjacques Jun 21, 2019
9b946da

Code review feedback


wesm Jun 21, 2019

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


6 changes: 6 additions & 0 deletions
ci/docker_build_and_test_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,11 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653 after install target, RPATH is modified on linux. Add this such
# that libraries are found with conda.
if [[ ! -z "${CONDA_PREFIX}" ]]; then
 export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi

ninja unittest
popd

68 changes: 68 additions & 0 deletions
cpp/Dockerfile.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 ca-certificates \
 curl \
 ccache \
 g++ \
 gcc \
 git \
 libidn11 \
 ninja-build \
 pkg-config \
 tzdata \
 wget \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/*

# install conda and required packages
ARG EXTRA_CONDA_PKGS
ENV PATH=/opt/conda/bin:$PATH \
 CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
 ci/conda_env_cpp.yml \
 ci/conda_env_unix.yml \
 /arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
 conda install -q -c conda-forge \
 --file arrow/ci/conda_env_cpp.yml \
 --file arrow/ci/conda_env_unix.yml \
 $EXTRA_CONDA_PKGS && \
 conda clean --all

ARG CMAKE_VERSION=3.2.3
ARG CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
RUN curl ${CMAKE_URL} -Lo cmake-${CMAKE_VERSION}.tar.gz && \
 mkdir /opt/cmake && tar -zxvf cmake-${CMAKE_VERSION}.tar.gz -C /opt/cmake
ENV PATH=/opt/cmake/cmake-${CMAKE_VERSION}-Linux-x86_64/bin:$PATH

ENV CC=gcc \
 CXX=g++ \
 ARROW_GANDIVA=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_HOME=$CONDA_PREFIX \
 PARQUET_HOME=$CONDA_PREFIX

# build and test
CMD ["arrow/ci/docker_build_and_test_cpp.sh"]

1 change: 1 addition & 0 deletions
cpp/Dockerfile.ubuntu-trusty

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ ENV CC=gcc \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=SYSTEM \
 ARROW_FLIGHT=OFF \
 ARROW_WITH_OPENSSL=OFF \
 ARROW_GANDIVA=OFF \
 ARROW_GANDIVA_JAVA=OFF \
 ARROW_ORC=OFF \
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ tasks:
 commands:
 - docker-compose build cpp
 - docker-compose build c_glib
 - docker-compose run cpp
 - docker-compose run c_glib

 docker-go:
 ci: circle
Expand Down

8 changes: 6 additions & 2 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,11 +149,15 @@ services:
 shm_size: 2G
 build:
 context: .
 dockerfile: cpp/Dockerfile
 dockerfile: cpp/Dockerfile.cmake
 args:
EXTRA_CONDA_PKGS: cmake=3.2
CMAKE_VERSION: 3.2.3
 environment:
 # Vendor boost to avoid dealing with stale FindBoost.
 ARROW_BOOST_SOURCE: "BUNDLED"
 ARROW_ORC: "OFF"
 # uriparser requires cmake 3.3
 ARROW_FLIGHT: "OFF"
 PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
 volumes: *ubuntu-volumes

Expand Down

18 changes: 11 additions & 7 deletions
r/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ ENV CC=gcc \

# r-base includes tzdata. Get around interactive stop in that package
ENV DEBIAN_FRONTEND=noninteractive
# workaround for install_github GitHub API rate limit
ENV CI=true

# Build R
# [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
Expand DownExpand Up@@ -50,7 +52,15 @@ RUN apt-get update -y && \
 texlive-latex-base && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists/* && \
 Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

RUN Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \
 Rscript -e "devtools::install_github('romainfrancois/decor')" && \
 Rscript -e "install.packages(c( \
 'Rcpp', 'dplyr', 'stringr', 'glue', 'vctrs', \
Expand All@@ -65,12 +75,6 @@ RUN apt-get update -y && \
 'lubridate'), \
 repos = 'https://cran.rstudio.com')"

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

# build, install, test R package
CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \
Expand Down

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ test_that("Can read json file with scalars columns (ARROW-5503)", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf, as_tibble = FALSE)
 tab2 <- read_json_arrow(mmap_open(tf), as_tibble = FALSE)
Expand DownExpand Up@@ -52,7 +52,7 @@ test_that("read_json_arrow() converts to tibble", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf)
 tab2 <- read_json_arrow(mmap_open(tf))
Expand Down

3 changes: 3 additions & 0 deletions
rust/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,7 @@ ENV CARGO_TARGET_DIR=/build/rust
COPY rust/Cargo.toml /arrow/rust/Cargo.toml
WORKDIR /arrow/rust

ENV ARROW_TEST_DATA=/arrow/testing/data
ENV PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

CMD ["cargo", "test"]

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 by fsaintjacques · Pull Request #4605 · apache/arrow · GitHub
Skip to content
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2#4605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

fsaintjacques
wants to merge
8
commits into

from

 Closed


ARROW-5631: [C++] Fix FindBoost targets with cmake3.2
#4605
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78e41cc

Fix trusty docker build


fsaintjacques Jun 18, 2019
bd85741

Add custom docker and vendor boost


fsaintjacques Jun 19, 2019
7544850

Remove debug docker command


fsaintjacques Jun 20, 2019
4b1c29f

ARROW-5653: [CI] Fix conda libraries


fsaintjacques Jun 21, 2019
3b70ff3

Fix rust docker image


fsaintjacques Jun 21, 2019
6c63207

Fix c_glib PKG_CONFIG_PATH in docker


fsaintjacques Jun 21, 2019
01f67dd

Fix R docker image


fsaintjacques Jun 21, 2019
9b946da

Code review feedback


wesm Jun 21, 2019

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


6 changes: 6 additions & 0 deletions
ci/docker_build_and_test_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,11 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653 after install target, RPATH is modified on linux. Add this such
# that libraries are found with conda.
if [[ ! -z "${CONDA_PREFIX}" ]]; then
 export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi

ninja unittest
popd

68 changes: 68 additions & 0 deletions
cpp/Dockerfile.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 ca-certificates \
 curl \
 ccache \
 g++ \
 gcc \
 git \
 libidn11 \
 ninja-build \
 pkg-config \
 tzdata \
 wget \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/*

# install conda and required packages
ARG EXTRA_CONDA_PKGS
ENV PATH=/opt/conda/bin:$PATH \
 CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
 ci/conda_env_cpp.yml \
 ci/conda_env_unix.yml \
 /arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
 conda install -q -c conda-forge \
 --file arrow/ci/conda_env_cpp.yml \
 --file arrow/ci/conda_env_unix.yml \
 $EXTRA_CONDA_PKGS && \
 conda clean --all

ARG CMAKE_VERSION=3.2.3
ARG CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
RUN curl ${CMAKE_URL} -Lo cmake-${CMAKE_VERSION}.tar.gz && \
 mkdir /opt/cmake && tar -zxvf cmake-${CMAKE_VERSION}.tar.gz -C /opt/cmake
ENV PATH=/opt/cmake/cmake-${CMAKE_VERSION}-Linux-x86_64/bin:$PATH

ENV CC=gcc \
 CXX=g++ \
 ARROW_GANDIVA=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_HOME=$CONDA_PREFIX \
 PARQUET_HOME=$CONDA_PREFIX

# build and test
CMD ["arrow/ci/docker_build_and_test_cpp.sh"]

1 change: 1 addition & 0 deletions
cpp/Dockerfile.ubuntu-trusty

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ ENV CC=gcc \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=SYSTEM \
 ARROW_FLIGHT=OFF \
 ARROW_WITH_OPENSSL=OFF \
 ARROW_GANDIVA=OFF \
 ARROW_GANDIVA_JAVA=OFF \
 ARROW_ORC=OFF \
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ tasks:
 commands:
 - docker-compose build cpp
 - docker-compose build c_glib
 - docker-compose run cpp
 - docker-compose run c_glib

 docker-go:
 ci: circle
Expand Down

8 changes: 6 additions & 2 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,11 +149,15 @@ services:
 shm_size: 2G
 build:
 context: .
 dockerfile: cpp/Dockerfile
 dockerfile: cpp/Dockerfile.cmake
 args:
EXTRA_CONDA_PKGS: cmake=3.2
CMAKE_VERSION: 3.2.3
 environment:
 # Vendor boost to avoid dealing with stale FindBoost.
 ARROW_BOOST_SOURCE: "BUNDLED"
 ARROW_ORC: "OFF"
 # uriparser requires cmake 3.3
 ARROW_FLIGHT: "OFF"
 PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
 volumes: *ubuntu-volumes

Expand Down

18 changes: 11 additions & 7 deletions
r/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ ENV CC=gcc \

# r-base includes tzdata. Get around interactive stop in that package
ENV DEBIAN_FRONTEND=noninteractive
# workaround for install_github GitHub API rate limit
ENV CI=true

# Build R
# [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
Expand DownExpand Up@@ -50,7 +52,15 @@ RUN apt-get update -y && \
 texlive-latex-base && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists/* && \
 Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

RUN Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \
 Rscript -e "devtools::install_github('romainfrancois/decor')" && \
 Rscript -e "install.packages(c( \
 'Rcpp', 'dplyr', 'stringr', 'glue', 'vctrs', \
Expand All@@ -65,12 +75,6 @@ RUN apt-get update -y && \
 'lubridate'), \
 repos = 'https://cran.rstudio.com')"

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

# build, install, test R package
CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \
Expand Down

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ test_that("Can read json file with scalars columns (ARROW-5503)", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf, as_tibble = FALSE)
 tab2 <- read_json_arrow(mmap_open(tf), as_tibble = FALSE)
Expand DownExpand Up@@ -52,7 +52,7 @@ test_that("read_json_arrow() converts to tibble", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf)
 tab2 <- read_json_arrow(mmap_open(tf))
Expand Down

3 changes: 3 additions & 0 deletions
rust/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,7 @@ ENV CARGO_TARGET_DIR=/build/rust
COPY rust/Cargo.toml /arrow/rust/Cargo.toml
WORKDIR /arrow/rust

ENV ARROW_TEST_DATA=/arrow/testing/data
ENV PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

CMD ["cargo", "test"]

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 by fsaintjacques · Pull Request #4605 · apache/arrow · GitHub
Skip to content
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2#4605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

fsaintjacques
wants to merge
8
commits into

from

 Closed


ARROW-5631: [C++] Fix FindBoost targets with cmake3.2
#4605
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78e41cc

Fix trusty docker build


fsaintjacques Jun 18, 2019
bd85741

Add custom docker and vendor boost


fsaintjacques Jun 19, 2019
7544850

Remove debug docker command


fsaintjacques Jun 20, 2019
4b1c29f

ARROW-5653: [CI] Fix conda libraries


fsaintjacques Jun 21, 2019
3b70ff3

Fix rust docker image


fsaintjacques Jun 21, 2019
6c63207

Fix c_glib PKG_CONFIG_PATH in docker


fsaintjacques Jun 21, 2019
01f67dd

Fix R docker image


fsaintjacques Jun 21, 2019
9b946da

Code review feedback


wesm Jun 21, 2019

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


6 changes: 6 additions & 0 deletions
ci/docker_build_and_test_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,11 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653 after install target, RPATH is modified on linux. Add this such
# that libraries are found with conda.
if [[ ! -z "${CONDA_PREFIX}" ]]; then
 export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi

ninja unittest
popd

68 changes: 68 additions & 0 deletions
cpp/Dockerfile.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 ca-certificates \
 curl \
 ccache \
 g++ \
 gcc \
 git \
 libidn11 \
 ninja-build \
 pkg-config \
 tzdata \
 wget \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/*

# install conda and required packages
ARG EXTRA_CONDA_PKGS
ENV PATH=/opt/conda/bin:$PATH \
 CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
 ci/conda_env_cpp.yml \
 ci/conda_env_unix.yml \
 /arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
 conda install -q -c conda-forge \
 --file arrow/ci/conda_env_cpp.yml \
 --file arrow/ci/conda_env_unix.yml \
 $EXTRA_CONDA_PKGS && \
 conda clean --all

ARG CMAKE_VERSION=3.2.3
ARG CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
RUN curl ${CMAKE_URL} -Lo cmake-${CMAKE_VERSION}.tar.gz && \
 mkdir /opt/cmake && tar -zxvf cmake-${CMAKE_VERSION}.tar.gz -C /opt/cmake
ENV PATH=/opt/cmake/cmake-${CMAKE_VERSION}-Linux-x86_64/bin:$PATH

ENV CC=gcc \
 CXX=g++ \
 ARROW_GANDIVA=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_HOME=$CONDA_PREFIX \
 PARQUET_HOME=$CONDA_PREFIX

# build and test
CMD ["arrow/ci/docker_build_and_test_cpp.sh"]

1 change: 1 addition & 0 deletions
cpp/Dockerfile.ubuntu-trusty

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ ENV CC=gcc \
 ARROW_BUILD_TESTS=ON \
 ARROW_DEPENDENCY_SOURCE=SYSTEM \
 ARROW_FLIGHT=OFF \
 ARROW_WITH_OPENSSL=OFF \
 ARROW_GANDIVA=OFF \
 ARROW_GANDIVA_JAVA=OFF \
 ARROW_ORC=OFF \
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ tasks:
 commands:
 - docker-compose build cpp
 - docker-compose build c_glib
 - docker-compose run cpp
 - docker-compose run c_glib

 docker-go:
 ci: circle
Expand Down

8 changes: 6 additions & 2 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,11 +149,15 @@ services:
 shm_size: 2G
 build:
 context: .
 dockerfile: cpp/Dockerfile
 dockerfile: cpp/Dockerfile.cmake
 args:
EXTRA_CONDA_PKGS: cmake=3.2
CMAKE_VERSION: 3.2.3
 environment:
 # Vendor boost to avoid dealing with stale FindBoost.
 ARROW_BOOST_SOURCE: "BUNDLED"
 ARROW_ORC: "OFF"
 # uriparser requires cmake 3.3
 ARROW_FLIGHT: "OFF"
 PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
 volumes: *ubuntu-volumes

Expand Down

18 changes: 11 additions & 7 deletions
r/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ ENV CC=gcc \

# r-base includes tzdata. Get around interactive stop in that package
ENV DEBIAN_FRONTEND=noninteractive
# workaround for install_github GitHub API rate limit
ENV CI=true

# Build R
# [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
Expand DownExpand Up@@ -50,7 +52,15 @@ RUN apt-get update -y && \
 texlive-latex-base && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists/* && \
 Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

RUN Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \
 Rscript -e "devtools::install_github('romainfrancois/decor')" && \
 Rscript -e "install.packages(c( \
 'Rcpp', 'dplyr', 'stringr', 'glue', 'vctrs', \
Expand All@@ -65,12 +75,6 @@ RUN apt-get update -y && \
 'lubridate'), \
 repos = 'https://cran.rstudio.com')"

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

# build, install, test R package
CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \
Expand Down

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-json.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ test_that("Can read json file with scalars columns (ARROW-5503)", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf, as_tibble = FALSE)
 tab2 <- read_json_arrow(mmap_open(tf), as_tibble = FALSE)
Expand DownExpand Up@@ -52,7 +52,7 @@ test_that("read_json_arrow() converts to tibble", {
 { "hello": 3.25, "world": null }
 { "hello": 3.125, "world": null, "yo": "\u5fcd" }
 { "hello": 0.0, "world": true, "yo": null }
 ', tf)
 ', tf, useBytes=TRUE)

 tab1 <- read_json_arrow(tf)
 tab2 <- read_json_arrow(mmap_open(tf))
Expand Down

3 changes: 3 additions & 0 deletions
rust/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,7 @@ ENV CARGO_TARGET_DIR=/build/rust
COPY rust/Cargo.toml /arrow/rust/Cargo.toml
WORKDIR /arrow/rust

ENV ARROW_TEST_DATA=/arrow/testing/data
ENV PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

CMD ["cargo", "test"]