diff options
author | Lester Solbakken <lesters@oath.com> | 2019-11-22 11:41:24 +0100 |
---|---|---|
committer | Lester Solbakken <lesters@oath.com> | 2019-11-22 11:41:24 +0100 |
commit | 3f3a364b29d9ee034eb3e7eed9b7c3fc6bfd77a4 (patch) | |
tree | 05a82409fb1c9efe25ac0f8f097cc003b793b415 /model-integration/src/main | |
parent | 296340ac996edac09a4f53997ae1a8a803d302c1 (diff) |
Non-functional changes
Diffstat (limited to 'model-integration/src/main')
-rw-r--r-- | model-integration/src/main/java/ai/vespa/rankingexpression/importer/ModelImporter.java | 4 | ||||
-rw-r--r-- | model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ModelImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ModelImporter.java index b587a9200ec..3774e64c886 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ModelImporter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ModelImporter.java @@ -96,7 +96,7 @@ public abstract class ModelImporter implements MlModelImporter { for (String outputName : signature.outputs().values()) { try { Optional<TensorFunction> function = importExpression(graph.get(outputName), model); - if (!function.isPresent()) { + if (function.isEmpty()) { signature.skippedOutput(outputName, "No valid output function could be found."); } } @@ -108,7 +108,7 @@ public abstract class ModelImporter implements MlModelImporter { } private static Optional<TensorFunction> importExpression(IntermediateOperation operation, ImportedModel model) { - if (!operation.type().isPresent()) { + if (operation.type().isEmpty()) { return Optional.empty(); } if (operation.isConstant()) { diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java index 0a8a797a847..b1c5dc8a0d8 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java @@ -30,6 +30,7 @@ public class OnnxImporter extends ModelImporter { public ImportedModel importModel(String modelName, String modelPath) { try (FileInputStream inputStream = new FileInputStream(modelPath)) { Onnx.ModelProto model = Onnx.ModelProto.parseFrom(inputStream); + // long version = model.getOpsetImport(0).getVersion(); // opset version IntermediateGraph graph = GraphImporter.importGraph(modelName, model); return convertIntermediateGraphToModel(graph, modelPath); } catch (IOException e) { |