Skip to content

Commit 95cf004

Browse files
AlexDBlackAlexDBlack
committed
Update imports
Signed-off-by: Alex Black <[email protected]>
1 parent 758e0ab commit 95cf004

File tree

50 files changed

+88
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+88
-93
lines changed

‎android/DL4JModelTester/app/src/main/java/org/deeplearning4java/activity/BaseActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.nd4j.linalg.api.ndarray.INDArray;
3838
import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization;
3939
import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler;
40-
import org.nd4j.linalg.primitives.Pair;
40+
import org.nd4j.common.primitives.Pair;
4141

4242
import java.io.IOException;
4343
import java.util.Arrays;

‎android/DL4JModelTester/app/src/main/java/org/deeplearning4java/model/Dl4jModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.nd4j.linalg.api.ndarray.INDArray;
4141
import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization;
4242
import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler;
43-
import org.nd4j.linalg.primitives.Pair;
43+
import org.nd4j.common.primitives.Pair;
4444
import org.opencv.core.Mat;
4545

4646
import java.io.ByteArrayInputStream;

‎dl4j-cuda-specific-examples/src/main/java/org/deeplearning4j/examples/multigpu/vgg16/dataHelpers/FlowerDataSetIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator;
2727
import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
2828
import org.nd4j.linalg.dataset.api.preprocessor.VGG16ImagePreProcessor;
29-
import org.nd4j.util.ArchiveUtils;
29+
import org.nd4j.common.util.ArchiveUtils;
3030
import org.slf4j.Logger;
3131

3232
import java.io.File;

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/arbiter/BasicHyperparameterOptimizationExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.deeplearning4j.examples.arbiter;
1818

19-
import org.deeplearning4j.api.storage.StatsStorage;
2019
import org.deeplearning4j.arbiter.MultiLayerSpace;
2120
import org.deeplearning4j.arbiter.conf.updater.SgdSpace;
2221
import org.deeplearning4j.arbiter.layers.DenseLayerSpace;
@@ -41,11 +40,12 @@
4140
import org.deeplearning4j.arbiter.scoring.impl.EvaluationScoreFunction;
4241
import org.deeplearning4j.arbiter.task.MultiLayerNetworkTaskCreator;
4342
import org.deeplearning4j.arbiter.ui.listener.ArbiterStatusListener;
43+
import org.deeplearning4j.core.storage.StatsStorage;
4444
import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator;
4545
import org.deeplearning4j.nn.multilayer.MultiLayerNetwork;
4646
import org.deeplearning4j.nn.weights.WeightInit;
4747
import org.deeplearning4j.ui.api.UIServer;
48-
import org.deeplearning4j.ui.storage.FileStatsStorage;
48+
import org.deeplearning4j.ui.model.storage.FileStatsStorage;
4949
import org.nd4j.evaluation.classification.Evaluation.Metric;
5050
import org.nd4j.linalg.activations.Activation;
5151
import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/convolution/AnimalsClassification.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.datavec.image.transform.ImageTransform;
2828
import org.datavec.image.transform.PipelineImageTransform;
2929
import org.datavec.image.transform.WarpImageTransform;
30-
import org.deeplearning4j.api.storage.StatsStorage;
30+
import org.deeplearning4j.core.storage.StatsStorage;
3131
import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator;
3232
import org.deeplearning4j.examples.download.DownloaderUtility;
3333
import org.deeplearning4j.nn.conf.GradientNormalization;
@@ -45,16 +45,16 @@
4545
import org.deeplearning4j.optimize.listeners.EvaluativeListener;
4646
import org.deeplearning4j.optimize.listeners.ScoreIterationListener;
4747
import org.deeplearning4j.ui.api.UIServer;
48-
import org.deeplearning4j.ui.stats.StatsListener;
49-
import org.deeplearning4j.ui.storage.FileStatsStorage;
48+
import org.deeplearning4j.ui.model.stats.StatsListener;
49+
import org.deeplearning4j.ui.model.storage.FileStatsStorage;
50+
import org.nd4j.common.primitives.Pair;
5051
import org.nd4j.linalg.activations.Activation;
5152
import org.nd4j.linalg.dataset.DataSet;
5253
import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
5354
import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization;
5455
import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler;
5556
import org.nd4j.linalg.learning.config.AdaDelta;
5657
import org.nd4j.linalg.lossfunctions.LossFunctions;
57-
import org.nd4j.linalg.primitives.Pair;
5858
import org.slf4j.Logger;
5959
import org.slf4j.LoggerFactory;
6060

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/convolution/Cifar.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.deeplearning4j.examples.convolution;
1818

