Skip to content

Commit 903e780

Browse files
committed
Fix compilation error and formatting
1 parent 1cba7e3 commit 903e780

File tree

6 files changed

+7
-14
lines changed

6 files changed

+7
-14
lines changed

src/main/scala/com/johnsnowlabs/ml/ai/Bert.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import com.johnsnowlabs.ml.onnx.{OnnxSession, OnnxWrapper}
2222
import com.johnsnowlabs.ml.openvino.OpenvinoWrapper
2323
import com.johnsnowlabs.ml.tensorflow.sign.{ModelSignatureConstants, ModelSignatureManager}
2424
import com.johnsnowlabs.ml.tensorflow.{TensorResources, TensorflowWrapper}
25-
import com.johnsnowlabs.ml.util.{ModelArch, ONNX, Openvino, TensorFlow}
25+
import com.johnsnowlabs.ml.util._
2626
import com.johnsnowlabs.nlp.annotators.common._
2727
import com.johnsnowlabs.nlp.{Annotation, AnnotatorType}
28-
import org.slf4j.{Logger, LoggerFactory}
2928
import org.intel.openvino.Tensor
29+
import org.slf4j.{Logger, LoggerFactory}
3030

3131
import scala.collection.JavaConverters._
3232

@@ -233,9 +233,7 @@ private[johnsnowlabs] class Bert(
233233
.map(sentence => sentence.map(x => if (x == 0) 0L else 1L))
234234
.toArray
235235
val maskTensors =
236-
OnnxTensor.createTensor(
237-
env,
238-
attentionMask)
236+
OnnxTensor.createTensor(env, attentionMask)
239237

240238
val segmentTensors =
241239
OnnxTensor.createTensor(env, batch.map(x => Array.fill(maxSentenceLength)(0L)).toArray)

src/main/scala/com/johnsnowlabs/ml/ai/XlmRoberta.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.johnsnowlabs.ml.openvino.OpenvinoWrapper
2323
import com.johnsnowlabs.ml.tensorflow.sentencepiece.{SentencePieceWrapper, SentencepieceEncoder}
2424
import com.johnsnowlabs.ml.tensorflow.sign.{ModelSignatureConstants, ModelSignatureManager}
2525
import com.johnsnowlabs.ml.tensorflow.{TensorResources, TensorflowWrapper}
26-
import com.johnsnowlabs.ml.util.{ModelArch, ONNX, Openvino, TensorFlow}
26+
import com.johnsnowlabs.ml.util._
2727
import com.johnsnowlabs.nlp.annotators.common._
2828
import com.johnsnowlabs.nlp.{Annotation, AnnotatorType}
2929
import org.slf4j.{Logger, LoggerFactory}
@@ -243,10 +243,7 @@ private[johnsnowlabs] class XlmRoberta(
243243
val tokenTensors =
244244
OnnxTensor.createTensor(env, batch.map(x => x.map(x => x.toLong)).toArray)
245245
val maskTensors =
246-
OnnxTensor.createTensor(
247-
env,
248-
attentionMask
249-
)
246+
OnnxTensor.createTensor(env, attentionMask)
250247

251248
val inputs =
252249
Map("input_ids" -> tokenTensors, "attention_mask" -> maskTensors).asJava

src/main/scala/com/johnsnowlabs/nlp/annotators/classifier/dl/MPNetForTokenClassification.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,8 @@ trait ReadMPNetForTokenDLModel extends ReadOnnxModel {
373373
case TensorFlow.name =>
374374
throw new NotImplementedError("Tensorflow models are not supported.")
375375
case ONNX.name =>
376-
val onnxWrapper = OnnxWrapper.read(spark, localModelPath, zipped = false, useBundle = true)
376+
val onnxWrapper =
377+
OnnxWrapper.read(spark, localModelPath, zipped = false, useBundle = true)
377378
annotatorModel
378379
.setModelIfNotSet(spark, Some(onnxWrapper))
379380
case _ =>

src/test/scala/com/johnsnowlabs/nlp/annotators/classifier/dl/MPNetForTokenClassificationTestSpec.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
1817
package com.johnsnowlabs.nlp.annotators.classifier.dl
1918

2019
import com.johnsnowlabs.nlp.annotators.Tokenizer

src/test/scala/com/johnsnowlabs/nlp/annotators/classifier/dl/XlmRoBertaForQuestionAnsweringTestSpec.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ class XlmRoBertaForQuestionAnsweringTestSpec extends AnyFlatSpec {
116116
val loadedPipelineModel = PipelineModel.load("./tmp_xlmrobertaforquestion_pipeline")
117117
loadedPipelineModel.transform(ddd).select("label.result").show(false)
118118

119-
120119
}
121120

122121
"XlmRoBertaForQuestionAnswering" should "benchmark test" taggedAs SlowTest in {

src/test/scala/com/johnsnowlabs/nlp/annotators/classifier/dl/XlmRoBertaForTokenClassificationTestSpec.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ class XlmRoBertaForTokenClassificationTestSpec extends AnyFlatSpec {
7575

7676
}
7777

78-
7978
"XlmRoBertaForTokenClassification" should "be saved and loaded correctly" taggedAs SlowTest in {
8079

8180
import ResourceHelper.spark.implicits._

0 commit comments

Comments
 (0)