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

Add a new llama_cpp engine #14436

Merged
merged 1 commit into from
Oct 18, 2024
+9 −1
Merged

Add a new llama_cpp engine #14436

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 src/main/scala/com/johnsnowlabs/ml/util/ModelEngine.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ final case object ONNX extends ModelEngine {
val decoderModel = "decoder_model.onnx"
val decoderWithPastModel = "decoder_with_past_model.onnx"
}

final case object Openvino extends ModelEngine {
val name = "openvino"
val ovModel = "openvino_model"
Expand All @@ -41,6 +42,10 @@ final case object Openvino extends ModelEngine {
val decoderModelWithPast = "openvino_decoder_with_past_model"
}

final case object LlamaCPP extends ModelEngine {
val name = "llama_cpp"
}

final case object Unknown extends ModelEngine {
val name = "unk"
}
5 changes: 4 additions & 1 deletion src/main/scala/com/johnsnowlabs/nlp/annotators/seq2seq/AutoGGUFModel.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
package com.johnsnowlabs.nlp.annotators.seq2seq

import com.johnsnowlabs.ml.gguf.GGUFWrapper
import com.johnsnowlabs.ml.util.LlamaCPP
import com.johnsnowlabs.nlp._
import com.johnsnowlabs.nlp.util.io.ResourceHelper
import com.johnsnowlabs.nlp.llama.LlamaModel
import org.apache.spark.broadcast.Broadcast
import org.apache.spark.ml.util.Identifiable
import org.apache.spark.sql.SparkSession
Expand Down Expand Up @@ -153,6 +153,8 @@ class AutoGGUFModel(override val uid: String)
this
}

private[johnsnowlabs] def setEngine(engineName: String): this.type = set(engine, engineName)

override def onWrite(path: String, spark: SparkSession): Unit = {
super.onWrite(path, spark)
getModelIfNotSet.saveToFile(path)
Expand Down Expand Up @@ -261,6 +263,7 @@ trait ReadAutoGGUFModel {
val annotatorModel = new AutoGGUFModel()
annotatorModel
.setModelIfNotSet(spark, GGUFWrapper.read(spark, localPath))
.setEngine(LlamaCPP.name)

val metadata = LlamaModel.getMetadataFromFile(localPath)
if (metadata.nonEmpty) annotatorModel.setMetadata(metadata)
Expand Down
Loading