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

[spark] Change implicit conversions to explicit #2595

Merged
merged 1 commit into from
May 12, 2023
Merged

[spark] Change implicit conversions to explicit #2595

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: 2 additions & 3 deletions extensions/spark/src/main/scala/ai/djl/spark/task/audio/SpeechRecognizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import org.apache.spark.sql.{DataFrame, Dataset, Row}
import org.apache.spark.sql.types.{BinaryType, StringType, StructField, StructType}

import java.io.ByteArrayInputStream
import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable`
import scala.jdk.CollectionConverters.seqAsJavaListConverter
import scala.jdk.CollectionConverters.{collectionAsScalaIterableConverter, seqAsJavaListConverter}

/**
* SpeechRecognizer performs speech recognition on audio.
Expand Down Expand Up @@ -120,7 +119,7 @@ class SpeechRecognizer(override val uid: String) extends BaseAudioPredictor[Stri
}.asJava

// Batch predict
val output = predictor.batchPredict(inputs)
val output = predictor.batchPredict(inputs).asScala
batch.zip(output).map { case (row, out) =>
Row.fromSeq(row.toSeq :+ out)
}
Expand Down
5 changes: 2 additions & 3 deletions extensions/spark/src/main/scala/ai/djl/spark/task/binary/BinaryPredictor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import org.apache.spark.ml.util.Identifiable
import org.apache.spark.sql.types.{BinaryType, StructField, StructType}
import org.apache.spark.sql.{DataFrame, Dataset, Row}

import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable`
import scala.jdk.CollectionConverters.seqAsJavaListConverter
import scala.jdk.CollectionConverters.{collectionAsScalaIterableConverter, seqAsJavaListConverter}

