From 3f49d646fcbafafdb3e8e7880b00e1350bba1a63 Mon Sep 17 00:00:00 2001 From: Alex Black Date: Tue, 31 Mar 2020 11:34:43 +1100 Subject: [PATCH] API fix + try with resources (close file stream + buffered) Signed-off-by: Alex Black --- .../src/main/java/org/deeplearning4j/util/ModelGuesser.java | 6 +++++- .../main/java/org/deeplearning4j/util/ModelSerializer.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesser.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesser.java index 5e75bd3ce..96e29d1ac 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesser.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesser.java @@ -54,7 +54,11 @@ public class ModelGuesser { * @return the loaded normalizer */ public static Normalizer loadNormalizer(String path) { - return ModelSerializer.restoreNormalizerFromFile(new File(path)); + try { + return ModelSerializer.restoreNormalizerFromFile(new File(path)); + } catch (IOException e){ + throw new RuntimeException(e); + } } diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ModelSerializer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ModelSerializer.java index aa0cab9a0..59820a082 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ModelSerializer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ModelSerializer.java @@ -218,7 +218,9 @@ public class ModelSerializer { */ public static MultiLayerNetwork restoreMultiLayerNetwork(@NonNull File file, boolean loadUpdater) throws IOException { - return restoreMultiLayerNetwork(new FileInputStream(file), loadUpdater); + try(InputStream is = new BufferedInputStream(new FileInputStream(file))){ + return restoreMultiLayerNetwork(is, loadUpdater); + } }