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

Jump to bottom

Fix compiler warnings #164

Merged
merged 1 commit into from
Jun 12, 2020
Merged

Fix compiler warnings #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
</plugins>
</pluginManagement>

Expand Down
17 changes: 0 additions & 17 deletions sql-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,6 @@
</resource>
</resources>
<plugins>
<plugin>
<!--Skip the tests-->
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -162,14 +153,6 @@
</launchers>
</configuration>
</plugin>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.scoverage</groupId>
<artifactId>scoverage-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.scalastyle</groupId>
<artifactId>scalastyle-maven-plugin</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion sql-plugin/src/main/scala/ai/rapids/spark/GpuDeviceManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ object GpuDeviceManager extends Logging {
s"${initialAllocation / 1024 / 1024.0} MB on gpuId $gpuId")

try {
Rmm.initialize(init, logConf, initialAllocation, gpuId)
Cuda.setDevice(gpuId)
Rmm.initialize(init, logConf, initialAllocation)
GpuShuffleEnv.initStorage(conf, info)
} catch {
case e: Exception => logError("Could not initialize RMM", e)
Expand Down
2 changes: 1 addition & 1 deletion sql-plugin/src/main/scala/ai/rapids/spark/GpuOrcScan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ class GpuOrcPartitionReader(
.withCompression(orcReader.getCompressionKind)
.withFileSystem(fs)
.withPath(filePath)
.withTypeCount(orcReader.getTypes.size)
.withTypeCount(org.apache.orc.OrcUtils.getOrcTypes(orcReader.getSchema).size)
.withZeroCopy(zeroCopy)
.withMaxDiskRangeChunkLimit(maxDiskRangeChunkLimit)
.build())
Expand Down
3 changes: 1 addition & 2 deletions sql-plugin/src/main/scala/ai/rapids/spark/Plugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,8 @@ class SQLPlugin extends SparkPlugin with Logging {

/**
* Old version of SQLPlugin kept for backwards compatibility
* @deprecated please use SQLPlugin instead
*/
@scala.deprecated
@scala.deprecated("Please use ai.rapids.spark.SQLPlugin instead", since="0.1")
class RapidsSparkPlugin extends SQLPlugin {
override def driverPlugin(): DriverPlugin = {
logWarning(s"The plugin class ${this.getClass.getName} is deprecated please use " +
Expand Down
1 change: 1 addition & 0 deletions sql-plugin/src/main/scala/org/apache/spark/sql/rapids/bitwise.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ object ShiftHelper extends Arm {
private def maskForDistance(t: DType): Int = t match {
case DType.INT32 => 0x1F // 0b11111
case DType.INT64 => 0x3F //0b111111
case t => throw new IllegalArgumentException(s"$t is not a supported type for java bit shifts")
}

def fixupDistanceNoClose(t: DType, distance: ColumnVector): ColumnVector = {
Expand Down