Skip to content

Add hooks needed for cudf-exchange version of velox. #2

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

Open
dan13bauer wants to merge 4 commits into
base: cudf_parquet_reader
Choose a base branch
from
Open

Add hooks needed for cudf-exchange version of velox. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eee3de7
Add hooks needed for cudf-exchange version of velox.
dan13bauer Aug 28, 2025
847d827
Fix shutdown of cudf-exchange server thread.
dan13bauer Sep 30, 2025
364299b
create communicator with coordinatorURL
SeanRooooney Oct 2, 2025
83337c0
Another fix of UCX communicator shutdown.
dan13bauer Oct 9, 2025
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
1 change: 1 addition & 0 deletions presto-native-execution/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ if(PRESTO_ENABLE_CUDF)
set(VELOX_ENABLE_PARSE ON)
set(VELOX_ENABLE_DUCKDB ON)
add_compile_definitions(PRESTO_ENABLE_CUDF)
add_compile_definitions(VELOX_ENABLE_CUDF)
enable_language(CUDA)
# Determine CUDA_ARCHITECTURES automatically.
cmake_policy(SET CMP0104 NEW)
Expand Down
35 changes: 31 additions & 4 deletions presto-native-execution/presto_cpp/main/PrestoServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@

#ifdef PRESTO_ENABLE_CUDF
#include "velox/experimental/cudf/exec/ToCudf.h"
#include "velox/velox/experimental/cudf-exchange/Communicator.h"
#endif

#ifdef PRESTO_ENABLE_REMOTE_FUNCTIONS
Expand Down Expand Up @@ -155,19 +156,45 @@ bool isSharedLibrary(const fs::path& path) {
return pathExt == kLinuxSharedLibExt || pathExt == kMacOSSharedLibExt;
}

