-
Notifications
You must be signed in to change notification settings - Fork 627
[GLUTEN-10933][VL] Support resize GPU batch and shuffle reader outputs cudf::table #11090
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
backends-velox/src/main/java/org/apache/gluten/utils/GpuBufferBatchResizerJniWrapper.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.gluten.utils; | ||
|
|
||
| import org.apache.gluten.runtime.Runtime; | ||
| import org.apache.gluten.runtime.RuntimeAware; | ||
| import org.apache.gluten.vectorized.ColumnarBatchInIterator; | ||
|
|
||
| public class GpuBufferBatchResizerJniWrapper implements RuntimeAware { | ||
| private final Runtime runtime; | ||
|
|
||
| private GpuBufferBatchResizerJniWrapper(Runtime runtime) { | ||
| this.runtime = runtime; | ||
| } | ||
|
|
||
| public static GpuBufferBatchResizerJniWrapper create(Runtime runtime) { | ||
| return new GpuBufferBatchResizerJniWrapper(runtime); | ||
| } | ||
|
|
||
| @Override | ||
| public long rtHandle() { | ||
| return runtime.getHandle(); | ||
| } | ||
|
|
||
| public native long create(int minOutputBatchSize, ColumnarBatchInIterator itr); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
...s-velox/src/main/scala/org/apache/gluten/execution/GpuResizeBufferColumnarBatchExec.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.gluten.execution | ||
|
|
||
| import org.apache.gluten.backendsapi.BackendsApiManager | ||
| import org.apache.gluten.backendsapi.velox.VeloxBatchType | ||
| import org.apache.gluten.extension.columnar.transition.Convention | ||
| import org.apache.gluten.iterator.ClosableIterator | ||
| import org.apache.gluten.runtime.Runtimes | ||
| import org.apache.gluten.utils.GpuBufferBatchResizerJniWrapper | ||
| import org.apache.gluten.vectorized.{ColumnarBatchInIterator, ColumnarBatchOutIterator} | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions.SortOrder | ||
| import org.apache.spark.sql.catalyst.plans.physical.Partitioning | ||
| import org.apache.spark.sql.execution.SparkPlan | ||
| import org.apache.spark.sql.vectorized.ColumnarBatch | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| /** | ||
| * An operator to resize input BufferBatches generated by shuffle reader, and convert to cudf table. | ||
| */ | ||
| case class GpuResizeBufferColumnarBatchExec(override val child: SparkPlan, minOutputBatchSize: Int) | ||
| extends ColumnarToColumnarExec(child) { | ||
|
|
||
| override protected def mapIterator(in: Iterator[ColumnarBatch]): Iterator[ColumnarBatch] = { | ||
| val runtime = | ||
| Runtimes.contextInstance(BackendsApiManager.getBackendName, "GpuBufferColumnarBatchResizer") | ||
| val outHandle = GpuBufferBatchResizerJniWrapper | ||
| .create(runtime) | ||
| .create( | ||
| minOutputBatchSize, | ||
| new ColumnarBatchInIterator(BackendsApiManager.getBackendName, in.asJava)) | ||
| new ColumnarBatchOutIterator(runtime, outHandle).asScala | ||
| } | ||
|
|
||
| override protected def closeIterator(out: Iterator[ColumnarBatch]): Unit = { | ||
| out.asJava match { | ||
| case c: ClosableIterator[ColumnarBatch] => c.close() | ||
| case _ => | ||
| } | ||
| } | ||
|
|
||
| override protected def needRecyclePayload: Boolean = true | ||
|
|
||
| override def outputPartitioning: Partitioning = child.outputPartitioning | ||
| override def outputOrdering: Seq[SortOrder] = child.outputOrdering | ||
| override protected def withNewChildInternal(newChild: SparkPlan): SparkPlan = | ||
| copy(child = newChild) | ||
|
|
||
| override def batchType(): Convention.BatchType = VeloxBatchType | ||
|
|
||
| override def rowType0(): Convention.RowType = Convention.RowType.None | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...rc/main/scala/org/apache/gluten/extension/GpuBufferBatchResizeForShuffleInputOutput.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.gluten.extension | ||
|
|
||
| import org.apache.gluten.config.{HashShuffleWriterType, VeloxConfig} | ||
| import org.apache.gluten.execution.{GpuResizeBufferColumnarBatchExec, VeloxResizeBatchesExec} | ||
|
|
||
| import org.apache.spark.sql.catalyst.rules.Rule | ||
| import org.apache.spark.sql.execution.{ColumnarShuffleExchangeExec, ColumnarShuffleExchangeExecBase, SparkPlan} | ||
| import org.apache.spark.sql.execution.adaptive.{AQEShuffleReadExec, ShuffleQueryStageExec} | ||
| import org.apache.spark.sql.execution.exchange.ReusedExchangeExec | ||
|
|
||
| /** | ||
| * Try to append [[GpuBufferBatchResizeForShuffleInputOutput]] for shuffle input and output to make | ||
| * the batch sizes in good shape. | ||
| */ | ||
| case class GpuBufferBatchResizeForShuffleInputOutput() extends Rule[SparkPlan] { | ||
| override def apply(plan: SparkPlan): SparkPlan = { | ||
| if (!VeloxConfig.get.enableColumnarCudf) { | ||
| return plan | ||
| } | ||
| val range = VeloxConfig.get.veloxResizeBatchesShuffleInputOutputRange | ||
| val batchSize = VeloxConfig.get.cudfBatchSize | ||
| plan.transformUp { | ||
| case shuffle: ColumnarShuffleExchangeExec | ||
| if shuffle.shuffleWriterType == HashShuffleWriterType && | ||
| VeloxConfig.get.veloxResizeBatchesShuffleInput => | ||
| val appendBatches = | ||
| VeloxResizeBatchesExec(shuffle.child, range.min, range.max) | ||
| shuffle.withNewChildren(Seq(appendBatches)) | ||
| case a @ AQEShuffleReadExec( | ||
| ShuffleQueryStageExec(_, _: ColumnarShuffleExchangeExecBase, _), | ||
| _) => | ||
| GpuResizeBufferColumnarBatchExec(a, batchSize) | ||
| case a @ AQEShuffleReadExec( | ||
| ShuffleQueryStageExec(_, ReusedExchangeExec(_, _: ColumnarShuffleExchangeExecBase), _), | ||
| _) => | ||
| GpuResizeBufferColumnarBatchExec(a, batchSize) | ||
| // Since it's transformed in a bottom to up order, so we may first encounter | ||
| // ShuffeQueryStageExec, which is transformed to VeloxResizeBatchesExec(ShuffeQueryStageExec), | ||
| // then we see AQEShuffleReadExec | ||
| case a @ AQEShuffleReadExec( | ||
| GpuResizeBufferColumnarBatchExec( | ||
| s @ ShuffleQueryStageExec(_, _: ColumnarShuffleExchangeExecBase, _), | ||
| _), | ||
| _) => | ||
| GpuResizeBufferColumnarBatchExec(a.copy(child = s), batchSize) | ||
| case a @ AQEShuffleReadExec( | ||
| GpuResizeBufferColumnarBatchExec( | ||
| s @ ShuffleQueryStageExec( | ||
| _, | ||
| ReusedExchangeExec(_, _: ColumnarShuffleExchangeExecBase), | ||
| _), | ||
| _), | ||
| _) => | ||
| GpuResizeBufferColumnarBatchExec(a.copy(child = s), batchSize) | ||
| case s @ ShuffleQueryStageExec(_, _: ColumnarShuffleExchangeExecBase, _) => | ||
| GpuResizeBufferColumnarBatchExec(s, batchSize) | ||
| case s @ ShuffleQueryStageExec( | ||
| _, | ||
| ReusedExchangeExec(_, _: ColumnarShuffleExchangeExecBase), | ||
| _) => | ||
| GpuResizeBufferColumnarBatchExec(s, batchSize) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: use
if(dep.shuffleWriterType == SortShuffleWriterType)in the condition branch aboveThere 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.
Do you mean change the L162? This looks like not related to this PR?