Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 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
8 changes: 4 additions & 4 deletions dev/builddeps-veloxbe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ fi
concat_velox_param

function build_arrow {
get_velox
setup_dependencies
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we add them here, they will be executed two times in the following complete build at line 306.

get_velox
setup_dependencies
build_velox_backend

Can we move get_velox into setup_dependencies and explicitly add setup_dependencies in dockerfile?

./dev/builddeps-veloxbe.sh --run_setup_script=ON setup_dependencies build_arrow

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let me add a flag to check if we need to run get_velox

cd $GLUTEN_DIR/dev
source ./build_arrow.sh
}
Expand Down Expand Up @@ -261,10 +263,8 @@ function build_velox_backend {
}

function get_velox {
(
cd $GLUTEN_DIR/ep/build-velox/src
./get_velox.sh $VELOX_PARAMETER
)
cd $GLUTEN_DIR/ep/build-velox/src
./get_velox.sh $VELOX_PARAMETER
}

function setup_dependencies {
Expand Down
1 change: 1 addition & 0 deletions dev/docker/Dockerfile.centos7-static-build
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ RUN set -ex; \
echo "Build arrow, then install the native libs to system paths and jar package to .m2/ directory."; \
cd /opt/gluten; \
source /opt/rh/devtoolset-11/enable; \
source /opt/rh/rh-git227/enable; \
bash ./dev/builddeps-veloxbe.sh --enable_vcpkg=ON --build_tests=ON --enable_s3=ON --enable_gcs=ON \
--enable_hdfs=ON --enable_abfs=ON build_arrow; \
mvn dependency:go-offline -Pbackends-velox -Piceberg -Pdelta -Pspark-3.5 -DskipTests; \
Expand Down
2 changes: 1 addition & 1 deletion dev/vcpkg/setup-build-depends.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ install_centos_7() {
# Requires git >= 2.7.4
if [[ "$(git --version)" != "git version 2."* ]]; then
yum -y remove git
# Requires 'centos-release-scl' package to be installed.
yum -y install rh-git227
source /opt/rh/rh-git227/enable
echo "source /opt/rh/rh-git227/enable" >> ~/.bashrc
fi

# flex>=2.6.0
Expand Down
Loading