You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/06/05 03:11:55 UTC
[arrow] branch master updated: ARROW-5020: [CI] Split
Gandiva-related packages into separate .yml file
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new a4dad32 ARROW-5020: [CI] Split Gandiva-related packages into separate .yml file
a4dad32 is described below
commit a4dad3277f32b79e7da2488846f68e1987400786
Author: Antoine Pitrou <an...@python.org>
AuthorDate: Tue Jun 4 22:11:37 2019 -0500
ARROW-5020: [CI] Split Gandiva-related packages into separate .yml file
Avoid installing heavy packages such as clangdev and llvmdev if not building Gandiva.
Author: Antoine Pitrou <an...@python.org>
Closes #4459 from pitrou/ARROW-5020-gandiva-conda-packages and squashes the following commits:
8c9b67e2 <Antoine Pitrou> ARROW-5020: Split Gandiva-related packages into separate .yml file
---
ci/appveyor-cpp-build.bat | 2 +-
ci/conda_env_cpp.yml | 3 ---
ci/{conda_env_cpp.yml => conda_env_gandiva.yml} | 23 -----------------------
ci/travis_install_toolchain.sh | 12 +++---------
ci/travis_script_python.sh | 12 ++++++++++--
5 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/ci/appveyor-cpp-build.bat b/ci/appveyor-cpp-build.bat
index 54f947a..c221892 100644
--- a/ci/appveyor-cpp-build.bat
+++ b/ci/appveyor-cpp-build.bat
@@ -104,7 +104,7 @@ set CONDA_PACKAGES=--file=ci\conda_env_python.yml python=%PYTHON% numpy=1.14 boo
if "%ARROW_BUILD_GANDIVA%" == "ON" (
@rem Install llvmdev in the toolchain if building gandiva.dll
- set CONDA_PACKAGES=%CONDA_PACKAGES% llvmdev=%ARROW_LLVM_VERSION% clangdev=%ARROW_LLVM_VERSION%
+ set CONDA_PACKAGES=%CONDA_PACKAGES% --file=ci\conda_env_gandiva.yml
)
if "%JOB%" == "Toolchain" (
diff --git a/ci/conda_env_cpp.yml b/ci/conda_env_cpp.yml
index a90e82b..cf5ba48 100644
--- a/ci/conda_env_cpp.yml
+++ b/ci/conda_env_cpp.yml
@@ -28,15 +28,12 @@ glog
gmock>=1.8.1
grpc-cpp
gtest>=1.8.1
-clangdev=7
-llvmdev=7
libprotobuf
lz4-c
ninja
pkg-config
python
rapidjson
-re2
snappy
thrift-cpp>=0.11.0
zlib
diff --git a/ci/conda_env_cpp.yml b/ci/conda_env_gandiva.yml
similarity index 78%
copy from ci/conda_env_cpp.yml
copy to ci/conda_env_gandiva.yml
index a90e82b..448f444 100644
--- a/ci/conda_env_cpp.yml
+++ b/ci/conda_env_gandiva.yml
@@ -15,29 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-benchmark=1.4.1
-boost-cpp>=1.68.0
-brotli
-bzip2
-c-ares
-cmake
-double-conversion
-flatbuffers
-gflags
-glog
-gmock>=1.8.1
-grpc-cpp
-gtest>=1.8.1
clangdev=7
llvmdev=7
-libprotobuf
-lz4-c
-ninja
-pkg-config
-python
-rapidjson
re2
-snappy
-thrift-cpp>=0.11.0
-zlib
-zstd
diff --git a/ci/travis_install_toolchain.sh b/ci/travis_install_toolchain.sh
index d5fdb11..7951e40 100755
--- a/ci/travis_install_toolchain.sh
+++ b/ci/travis_install_toolchain.sh
@@ -23,23 +23,17 @@ source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
if [ ! -e $CPP_TOOLCHAIN ]; then
CONDA_PACKAGES=""
- CONDA_LABEL=""
- if [ "$ARROW_TRAVIS_GANDIVA" == "1" ] && [ $TRAVIS_OS_NAME == "osx" ]; then
- CONDA_PACKAGES="$CONDA_PACKAGES llvmdev=$CONDA_LLVM_VERSION"
- fi
-
- if [ "$ARROW_TRAVIS_VALGRIND" == "1" ]; then
- # Use newer Valgrind
- CONDA_PACKAGES="$CONDA_PACKAGES valgrind"
+ if [ "$ARROW_TRAVIS_GANDIVA" == "1" ]; then
+ CONDA_PACKAGES="$CONDA_PACKAGES --file=$TRAVIS_BUILD_DIR/ci/conda_env_gandiva.yml"
fi
# Set up C++ toolchain from conda-forge packages for faster builds
time conda create -y -q -p $CPP_TOOLCHAIN \
--file=$TRAVIS_BUILD_DIR/ci/conda_env_cpp.yml \
--file=$TRAVIS_BUILD_DIR/ci/conda_env_unix.yml \
- compilers \
$CONDA_PACKAGES \
+ compilers \
nomkl \
python=3.6
fi
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index 7d8da4b..9e4fe72 100755
--- a/ci/travis_script_python.sh
+++ b/ci/travis_script_python.sh
@@ -38,20 +38,28 @@ CONDA_ENV_DIR=$TRAVIS_BUILD_DIR/pyarrow-test-$PYTHON_VERSION
# may not have NumPy (which is required for python-test)
export ZLIB_HOME=$CONDA_ENV_DIR
+CONDA_FILES=""
+CONDA_PACKAGES=""
+
+if [ "$ARROW_TRAVIS_PYTHON_GANDIVA" == "1" ]; then
+ CONDA_FILES="$CONDA_FILES --file=$TRAVIS_BUILD_DIR/ci/conda_env_gandiva.yml"
+fi
+
if [ "$ARROW_TRAVIS_PYTHON_JVM" == "1" ]; then
- CONDA_JVM_DEPS="jpype1"
+ CONDA_PACKAGES="$CONDA_PACKAGES jpype1"
fi
conda create -y -q -p $CONDA_ENV_DIR \
--file $TRAVIS_BUILD_DIR/ci/conda_env_cpp.yml \
--file $TRAVIS_BUILD_DIR/ci/conda_env_python.yml \
+ ${CONDA_FILES} \
nomkl \
pip \
numpy=1.14 \
'libgfortran<4' \
python=${PYTHON_VERSION} \
compilers \
- ${CONDA_JVM_DEPS}
+ ${CONDA_PACKAGES}
conda activate $CONDA_ENV_DIR