Refactor: macro -> function

5 files changed, 16 insertions, 16 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ImportedModel.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ImportedModel.java
index ac5eefcc5b2..8653e05a7d2 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ImportedModel.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ImportedModel.java
@@ -80,10 +80,10 @@ public class ImportedModel {
      * Returns an immutable map of macros that are part of this model.
      * Note that the macros themselves are *not* copies and *not* immutable - they must be copied before modification.
      */
-    public Map<String, RankingExpression> macros() { return Collections.unmodifiableMap(macros); }
+    public Map<String, RankingExpression> functions() { return Collections.unmodifiableMap(macros); }
 
     /** Returns an immutable map of the macros that must be provided by the environment running this model */
-    public Map<String, TensorType> requiredMacros() { return Collections.unmodifiableMap(requiredMacros); }
+    public Map<String, TensorType> requiredFunctions() { return Collections.unmodifiableMap(requiredMacros); }
 
     /** Returns an immutable map of the signatures of this */
     public Map<String, Signature> signatures() { return Collections.unmodifiableMap(signatures); }
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/DropoutImportTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/DropoutImportTestCase.java
index a63c7346335..1c73f97e929 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/DropoutImportTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/DropoutImportTestCase.java
@@ -19,10 +19,10 @@ public class DropoutImportTestCase {
         TestableTensorFlowModel model = new TestableTensorFlowModel("test", "src/test/files/integration/tensorflow/dropout/saved");
 
         // Check required macros
-        assertEquals(1, model.get().requiredMacros().size());
-        assertTrue(model.get().requiredMacros().containsKey("X"));
+        assertEquals(1, model.get().requiredFunctions().size());
+        assertTrue(model.get().requiredFunctions().containsKey("X"));
         assertEquals(new TensorType.Builder().indexed("d0").indexed("d1", 784).build(),
-                     model.get().requiredMacros().get("X"));
+                     model.get().requiredFunctions().get("X"));
 
         ImportedModel.Signature signature = model.get().signature("serving_default");
 
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/OnnxMnistSoftmaxImportTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/OnnxMnistSoftmaxImportTestCase.java
index bcfc6ce0a04..6856434e2d0 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/OnnxMnistSoftmaxImportTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/OnnxMnistSoftmaxImportTestCase.java
@@ -37,10 +37,10 @@ public class OnnxMnistSoftmaxImportTestCase {
         assertEquals(10, constant1.size());
 
         // Check required macros (inputs)
-        assertEquals(1, model.requiredMacros().size());
-        assertTrue(model.requiredMacros().containsKey("Placeholder"));
+        assertEquals(1, model.requiredFunctions().size());
+        assertTrue(model.requiredFunctions().containsKey("Placeholder"));
         assertEquals(new TensorType.Builder().indexed("d0").indexed("d1", 784).build(),
-                     model.requiredMacros().get("Placeholder"));
+                     model.requiredFunctions().get("Placeholder"));
 
         // Check outputs
         RankingExpression output = model.defaultSignature().outputExpression("add");
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/TensorFlowMnistSoftmaxImportTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/TensorFlowMnistSoftmaxImportTestCase.java
index dd6c8095e3c..97f4e938a4f 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/TensorFlowMnistSoftmaxImportTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/TensorFlowMnistSoftmaxImportTestCase.java
@@ -35,13 +35,13 @@ public class TensorFlowMnistSoftmaxImportTestCase {
         assertEquals(10, constant1.size());
 
         // Check (provided) macros
-        assertEquals(0, model.get().macros().size());
+        assertEquals(0, model.get().functions().size());
 
         // Check required macros
-        assertEquals(1, model.get().requiredMacros().size());
-        assertTrue(model.get().requiredMacros().containsKey("Placeholder"));
+        assertEquals(1, model.get().requiredFunctions().size());
+        assertTrue(model.get().requiredFunctions().containsKey("Placeholder"));
         assertEquals(new TensorType.Builder().indexed("d0").indexed("d1", 784).build(),
-                     model.get().requiredMacros().get("Placeholder"));
+                     model.get().requiredFunctions().get("Placeholder"));
 
         // Check signatures
         assertEquals(1, model.get().signatures().size());
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/TestableTensorFlowModel.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/TestableTensorFlowModel.java
index 4de3aa5d635..e688a983d27 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/TestableTensorFlowModel.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/TestableTensorFlowModel.java
@@ -48,7 +48,7 @@ public class TestableTensorFlowModel {
         Tensor placeholder = placeholderArgument();
         context.put(inputName, new TensorValue(placeholder));
 
-        model.macros().forEach((k,v) -> evaluateMacro(context, model, k));
+        model.functions().forEach((k, v) -> evaluateMacro(context, model, k));
 
         Tensor vespaResult = model.expressions().get(operationName).evaluate(context).asTensor();
         assertEquals("Operation '" + operationName + "' produces equal results",
@@ -62,7 +62,7 @@ public class TestableTensorFlowModel {
         Tensor placeholder = placeholderArgument();
         context.put(inputName, new TensorValue(placeholder));
 
-        model.macros().forEach((k,v) -> evaluateMacro(context, model, k));
+        model.functions().forEach((k, v) -> evaluateMacro(context, model, k));
 
         Tensor vespaResult = model.expressions().get(operationName).evaluate(context).asTensor();
         assertEquals("Operation '" + operationName + "' produces equal results", tfResult, vespaResult);
@@ -98,7 +98,7 @@ public class TestableTensorFlowModel {
 
     private void evaluateMacro(Context context, ImportedModel model, String macroName) {
         if (!context.names().contains(macroName)) {
-            RankingExpression e = model.macros().get(macroName);
+            RankingExpression e = model.functions().get(macroName);
             evaluateMacroDependencies(context, model, e.getRoot());
             context.put(macroName, new TensorValue(e.evaluate(context).asTensor()));
         }
@@ -107,7 +107,7 @@ public class TestableTensorFlowModel {
     private void evaluateMacroDependencies(Context context, ImportedModel model, ExpressionNode node) {
         if (node instanceof ReferenceNode) {
             String name = node.toString();
-            if (model.macros().containsKey(name)) {
+            if (model.functions().containsKey(name)) {
                 evaluateMacro(context, model, name);
             }
         }