From cdea8be63adf73d6e03b0b345491e7c49ad02aa9 Mon Sep 17 00:00:00 2001 From: Alex Black Date: Thu, 30 Apr 2020 14:09:13 +1000 Subject: [PATCH] Import fixes (#424) * Import fixes Signed-off-by: Alex Black * Import fix Signed-off-by: Alex Black --- .../src/test/java/org/deeplearning4j/cuda/CuDNNTestUtils.java | 2 +- .../src/test/java/org/deeplearning4j/cuda/TestUtils.java | 2 +- .../deeplearning4j/cuda/gradientcheck/CuDNNGradientChecks.java | 2 +- .../java/org/deeplearning4j/cuda/util/CuDNNValidationUtil.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/CuDNNTestUtils.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/CuDNNTestUtils.java index 644fbcaf9..a8d64b7b3 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/CuDNNTestUtils.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/CuDNNTestUtils.java @@ -22,7 +22,7 @@ import org.deeplearning4j.nn.layers.convolution.subsampling.SubsamplingLayer; import org.deeplearning4j.nn.layers.normalization.BatchNormalization; import org.deeplearning4j.nn.layers.normalization.LocalResponseNormalization; import org.deeplearning4j.nn.layers.recurrent.LSTM; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.lang.reflect.Field; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestUtils.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestUtils.java index 6c736b78b..0ac35996d 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestUtils.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestUtils.java @@ -30,7 +30,7 @@ import org.deeplearning4j.nn.layers.normalization.LocalResponseNormalization; import org.deeplearning4j.nn.layers.recurrent.LSTM; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.util.ModelSerializer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.random.impl.BernoulliDistribution; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CuDNNGradientChecks.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CuDNNGradientChecks.java index 2524609a9..7a06fb627 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CuDNNGradientChecks.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CuDNNGradientChecks.java @@ -44,12 +44,12 @@ import org.deeplearning4j.nn.layers.recurrent.LSTMHelper; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; import org.junit.Test; +import org.nd4j.common.function.Consumer; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.buffer.util.DataTypeUtil; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.Consumer; import org.nd4j.linalg.learning.config.NoOp; import org.nd4j.linalg.lossfunctions.LossFunctions; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/util/CuDNNValidationUtil.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/util/CuDNNValidationUtil.java index 4532d0831..775c1fe9e 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/util/CuDNNValidationUtil.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/util/CuDNNValidationUtil.java @@ -24,7 +24,7 @@ import org.deeplearning4j.nn.conf.layers.ConvolutionLayer; import org.deeplearning4j.nn.conf.layers.SubsamplingLayer; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.optimize.listeners.CollectScoresListener; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.reduce.longer.MatchCondition; import org.nd4j.linalg.dataset.DataSet;