void registerVeloxCudf() {
std::shared_ptr<std::thread> registerVeloxCudf() {
std::shared_ptr<std::thread> serverThread = nullptr;
#ifdef PRESTO_ENABLE_CUDF
facebook::velox::cudf_velox::CudfOptions::getInstance().setPrefix(
SystemConfig::instance()->prestoDefaultNamespacePrefix());
facebook::velox::cudf_velox::registerCudf();

auto coordURL = SystemConfig::instance()->discoveryUri();

if (! coordURL.hasValue()) {
PRESTO_STARTUP_LOG(ERROR) << "No coordinator Uri, can't create CudfExchange";
}
else {
std::string coordStr = coordURL.value();
PRESTO_STARTUP_LOG(INFO) << "In registerVeloxCudf " << coordStr;
auto server = facebook::velox::cudf_exchange::Communicator::initAndGet(
SystemConfig::instance()->cudfServerPort(), coordStr);
if (server) {
serverThread = std::make_shared<std::thread>(
&facebook::velox::cudf_exchange::Communicator::run, server.get());
}
}

PRESTO_STARTUP_LOG(INFO) << "cuDF is registered.";
#endif
return serverThread;
}

void unregisterVeloxCudf() {
void unregisterVeloxCudf(std::shared_ptr<std::thread> serverThread) {
#ifdef PRESTO_ENABLE_CUDF
facebook::velox::cudf_velox::unregisterCudf();
PRESTO_SHUTDOWN_LOG(INFO) << "cuDF is unregistered.";
if (serverThread) {
auto server = facebook::velox::cudf_exchange::Communicator::getInstance();
server->stop();
server.reset();
PRESTO_SHUTDOWN_LOG(INFO) << "Joining UCX Communicator thread.";
serverThread->join();
}
#endif
}

Expand Down Expand Up @@ -398,7 +425,7 @@ void PrestoServer::run() {
});
}
}
registerVeloxCudf();
auto communicatorThread = registerVeloxCudf();
registerFunctions();
registerRemoteFunctions();
registerVectorSerdes();
Expand Down Expand Up @@ -649,7 +676,7 @@ void PrestoServer::run() {
unregisterFileReadersAndWriters();
unregisterFileSystems();
unregisterConnectors();
unregisterVeloxCudf();
unregisterVeloxCudf(communicatorThread);

PRESTO_SHUTDOWN_LOG(INFO)
<< "Joining Driver CPU Executor '" << driverCpuExecutor_->getName()
Expand Down
5 changes: 5 additions & 0 deletions presto-native-execution/presto_cpp/main/common/Configs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ SystemConfig::SystemConfig() {
NONE_PROP(kHttpsCertPath),
NONE_PROP(kHttpsKeyPath),
NONE_PROP(kHttpsClientCertAndKeyPath),
NONE_PROP(kCudfServerPort),
NUM_PROP(kExchangeHttpClientNumIoThreadsHwMultiplier, 1.0),
NUM_PROP(kExchangeHttpClientNumCpuThreadsHwMultiplier, 1.0),
NUM_PROP(kConnectorNumCpuThreadsHwMultiplier, 0.0),
Expand Down Expand Up @@ -274,6 +275,10 @@ int SystemConfig::httpServerHttpPort() const {
return requiredProperty<int>(kHttpServerHttpPort);
}

int SystemConfig::cudfServerPort() const {
return requiredProperty<int>(kCudfServerPort);
}

bool SystemConfig::httpServerReusePort() const {
return optionalProperty<bool>(kHttpServerReusePort).value();
}
Expand Down
4 changes: 4 additions & 0 deletions presto-native-execution/presto_cpp/main/common/Configs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,8 @@ class SystemConfig : public ConfigBase {
static constexpr std::string_view kHeartbeatFrequencyMs{
"heartbeat-frequency-ms"};

static constexpr std::string_view kCudfServerPort{"exchange.cudf.server.port"};

static constexpr std::string_view kExchangeMaxErrorDuration{
"exchange.max-error-duration"};

Expand Down Expand Up @@ -771,6 +773,8 @@ class SystemConfig : public ConfigBase {

int httpServerHttpPort() const;

int cudfServerPort() const;

bool httpServerReusePort() const;

bool httpServerBindToNodeInternalAddressOnlyEnabled() const;
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/connectors/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ endif()

if(PRESTO_ENABLE_CUDF)
target_link_libraries(presto_connectors velox_cudf_parquet_connector
cudf::cudf)
ucxx::ucxx cudf::cudf)
endif()

target_link_libraries(presto_connectors presto_velox_expr_conversion
Expand Down
1 change: 0 additions & 1 deletion presto-native-execution/presto_cpp/main/connectors/PrestoToVeloxConnector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "velox/connectors/hive/iceberg/IcebergSplit.h"
#include "velox/connectors/tpch/TpchConnector.h"
#include "velox/connectors/tpch/TpchConnectorSplit.h"
#include "velox/experimental/cudf/exec/ToCudf.h"

#ifdef PRESTO_ENABLE_CUDF
#include "velox/experimental/cudf/connectors/parquet/ParquetConnector.h"
Expand Down
37 changes: 25 additions & 12 deletions presto-native-execution/presto_cpp/main/types/PrestoToVeloxQueryPlan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,9 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
const std::shared_ptr<protocol::TableWriteInfo>& tableWriteInfo,
const protocol::TaskId& taskId) {
core::PlanFragment planFragment;
planFragment.prestoId = std::stoi(fragment.id);

std::cout << "!!! PLAN ID: " << fragment.id << std::endl;
// Convert the fragment info first.
const auto& descriptor = fragment.stageExecutionDescriptor;
planFragment.executionStrategy =
Expand All @@ -1956,7 +1958,7 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(

if (auto output = std::dynamic_pointer_cast<const protocol::OutputNode>(
fragment.root)) {
planFragment.planNode = toVeloxQueryPlan(output, tableWriteInfo, taskId);
planFragment.planNode = toVeloxQueryPlan(output, tableWriteInfo, taskId, (planFragment.prestoId == 0));
return planFragment;
}

Expand Down Expand Up @@ -2007,7 +2009,8 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
partitionedOutputNodeId,
outputType,
toVeloxSerdeKind((partitioningScheme.encoding)),
sourceNode);
sourceNode,
(planFragment.prestoId == 0));
return planFragment;
case protocol::SystemPartitioning::FIXED: {
switch (systemPartitioningHandle->function) {
Expand All @@ -2021,7 +2024,8 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
partitionedOutputNodeId,
outputType,
toVeloxSerdeKind((partitioningScheme.encoding)),
sourceNode);
sourceNode,
(planFragment.prestoId == 0));
return planFragment;
}
planFragment.planNode =
Expand All @@ -2034,7 +2038,8 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
std::make_shared<RoundRobinPartitionFunctionSpec>(),
outputType,
toVeloxSerdeKind((partitioningScheme.encoding)),
sourceNode);
sourceNode,
(planFragment.prestoId == 0));
return planFragment;
}
case protocol::SystemPartitionFunction::HASH: {
Expand All @@ -2047,7 +2052,8 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
partitionedOutputNodeId,
outputType,
toVeloxSerdeKind((partitioningScheme.encoding)),
sourceNode);
sourceNode,
(planFragment.prestoId == 0));
return planFragment;
}
planFragment.planNode =
Expand All @@ -2061,7 +2067,8 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
inputType, keyChannels, constValues),
outputType,
toVeloxSerdeKind((partitioningScheme.encoding)),
sourceNode);
sourceNode,
(planFragment.prestoId == 0));
return planFragment;
}
case protocol::SystemPartitionFunction::BROADCAST: {
Expand All @@ -2070,7 +2077,8 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
1,
outputType,
toVeloxSerdeKind((partitioningScheme.encoding)),
sourceNode);
sourceNode,
(planFragment.prestoId == 0));
return planFragment;
}
default:
Expand All @@ -2089,7 +2097,8 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
partitionedOutputNodeId,
std::move(outputType),
toVeloxSerdeKind((partitioningScheme.encoding)),
std::move(sourceNode));
std::move(sourceNode),
(planFragment.prestoId == 0));
return planFragment;
}
default:
Expand All @@ -2108,7 +2117,8 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
partitionedOutputNodeId,
outputType,
toVeloxSerdeKind((partitioningScheme.encoding)),
sourceNode);
sourceNode,
(planFragment.prestoId == 0));
return planFragment;
}

