Move all importing to model-integration

1 files changed, 5 insertions, 3 deletions

diff --git a/model-evaluation/src/main/java/ai/vespa/models/evaluation/Model.java b/model-evaluation/src/main/java/ai/vespa/models/evaluation/Model.java
index c6cb45f40be..55da2e78894 100644
--- a/model-evaluation/src/main/java/ai/vespa/models/evaluation/Model.java
+++ b/model-evaluation/src/main/java/ai/vespa/models/evaluation/Model.java
@@ -7,7 +7,6 @@ import com.google.common.collect.ImmutableMap;
 import com.yahoo.searchlib.rankingexpression.ExpressionFunction;
 import com.yahoo.searchlib.rankingexpression.evaluation.ContextIndex;
 import com.yahoo.searchlib.rankingexpression.evaluation.ExpressionOptimizer;
-import com.yahoo.searchlib.rankingexpression.integration.ml.operations.IntermediateOperation;
 import com.yahoo.tensor.TensorType;
 
 import java.util.Arrays;
@@ -25,6 +24,9 @@ import java.util.stream.Collectors;
 @Beta
 public class Model {
 
+    /** The prefix generated by mode-integration/../IntermediateOperation */
+    private final static String INTERMEDIATE_OPERATION_FUNCTION_PREFIX = "imported_ml_function_";
+
     private final String name;
 
     /** Free functions */
@@ -66,7 +68,7 @@ public class Model {
                 }
 
                 for (String argument : context.arguments()) {
-                    if (function.getValue().getName().startsWith(IntermediateOperation.FUNCTION_PREFIX)) {
+                    if (function.getValue().getName().startsWith(INTERMEDIATE_OPERATION_FUNCTION_PREFIX)) {
                         // Internal (generated) functions do not have type info - add arguments
                         if (!function.getValue().arguments().contains(argument))
                             functions.put(function.getKey(), function.getValue().withArgument(argument));
@@ -85,7 +87,7 @@ public class Model {
         this.contextPrototypes = contextBuilder.build();
         this.functions = ImmutableList.copyOf(functions.values());
         this.publicFunctions = ImmutableList.copyOf(functions.values().stream()
-                                                                      .filter(f ->  ! f.getName().startsWith(IntermediateOperation.FUNCTION_PREFIX))
+                                                                      .filter(f ->  ! f.getName().startsWith(INTERMEDIATE_OPERATION_FUNCTION_PREFIX))
                                                                       .collect(Collectors.toList()));
 
         // Optimize functions