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

Dedupe proxy rapids shuffle manager byte code #3602

Merged
merged 9 commits into from
Sep 23, 2021
Merged

Dedupe proxy rapids shuffle manager byte code #3602

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75001bd
wip
gerashegalov Sep 21, 2021
2de0317
wip
gerashegalov Sep 22, 2021
d815523
Merge remote-tracking branch 'origin/branch-21.10' into dedupeProxyRa…
gerashegalov Sep 22, 2021
4b9e130
Stop inheriting ShuffleManaager in base class
gerashegalov Sep 22, 2021
ee7c217
Merge remote-tracking branch 'origin/branch-21.10' into dedupeProxyRa…
gerashegalov Sep 22, 2021
d060091
Shim dev doc
gerashegalov Sep 23, 2021
68891bf
whitespace
gerashegalov Sep 23, 2021
0568578
Restore spark301/RapidsShuffleInternalManager
gerashegalov Sep 23, 2021
f609275
reviews
gerashegalov Sep 23, 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
79 changes: 0 additions & 79 deletions .../src/main/scala/com/nvidia/spark/rapids/shims/spark301/RapidsShuffleInternalManager.scala
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...rc/main/scala/com/nvidia/spark/rapids/shims/spark301db/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
}

class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

override def getReaderForRange[K, C](
handle: ShuffleHandle,
Expand Down
6 changes: 3 additions & 3 deletions .../src/main/scala/com/nvidia/spark/rapids/shims/spark302/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
}

class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

override def getReader[K, C](
def getReader[K, C](
handle: ShuffleHandle,
startPartition: Int,
endPartition: Int,
Expand All @@ -64,7 +64,7 @@ class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
self.getReader(handle, startPartition, endPartition, context, metrics)
}

override def getReaderForRange[K, C](
def getReaderForRange[K, C](
handle: ShuffleHandle,
startMapIndex: Int,
endMapIndex: Int,
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/scala/com/nvidia/spark/rapids/shims/spark303/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)


class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

override def getReader[K, C](
handle: ShuffleHandle,
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/scala/com/nvidia/spark/rapids/shims/spark304/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)


class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

override def getReader[K, C](
handle: ShuffleHandle,
Expand Down
2 changes: 1 addition & 1 deletion .../main/scala/org/apache/spark/sql/rapids/shims/spark311/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
}

class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

def getReader[K, C](
handle: ShuffleHandle,
Expand Down
2 changes: 1 addition & 1 deletion ...in/scala/org/apache/spark/sql/rapids/shims/spark311cdh/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
}

class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

def getReader[K, C](
handle: ShuffleHandle,
Expand Down
2 changes: 1 addition & 1 deletion ...ain/scala/org/apache/spark/sql/rapids/shims/spark311db/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
}

class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

def getReader[K, C](
handle: ShuffleHandle,
Expand Down
2 changes: 1 addition & 1 deletion .../main/scala/org/apache/spark/sql/rapids/shims/spark312/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)


class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

def getReader[K, C](
handle: ShuffleHandle,
Expand Down
2 changes: 1 addition & 1 deletion .../main/scala/org/apache/spark/sql/rapids/shims/spark313/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)


class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

def getReader[K, C](
handle: ShuffleHandle,
Expand Down
2 changes: 1 addition & 1 deletion .../main/scala/org/apache/spark/sql/rapids/shims/spark320/RapidsShuffleInternalManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)


class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean)
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) {
extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager {

def getReader[K, C](
handle: ShuffleHandle,
Expand Down
16 changes: 8 additions & 8 deletions sql-plugin/src/main/scala/org/apache/spark/sql/rapids/RapidsShuffleInternalManagerBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,25 +427,25 @@ trait VisibleShuffleManager {
abstract class ProxyRapidsShuffleInternalManagerBase(
conf: SparkConf,
override val isDriver: Boolean
) extends ShuffleManager with VisibleShuffleManager with Proxy {
) extends VisibleShuffleManager with Proxy {

// touched in the plugin code after the shim initialization
// is complete
override lazy val self: ShuffleManager =
lazy val self: ShuffleManager =
ShimLoader.newInternalShuffleManager(conf, isDriver)
.asInstanceOf[ShuffleManager]

// This function touches the lazy val `self` so we actually instantiate
// the manager. This is called from both the driver and executor.
// In the driver, it's mostly to display information on how to enable/disable the manager,
// in the executor, the UCXShuffleTransport starts and allocates memory at this time.
override def initialize: Unit = self
def initialize: Unit = self

//
// Signatures unchanged since 3.0.1 follow
//

override def getWriter[K, V](
def getWriter[K, V](
handle: ShuffleHandle,
mapId: Long,
context: TaskContext,
Expand All @@ -454,16 +454,16 @@ abstract class ProxyRapidsShuffleInternalManagerBase(
self.getWriter(handle, mapId, context, metrics)
}

override def registerShuffle[K, V, C](
def registerShuffle[K, V, C](
shuffleId: Int,
dependency: ShuffleDependency[K, V, C]
): ShuffleHandle = {
self.registerShuffle(shuffleId, dependency)
}

override def unregisterShuffle(shuffleId: Int): Boolean = self.unregisterShuffle(shuffleId)
def unregisterShuffle(shuffleId: Int): Boolean = self.unregisterShuffle(shuffleId)

override def shuffleBlockResolver: ShuffleBlockResolver = self.shuffleBlockResolver
def shuffleBlockResolver: ShuffleBlockResolver = self.shuffleBlockResolver

override def stop(): Unit = self.stop()
def stop(): Unit = self.stop()
}