Expand All @@ -2124,19 +2134,22 @@ core::PlanFragment VeloxQueryPlanConverterBase::toVeloxQueryPlan(
std::shared_ptr(std::move(spec)),
toRowType(partitioningScheme.outputLayout, typeParser_),
toVeloxSerdeKind((partitioningScheme.encoding)),
sourceNode);
sourceNode,
(planFragment.prestoId == 0));
return planFragment;
}

core::PlanNodePtr VeloxQueryPlanConverterBase::toVeloxQueryPlan(
const std::shared_ptr<const protocol::OutputNode>& node,
const std::shared_ptr<protocol::TableWriteInfo>& tableWriteInfo,
const protocol::TaskId& taskId) {
const protocol::TaskId& taskId,
const bool isRootFragment) {
return core::PartitionedOutputNode::single(
node->id,
toRowType(node->outputVariables, typeParser_),
VectorSerde::Kind::kPresto,
toVeloxQueryPlan(node->source, tableWriteInfo, taskId));
toVeloxQueryPlan(node->source, tableWriteInfo, taskId),
isRootFragment);
}

core::PlanNodePtr VeloxInteractiveQueryPlanConverter::toVeloxQueryPlan(
Expand Down
3 changes: 2 additions & 1 deletion presto-native-execution/presto_cpp/main/types/PrestoToVeloxQueryPlan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ class VeloxQueryPlanConverterBase {
velox::core::PlanNodePtr toVeloxQueryPlan(
const std::shared_ptr<const protocol::OutputNode>& node,
const std::shared_ptr<protocol::TableWriteInfo>& tableWriteInfo,
const protocol::TaskId& taskId);
const protocol::TaskId& taskId,
const bool isRootFragment = false);

velox::core::PlanNodePtr toVeloxQueryPlan(
const std::shared_ptr<const protocol::ExchangeNode>& node,
Expand Down