Skip to content

[GLUTEN-8611][VL] Set VELOX_GFLAGS_TYPE by checking GLUTEN_VCPKG_ENABLED in build_velox.sh#8612

Merged
marin-ma merged 2 commits intoapache:mainfrom
marin-ma:gflags-static-vcpkg
Jan 27, 2025
Merged

[GLUTEN-8611][VL] Set VELOX_GFLAGS_TYPE by checking GLUTEN_VCPKG_ENABLED in build_velox.sh#8612
marin-ma merged 2 commits intoapache:mainfrom
marin-ma:gflags-static-vcpkg

Conversation

@marin-ma
Copy link
Copy Markdown
Contributor

@github-actions
Copy link
Copy Markdown

#8611

@marin-ma
Copy link
Copy Markdown
Contributor Author

@philo-he Could you help to review? Thanks!

@FelixYBW
Copy link
Copy Markdown
Contributor

FelixYBW commented Jan 24, 2025

@zhouyuan Can you confirm?

@marin-ma is helping to upstream the OAP/Velox commits.

Copy link
Copy Markdown
Member

@philo-he philo-he left a comment

Choose a reason for hiding this comment

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

Just one comment. Please confirm it.

echo "ENABLE_BENCHMARK is ON. Disabling Tests, GCS and ABFS connectors if enabled."
COMPILE_OPTION="$COMPILE_OPTION -DVELOX_ENABLE_BENCHMARKS=ON"
fi
if [ $ENABLE_VCPKG == "ON" ]; then
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Seems we can just rely on this check to see whether the below env variable is set:
if [ -n "${GLUTEN_VCPKG_ENABLED:-}" ];

@zhouyuan
Copy link
Copy Markdown
Member

Initially this is required as we are using static packaging with VCPKG, so it makes sense by moving this to vcpkg related compilation
I made a quick patch to verify:
#8620

@marin-ma marin-ma changed the title [GLUTEN-8611][VL] Pass ENABLE_VCPKG to build_velox.sh and set VELOX_GFLAGS_TYPE [GLUTEN-8611][VL] Use GLUTEN_VCPKG_ENABLED to build_velox.sh and set VELOX_GFLAGS_TYPE Jan 27, 2025
@marin-ma marin-ma changed the title [GLUTEN-8611][VL] Use GLUTEN_VCPKG_ENABLED to build_velox.sh and set VELOX_GFLAGS_TYPE [GLUTEN-8611][VL] Set VELOX_GFLAGS_TYPE by checking GLUTEN_VCPKG_ENABLED in build_velox.sh Jan 27, 2025
@marin-ma
Copy link
Copy Markdown
Contributor Author

@zhouyuan #8620 CI passed. Will merge this one and we can remove this change in next rebase.

@marin-ma marin-ma merged commit 7a92814 into apache:main Jan 27, 2025
baibaichen pushed a commit to baibaichen/gluten that referenced this pull request Feb 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants