-
Notifications
You must be signed in to change notification settings - Fork 453
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.
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
[VL] Apply patch to Velox for compilation #3520
Conversation
Thanks for opening a pull request! Could you open an issue for this pull request on Github Issues? https://github.com/oap-project/gluten/issues Then could you also rename commit message and pull request title in the following format?
See also: |
ep/build-velox/src/build_velox.sh
Outdated
sudo mkdir -p ${velox_home}/third_party/arrow_patches/ | ||
sudo cp ${current_dir}/helpers.patch ${velox_home}/third_party/arrow_patches/ | ||
cd ${velox_home} | ||
git apply compilation.patch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If git apply
fails, will the build script fail or continue the build even though the patch is not applied? Could you confirm it? Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it fails, I suppose whether to continue or to stop, the build process will fail anyway. How do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not actually, as it may build the original code?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can do a check after executing git apply
. And leave some message to help developers easily figure out why build failed.
Reference: https://askubuntu.com/questions/29370/how-to-check-if-a-command-succeeded
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated. Thanks.
e02288a
to
c6b06fd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit:
Rename compilation.patch
to some name like modify_velox_build.patch
, which can be more read-friendly to developers.
cd ${velox_home} | ||
git apply compilation.patch | ||
if [ $? -ne 0 ]; then | ||
echo "Failed to apply compilation fixes to Velox: $?." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add exit 1
to directly make the build exit. Suppose it is not acceptable to continue the build without the patch applied.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated.
da67950
to
622277a
Compare
current_dir=$1 | ||
velox_home=$2 | ||
sudo cp ${current_dir}/modify_velox.patch ${velox_home}/ | ||
sudo cp ${current_dir}/modify_arrow.patch ${velox_home}/third_party/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rui-mo Do we need to git apply modify_arrow.patch like modify_velox.patch in line 74?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is applied to Arrow during compilation: https://github.com/oap-project/gluten/pull/3520/files#diff-b41402fae332ead78c4646843c9bcf66a2813203cdc82521c9c9f130b48146dbR100.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
===== Performance report for TPCH SF2000 with Velox backend, for reference only ====
|
What changes were proposed in this pull request?
Removes build script changes to Velox by applying patch from Gluten to Velox.
oap-project/velox#425
How was this patch tested?
under test