Skip to content
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

Remove restrictions in struct sort preventing calls to libcudf bounds #2092

Merged
merged 2 commits into from
Apr 21, 2021
Merged

Remove restrictions in struct sort preventing calls to libcudf bounds #2092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aac19d
Remove restrictions in struct sort for cudf bounds
gerashegalov Apr 7, 2021
0995da3
drop old comment
gerashegalov Apr 9, 2021
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
5 changes: 2 additions & 3 deletions integration_tests/src/main/python/sort_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ def test_single_orderby(data_gen, order):

@pytest.mark.parametrize('shuffle_parts', [
pytest.param(1),
pytest.param(200, marks=pytest.mark.xfail(reason="https://github.com/NVIDIA/spark-rapids/issues/1607"))
pytest.param(200)
])
@pytest.mark.parametrize('stable_sort', [
pytest.param(True),
pytest.param(False, marks=pytest.mark.xfail(reason="https://github.com/NVIDIA/spark-rapids/issues/1607"))
pytest.param(False)
])
@pytest.mark.parametrize('data_gen', [
pytest.param(all_basic_struct_gen),
Expand All @@ -64,7 +64,6 @@ def test_single_orderby(data_gen, order):
def test_single_nested_orderby_plain(data_gen, order, shuffle_parts, stable_sort):
assert_gpu_and_cpu_are_equal_collect(
lambda spark : unary_op_df(spark, data_gen).orderBy(order),
# TODO no interference with range partition once implemented
conf = {
**allow_negative_scale_of_decimal_conf,
**{
Expand Down
17 changes: 1 addition & 16 deletions sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuOverrides.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2531,14 +2531,6 @@ object GpuOverrides {
override val childExprs: Seq[BaseExprMeta[_]] =
rp.ordering.map(GpuOverrides.wrapExpr(_, conf, Some(this)))

override def tagPartForGpu() {
val numPartitions = rp.numPartitions
if (numPartitions > 1 && rp.ordering.exists(so => isStructType(so.dataType))) {
willNotWorkOnGpu("only single partition sort is supported for nested types, " +
s"actual partitions: $numPartitions")
}
}

override def convertToGpu(): GpuPartitioning = {
if (rp.numPartitions > 1) {
val gpuOrdering = childExprs.map(_.convertToGpu()).asInstanceOf[Seq[SortOrder]]
Expand Down Expand Up @@ -2793,14 +2785,7 @@ object GpuOverrides {
// The types below are allowed as inputs and outputs.
ExecChecks(pluginSupportedOrderableSig + (TypeSig.ARRAY + TypeSig.STRUCT).nested(),
TypeSig.all),
(sort, conf, p, r) => new GpuSortMeta(sort, conf, p, r) {
override def tagPlanForGpu() {
if (!conf.stableSort && sort.sortOrder.exists(so => isStructType(so.dataType))) {
willNotWorkOnGpu("it's disabled for nested types " +
s"unless ${RapidsConf.STABLE_SORT.key} is true")
}
}
}),
(sort, conf, p, r) => new GpuSortMeta(sort, conf, p, r)),
exec[ExpandExec](
"The backend for the expand operator",
ExecChecks(TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL, TypeSig.all),
Expand Down
3 changes: 1 addition & 2 deletions sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuTransitionOverrides.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,7 @@ class GpuTransitionOverrides extends Rule[SparkPlan] {
case _: GpuColumnarToRowExecParent => () // Ignored
case _: ExecutedCommandExec => () // Ignored
case _: RDDScanExec => () // Ignored
case shuffleExchange: ShuffleExchangeExec if conf.cpuRangePartitioningPermitted
|| !shuffleExchange.outputPartitioning.isInstanceOf[RangePartitioning] => {
case _: ShuffleExchangeExec if conf.cpuRangePartitioningPermitted => {
// Ignored for now, we don't force it to the GPU if
// children are not on the gpu
}
Expand Down