1919
import org.datavec.image.loader.CifarLoader;
20-
import org.deeplearning4j.api.storage.StatsStorage;
20+
import org.deeplearning4j.core.storage.StatsStorage;
2121
import org.deeplearning4j.datasets.fetchers.DataSetType;
2222
import org.deeplearning4j.datasets.iterator.impl.Cifar10DataSetIterator;
2323
import org.deeplearning4j.nn.api.OptimizationAlgorithm;
@@ -34,8 +34,8 @@
3434
import org.deeplearning4j.optimize.listeners.EvaluativeListener;
3535
import org.deeplearning4j.optimize.listeners.ScoreIterationListener;
3636
import org.deeplearning4j.ui.api.UIServer;
37-
import org.deeplearning4j.ui.stats.StatsListener;
38-
import org.deeplearning4j.ui.storage.FileStatsStorage;
37+
import org.deeplearning4j.ui.model.stats.StatsListener;
38+
import org.deeplearning4j.ui.model.storage.FileStatsStorage;
3939
import org.nd4j.linalg.activations.Activation;
4040
import org.nd4j.linalg.learning.config.AdaDelta;
4141
import org.nd4j.linalg.lossfunctions.LossFunctions;

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/convolution/captcharecognition/MultiDigitNumberRecognition.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.deeplearning4j.examples.convolution.captcharecognition;
1818

1919

20-
import org.deeplearning4j.api.storage.StatsStorage;
20+
import org.deeplearning4j.core.storage.StatsStorage;
2121
import org.deeplearning4j.nn.conf.ComputationGraphConfiguration;
2222
import org.deeplearning4j.nn.conf.GradientNormalization;
2323
import org.deeplearning4j.nn.conf.NeuralNetConfiguration;
@@ -29,8 +29,8 @@
2929
import org.deeplearning4j.optimize.listeners.EvaluativeListener;
3030
import org.deeplearning4j.optimize.listeners.ScoreIterationListener;
3131
import org.deeplearning4j.ui.api.UIServer;
32-
import org.deeplearning4j.ui.stats.StatsListener;
33-
import org.deeplearning4j.ui.storage.FileStatsStorage;
32+
import org.deeplearning4j.ui.model.stats.StatsListener;
33+
import org.deeplearning4j.ui.model.storage.FileStatsStorage;
3434
import org.nd4j.linalg.activations.Activation;
3535
import org.nd4j.linalg.api.ndarray.INDArray;
3636
import org.nd4j.linalg.dataset.api.MultiDataSet;

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/denseNet/Main.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.datavec.image.transform.ImageTransform;
2727
import org.datavec.image.transform.PipelineImageTransform;
2828
import org.datavec.image.transform.ShowImageTransform;
29-
import org.deeplearning4j.api.storage.StatsStorage;
29+
import org.deeplearning4j.core.storage.StatsStorage;
3030
import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator;
3131
import org.deeplearning4j.examples.denseNet.imageUtils.BlurTransform;
3232
import org.deeplearning4j.examples.denseNet.imageUtils.NoiseTransform;
@@ -37,13 +37,13 @@
3737
import org.deeplearning4j.optimize.listeners.EvaluativeListener;
3838
import org.deeplearning4j.optimize.listeners.ScoreIterationListener;
3939
import org.deeplearning4j.ui.api.UIServer;
40-
import org.deeplearning4j.ui.stats.StatsListener;
41-
import org.deeplearning4j.ui.storage.InMemoryStatsStorage;
40+
import org.deeplearning4j.ui.model.stats.StatsListener;
41+
import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage;
42+
import org.nd4j.common.primitives.Pair;
4243
import org.nd4j.evaluation.classification.Evaluation;
4344
import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
4445
import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization;
4546
import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler;
46-
import org.nd4j.linalg.primitives.Pair;
4747
import org.slf4j.Logger;
4848
import org.slf4j.LoggerFactory;
4949

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/feedforward/anomalydetection/VaeMNISTAnomaly.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
import org.deeplearning4j.nn.weights.WeightInit;
2626
import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr;
2727
import org.deeplearning4j.optimize.listeners.ScoreIterationListener;
28+
import org.nd4j.common.primitives.Pair;
2829
import org.nd4j.linalg.activations.Activation;
2930
import org.nd4j.linalg.api.ndarray.INDArray;
3031
import org.nd4j.linalg.dataset.api.DataSet;
3132
import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
3233
import org.nd4j.linalg.factory.Nd4j;
3334
import org.nd4j.linalg.learning.config.Adam;
34-
import org.nd4j.linalg.primitives.Pair;
3535

3636
import java.io.IOException;
3737
import java.util.*;

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/feedforward/classification/detectgender/GenderRecordReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.datavec.api.split.InputStreamInputSplit;
2828
import org.datavec.api.writable.DoubleWritable;
2929
import org.datavec.api.writable.Writable;
30-
import org.nd4j.linalg.primitives.Pair;
30+
import org.nd4j.common.primitives.Pair;
3131

3232
import java.io.File;
3333
import java.io.IOException;

0 commit comments

Comments
 (0)