/**
* BinaryPredictor performs prediction on binary input.
Expand Down Expand Up @@ -74,7 +73,7 @@ class BinaryPredictor(override val uid: String) extends BasePredictor[Array[Byte
val predictor = model.newPredictor()
iter.grouped($(batchSize)).flatMap { batch =>
val inputs = batch.map(_.getAs[Array[Byte]](inputColIndex)).asJava
val output = predictor.batchPredict(inputs)
val output = predictor.batchPredict(inputs).asScala
batch.zip(output).map { case (row, out) =>
Row.fromSeq(row.toSeq :+ out)
}
Expand Down
6 changes: 3 additions & 3 deletions extensions/spark/src/main/scala/ai/djl/spark/task/text/TextClassifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import ai.djl.modality.Classifications
import org.apache.spark.ml.param.Param
import org.apache.spark.ml.param.shared.{HasInputCol, HasOutputCol}
import org.apache.spark.ml.util.Identifiable
import org.apache.spark.sql.types.{ArrayType, DoubleType, MapType, StringType, StructField, StructType}
import org.apache.spark.sql.types.{ArrayType, DoubleType, StringType, StructField, StructType}
import org.apache.spark.sql.{DataFrame, Dataset, Row}

import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable`
import scala.jdk.CollectionConverters.collectionAsScalaIterableConverter

/**
* TextClassifier performs text classification on text.
Expand Down Expand Up @@ -88,7 +88,7 @@ class TextClassifier(override val uid: String) extends BaseTextPredictor[Array[S
val output = predictor.predict(inputs)
batch.zip(output).map { case (row, out) =>
Row.fromSeq(row.toSeq :+ Row(out.getClassNames.toArray(), out.getProbabilities.toArray(),
out.topK[Classifications.Classification]().map(_.toString)))
out.topK[Classifications.Classification]().asScala.map(_.toString)))
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions extensions/spark/src/main/scala/ai/djl/spark/task/vision/ImageClassifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import org.apache.spark.ml.util.Identifiable
import org.apache.spark.sql.types.{ArrayType, DoubleType, StringType, StructField, StructType}
import org.apache.spark.sql.{DataFrame, Dataset, Row}

import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable`
import scala.jdk.CollectionConverters.seqAsJavaListConverter
import scala.jdk.CollectionConverters.{collectionAsScalaIterableConverter, seqAsJavaListConverter}

/**
* ImageClassifier performs image classification on images.
Expand Down Expand Up @@ -91,10 +90,10 @@ class ImageClassifier(override val uid: String) extends BaseImagePredictor[Class
val inputs = batch.map(row =>
ImageFactory.getInstance().fromPixels(bgrToRgb(ImageSchema.getData(row)),
ImageSchema.getWidth(row), ImageSchema.getHeight(row))).asJava
val output = predictor.batchPredict(inputs)
val output = predictor.batchPredict(inputs).asScala
batch.zip(output).map { case (row, out) =>
Row.fromSeq(row.toSeq :+ Row(out.getClassNames.toArray(), out.getProbabilities.toArray(),
out.topK[Classifications.Classification]().map(_.toString)))
out.topK[Classifications.Classification]().asScala.map(_.toString)))
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions extensions/spark/src/main/scala/ai/djl/spark/task/vision/ImageEmbedder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import org.apache.spark.ml.util.Identifiable
import org.apache.spark.sql.types.{ArrayType, ByteType, StructField, StructType}
import org.apache.spark.sql.{DataFrame, Dataset, Row}

import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable`
import scala.jdk.CollectionConverters.seqAsJavaListConverter
import scala.jdk.CollectionConverters.{collectionAsScalaIterableConverter, seqAsJavaListConverter}

/**
* ImageEmbedder performs image embedding on images.
Expand Down Expand Up @@ -60,7 +59,7 @@ class ImageEmbedder(override val uid: String) extends BaseImagePredictor[Array[B
val inputs = batch.map(row =>
ImageFactory.getInstance().fromPixels(bgrToRgb(ImageSchema.getData(row)),
ImageSchema.getWidth(row), ImageSchema.getHeight(row))).asJava
val output = predictor.batchPredict(inputs)
val output = predictor.batchPredict(inputs).asScala
batch.zip(output).map { case (row, out) =>
Row.fromSeq(row.toSeq :+ out)
}
Expand Down
7 changes: 3 additions & 4 deletions extensions/spark/src/main/scala/ai/djl/spark/task/vision/InstanceSegmenter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import org.apache.spark.ml.util.Identifiable
import org.apache.spark.sql.types.{ArrayType, DoubleType, StringType, StructField, StructType}
import org.apache.spark.sql.{DataFrame, Dataset, Row}

import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable`
import scala.jdk.CollectionConverters.seqAsJavaListConverter
import scala.jdk.CollectionConverters.{collectionAsScalaIterableConverter, seqAsJavaListConverter}

/**
* InstanceSegmenter performs instance segmentation on images.
Expand Down Expand Up @@ -72,10 +71,10 @@ class InstanceSegmenter(override val uid: String) extends BaseImagePredictor[Det
val inputs = batch.map(row =>
ImageFactory.getInstance().fromPixels(bgrToRgb(ImageSchema.getData(row)),
ImageSchema.getWidth(row), ImageSchema.getHeight(row))).asJava
val output = predictor.batchPredict(inputs)
val output = predictor.batchPredict(inputs).asScala
batch.zip(output).map { case (row, out) =>
Row.fromSeq(row.toSeq :+ Row(out.getClassNames.toArray(), out.getProbabilities.toArray(),
out.items[DetectedObject]().map(_.getBoundingBox.toString)))
out.items[DetectedObject]().asScala.map(_.getBoundingBox.toString)))
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions extensions/spark/src/main/scala/ai/djl/spark/task/vision/ObjectDetector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import org.apache.spark.ml.util.Identifiable
import org.apache.spark.sql.types.{ArrayType, DoubleType, StringType, StructField, StructType}
import org.apache.spark.sql.{DataFrame, Dataset, Row}

import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable`
import scala.jdk.CollectionConverters.seqAsJavaListConverter
import scala.jdk.CollectionConverters.{collectionAsScalaIterableConverter, seqAsJavaListConverter}

/**
* ObjectDetector performs object detection on images.
Expand Down Expand Up @@ -62,10 +61,10 @@ class ObjectDetector(override val uid: String) extends BaseImagePredictor[Detect
val inputs = batch.map(row =>
ImageFactory.getInstance().fromPixels(bgrToRgb(ImageSchema.getData(row)),
ImageSchema.getWidth(row), ImageSchema.getHeight(row))).asJava
val output = predictor.batchPredict(inputs)
val output = predictor.batchPredict(inputs).asScala
batch.zip(output).map { case (row, out) =>
Row.fromSeq(row.toSeq :+ Row(out.getClassNames.toArray(), out.getProbabilities.toArray(),
out.items[DetectedObject]().map(_.getBoundingBox.toString)))
out.items[DetectedObject]().asScala.map(_.getBoundingBox.toString)))
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions extensions/spark/src/main/scala/ai/djl/spark/task/vision/SemanticSegmenter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import org.apache.spark.ml.util.Identifiable
import org.apache.spark.sql.types.{ArrayType, IntegerType, StringType, StructField, StructType}
import org.apache.spark.sql.{DataFrame, Dataset, Row}

import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable`
import scala.jdk.CollectionConverters.seqAsJavaListConverter
import scala.jdk.CollectionConverters.{collectionAsScalaIterableConverter, seqAsJavaListConverter}

/**
* SemanticSegmenter performs semantic segmentation on images.
Expand Down Expand Up @@ -71,7 +70,7 @@ class SemanticSegmenter(override val uid: String) extends BaseImagePredictor[Cat
val inputs = batch.map(row =>
ImageFactory.getInstance().fromPixels(bgrToRgb(ImageSchema.getData(row)),
ImageSchema.getWidth(row), ImageSchema.getHeight(row))).asJava
val output = predictor.batchPredict(inputs)
val output = predictor.batchPredict(inputs).asScala
batch.zip(output).map { case (row, out) =>
Row.fromSeq(row.toSeq :+ Row(out.getClasses.toArray, out.getMask))
}
Expand Down