diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/api/Candidate.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/api/Candidate.java index 33006282c..4f00d92e7 100644 --- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/api/Candidate.java +++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/api/Candidate.java @@ -19,7 +19,7 @@ package org.deeplearning4j.arbiter.optimize.api; import lombok.AllArgsConstructor; import lombok.Data; import org.deeplearning4j.arbiter.optimize.generator.util.SerializedSupplier; -import org.nd4j.linalg.function.Supplier; +import org.nd4j.common.function.Supplier; import java.io.Serializable; import java.util.Map; diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/ArithmeticCrossover.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/ArithmeticCrossover.java index 209533dad..978e7166b 100644 --- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/ArithmeticCrossover.java +++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/ArithmeticCrossover.java @@ -21,7 +21,7 @@ import org.apache.commons.math3.random.RandomGenerator; import org.apache.commons.math3.random.SynchronizedRandomGenerator; import org.deeplearning4j.arbiter.optimize.generator.genetic.crossover.parentselection.RandomTwoParentSelection; import org.deeplearning4j.arbiter.optimize.generator.genetic.crossover.parentselection.TwoParentSelection; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; /** * A crossover operator that linearly combines the genes of two parents.
diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/KPointCrossover.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/KPointCrossover.java index 14f9eb661..8a7bb3a2a 100644 --- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/KPointCrossover.java +++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/KPointCrossover.java @@ -22,7 +22,7 @@ import org.apache.commons.math3.random.SynchronizedRandomGenerator; import org.deeplearning4j.arbiter.optimize.generator.genetic.crossover.parentselection.RandomTwoParentSelection; import org.deeplearning4j.arbiter.optimize.generator.genetic.crossover.parentselection.TwoParentSelection; import org.deeplearning4j.arbiter.optimize.generator.genetic.crossover.utils.CrossoverPointsGenerator; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.Deque; diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/SinglePointCrossover.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/SinglePointCrossover.java index 93feb2502..cbeca1232 100644 --- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/SinglePointCrossover.java +++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/SinglePointCrossover.java @@ -21,7 +21,7 @@ import org.apache.commons.math3.random.RandomGenerator; import org.apache.commons.math3.random.SynchronizedRandomGenerator; import org.deeplearning4j.arbiter.optimize.generator.genetic.crossover.parentselection.RandomTwoParentSelection; import org.deeplearning4j.arbiter.optimize.generator.genetic.crossover.parentselection.TwoParentSelection; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; /** * The single point crossover will select a random point where every genes before that point comes from one parent diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/UniformCrossover.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/UniformCrossover.java index 1a5551716..8912a1298 100644 --- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/UniformCrossover.java +++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/crossover/UniformCrossover.java @@ -21,7 +21,7 @@ import org.apache.commons.math3.random.RandomGenerator; import org.apache.commons.math3.random.SynchronizedRandomGenerator; import org.deeplearning4j.arbiter.optimize.generator.genetic.crossover.parentselection.RandomTwoParentSelection; import org.deeplearning4j.arbiter.optimize.generator.genetic.crossover.parentselection.TwoParentSelection; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; /** * The uniform crossover will, for each gene, randomly select the parent that donates the gene. diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/culling/RatioCullOperator.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/culling/RatioCullOperator.java index 5c628c6fd..9c838acc8 100644 --- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/culling/RatioCullOperator.java +++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/culling/RatioCullOperator.java @@ -18,7 +18,7 @@ package org.deeplearning4j.arbiter.optimize.generator.genetic.culling; import org.deeplearning4j.arbiter.optimize.generator.genetic.Chromosome; import org.deeplearning4j.arbiter.optimize.generator.genetic.population.PopulationModel; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.List; diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/mutation/RandomMutationOperator.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/mutation/RandomMutationOperator.java index 0331735f4..ba10676b6 100644 --- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/mutation/RandomMutationOperator.java +++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/genetic/mutation/RandomMutationOperator.java @@ -19,7 +19,7 @@ package org.deeplearning4j.arbiter.optimize.generator.genetic.mutation; import org.apache.commons.math3.random.JDKRandomGenerator; import org.apache.commons.math3.random.RandomGenerator; import org.apache.commons.math3.random.SynchronizedRandomGenerator; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; /** * A mutation operator where each gene has a chance of being mutated with a mutation rate probability. diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/util/SerializedSupplier.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/util/SerializedSupplier.java index bafe26c9e..81109816d 100644 --- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/util/SerializedSupplier.java +++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/generator/util/SerializedSupplier.java @@ -16,7 +16,7 @@ package org.deeplearning4j.arbiter.optimize.generator.util; -import org.nd4j.linalg.function.Supplier; +import org.nd4j.common.function.Supplier; import java.io.*; diff --git a/arbiter/arbiter-core/src/test/java/org/deeplearning4j/arbiter/optimize/AssertTestsExtendBaseClass.java b/arbiter/arbiter-core/src/test/java/org/deeplearning4j/arbiter/optimize/AssertTestsExtendBaseClass.java index 75a64d05f..cfb5e2556 100644 --- a/arbiter/arbiter-core/src/test/java/org/deeplearning4j/arbiter/optimize/AssertTestsExtendBaseClass.java +++ b/arbiter/arbiter-core/src/test/java/org/deeplearning4j/arbiter/optimize/AssertTestsExtendBaseClass.java @@ -17,7 +17,7 @@ package org.deeplearning4j.arbiter.optimize; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; import java.util.*; /** diff --git a/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/scoring/impl/ROCScoreFunction.java b/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/scoring/impl/ROCScoreFunction.java index b8c71d5d1..9203963e3 100644 --- a/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/scoring/impl/ROCScoreFunction.java +++ b/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/scoring/impl/ROCScoreFunction.java @@ -18,12 +18,12 @@ package org.deeplearning4j.arbiter.scoring.impl; import lombok.*; import org.deeplearning4j.datasets.iterator.MultiDataSetWrapperIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.nd4j.evaluation.classification.ROC; import org.nd4j.evaluation.classification.ROCBinary; import org.nd4j.evaluation.classification.ROCMultiClass; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; diff --git a/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/scoring/util/ScoreUtil.java b/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/scoring/util/ScoreUtil.java index 37660d3b5..303defe35 100644 --- a/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/scoring/util/ScoreUtil.java +++ b/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/scoring/util/ScoreUtil.java @@ -17,13 +17,13 @@ package org.deeplearning4j.arbiter.scoring.util; import org.deeplearning4j.arbiter.scoring.RegressionValue; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.eval.Evaluation; import org.deeplearning4j.eval.RegressionEvaluation; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.DataSetIteratorFactory; diff --git a/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/task/ComputationGraphTaskCreator.java b/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/task/ComputationGraphTaskCreator.java index d26f16c99..53a9fe0aa 100644 --- a/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/task/ComputationGraphTaskCreator.java +++ b/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/task/ComputationGraphTaskCreator.java @@ -41,13 +41,9 @@ import org.deeplearning4j.arbiter.scoring.util.ScoreUtil; import org.deeplearning4j.earlystopping.EarlyStoppingConfiguration; import org.deeplearning4j.earlystopping.EarlyStoppingResult; import org.deeplearning4j.earlystopping.trainer.EarlyStoppingGraphTrainer; -import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.graph.ComputationGraph; -import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.BiConsumer; -import org.nd4j.linalg.function.BiFunction; import java.io.IOException; import java.util.List; diff --git a/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/task/MultiLayerNetworkTaskCreator.java b/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/task/MultiLayerNetworkTaskCreator.java index c4ed59b97..5c2fb0703 100644 --- a/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/task/MultiLayerNetworkTaskCreator.java +++ b/arbiter/arbiter-deeplearning4j/src/main/java/org/deeplearning4j/arbiter/task/MultiLayerNetworkTaskCreator.java @@ -22,7 +22,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; -import org.bytedeco.javacpp.Pointer; import org.deeplearning4j.arbiter.DL4JConfiguration; import org.deeplearning4j.arbiter.listener.DL4JArbiterStatusReportingListener; import org.deeplearning4j.arbiter.optimize.api.Candidate; @@ -42,11 +41,9 @@ import org.deeplearning4j.arbiter.scoring.util.ScoreUtil; import org.deeplearning4j.earlystopping.EarlyStoppingConfiguration; import org.deeplearning4j.earlystopping.EarlyStoppingResult; import org.deeplearning4j.earlystopping.trainer.EarlyStoppingTrainer; -import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.BiFunction; import java.io.IOException; import java.util.List; diff --git a/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/AssertTestsExtendBaseClass.java b/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/AssertTestsExtendBaseClass.java index b8d200350..06e00219f 100644 --- a/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/AssertTestsExtendBaseClass.java +++ b/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/AssertTestsExtendBaseClass.java @@ -17,7 +17,7 @@ package org.deeplearning4j.arbiter; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; import java.util.*; diff --git a/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/computationgraph/TestGraphLocalExecution.java b/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/computationgraph/TestGraphLocalExecution.java index ad8601000..3566afd02 100644 --- a/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/computationgraph/TestGraphLocalExecution.java +++ b/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/computationgraph/TestGraphLocalExecution.java @@ -24,14 +24,12 @@ import org.deeplearning4j.arbiter.conf.updater.SgdSpace; import org.deeplearning4j.arbiter.evaluator.multilayer.ClassificationEvaluator; import org.deeplearning4j.arbiter.layers.DenseLayerSpace; import org.deeplearning4j.arbiter.layers.OutputLayerSpace; -import org.deeplearning4j.arbiter.multilayernetwork.MnistDataSetIteratorFactory; import org.deeplearning4j.arbiter.multilayernetwork.TestDL4JLocalExecution; import org.deeplearning4j.arbiter.optimize.api.CandidateGenerator; import org.deeplearning4j.arbiter.optimize.api.data.DataProvider; import org.deeplearning4j.arbiter.optimize.api.data.DataSetIteratorFactoryProvider; import org.deeplearning4j.arbiter.optimize.api.data.DataSource; import org.deeplearning4j.arbiter.optimize.api.saving.ResultReference; -import org.deeplearning4j.arbiter.optimize.api.score.ScoreFunction; import org.deeplearning4j.arbiter.optimize.api.termination.MaxCandidatesCondition; import org.deeplearning4j.arbiter.optimize.api.termination.MaxTimeCondition; import org.deeplearning4j.arbiter.optimize.generator.RandomSearchGenerator; @@ -46,11 +44,8 @@ import org.deeplearning4j.arbiter.scoring.ScoreFunctions; import org.deeplearning4j.arbiter.scoring.impl.TestSetLossScoreFunction; import org.deeplearning4j.arbiter.task.ComputationGraphTaskCreator; import org.deeplearning4j.arbiter.util.TestDataFactoryProviderMnist; -import org.deeplearning4j.datasets.iterator.MultiDataSetWrapperIterator; import org.deeplearning4j.datasets.iterator.MultipleEpochsIterator; -import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.earlystopping.EarlyStoppingConfiguration; import org.deeplearning4j.earlystopping.saver.InMemoryModelSaver; import org.deeplearning4j.earlystopping.scorecalc.DataSetLossCalculatorCG; @@ -60,16 +55,16 @@ import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.graph.ComputationGraph; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.Supplier; +import org.nd4j.common.function.Supplier; import org.nd4j.linalg.lossfunctions.LossFunctions; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/computationgraph/TestGraphLocalExecutionGenetic.java b/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/computationgraph/TestGraphLocalExecutionGenetic.java index caeffaaa7..58a00bf5e 100644 --- a/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/computationgraph/TestGraphLocalExecutionGenetic.java +++ b/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/computationgraph/TestGraphLocalExecutionGenetic.java @@ -19,7 +19,6 @@ package org.deeplearning4j.arbiter.computationgraph; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.arbiter.ComputationGraphSpace; -import org.deeplearning4j.arbiter.conf.updater.AdamSpace; import org.deeplearning4j.arbiter.conf.updater.SgdSpace; import org.deeplearning4j.arbiter.evaluator.multilayer.ClassificationEvaluator; import org.deeplearning4j.arbiter.layers.DenseLayerSpace; @@ -34,7 +33,6 @@ import org.deeplearning4j.arbiter.optimize.api.termination.MaxCandidatesConditio import org.deeplearning4j.arbiter.optimize.api.termination.MaxTimeCondition; import org.deeplearning4j.arbiter.optimize.config.OptimizationConfiguration; import org.deeplearning4j.arbiter.optimize.generator.GeneticSearchCandidateGenerator; -import org.deeplearning4j.arbiter.optimize.generator.RandomSearchGenerator; import org.deeplearning4j.arbiter.optimize.generator.genetic.population.PopulationModel; import org.deeplearning4j.arbiter.optimize.parameter.continuous.ContinuousParameterSpace; import org.deeplearning4j.arbiter.optimize.parameter.discrete.DiscreteParameterSpace; @@ -42,28 +40,23 @@ import org.deeplearning4j.arbiter.optimize.parameter.integer.IntegerParameterSpa import org.deeplearning4j.arbiter.optimize.runner.IOptimizationRunner; import org.deeplearning4j.arbiter.optimize.runner.LocalOptimizationRunner; import org.deeplearning4j.arbiter.saver.local.FileModelSaver; -import org.deeplearning4j.arbiter.scoring.ScoreFunctions; import org.deeplearning4j.arbiter.scoring.impl.TestSetLossScoreFunction; import org.deeplearning4j.arbiter.task.ComputationGraphTaskCreator; import org.deeplearning4j.arbiter.util.TestDataFactoryProviderMnist; import org.deeplearning4j.datasets.iterator.MultipleEpochsIterator; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; -import org.deeplearning4j.earlystopping.EarlyStoppingConfiguration; -import org.deeplearning4j.earlystopping.saver.InMemoryModelSaver; import org.deeplearning4j.earlystopping.scorecalc.DataSetLossCalculatorCG; import org.deeplearning4j.earlystopping.scorecalc.ScoreCalculator; -import org.deeplearning4j.earlystopping.termination.MaxEpochsTerminationCondition; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.inputs.InputType; -import org.deeplearning4j.nn.graph.ComputationGraph; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.activations.Activation; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; -import org.nd4j.linalg.function.Supplier; +import org.nd4j.common.function.Supplier; import org.nd4j.linalg.lossfunctions.LossFunctions; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/multilayernetwork/TestMultiLayerSpace.java b/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/multilayernetwork/TestMultiLayerSpace.java index 58333d930..be8a3133f 100644 --- a/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/multilayernetwork/TestMultiLayerSpace.java +++ b/arbiter/arbiter-deeplearning4j/src/test/java/org/deeplearning4j/arbiter/multilayernetwork/TestMultiLayerSpace.java @@ -81,7 +81,7 @@ import org.nd4j.linalg.lossfunctions.LossFunctions; import org.nd4j.linalg.lossfunctions.LossFunctions.LossFunction; import org.nd4j.linalg.lossfunctions.impl.LossMCXENT; import org.nd4j.linalg.lossfunctions.impl.LossMSE; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.lang.reflect.Field; diff --git a/arbiter/arbiter-server/src/test/java/org/deeplearning4j/arbiter/server/AssertTestsExtendBaseClass.java b/arbiter/arbiter-server/src/test/java/org/deeplearning4j/arbiter/server/AssertTestsExtendBaseClass.java index b305b123b..256a8af9b 100644 --- a/arbiter/arbiter-server/src/test/java/org/deeplearning4j/arbiter/server/AssertTestsExtendBaseClass.java +++ b/arbiter/arbiter-server/src/test/java/org/deeplearning4j/arbiter/server/AssertTestsExtendBaseClass.java @@ -17,7 +17,7 @@ package org.deeplearning4j.arbiter.server; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; import java.util.*; diff --git a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/BaseJavaPersistable.java b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/BaseJavaPersistable.java index 3b5264f0d..1fb699e0b 100644 --- a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/BaseJavaPersistable.java +++ b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/BaseJavaPersistable.java @@ -18,7 +18,7 @@ package org.deeplearning4j.arbiter.ui.data; import lombok.AllArgsConstructor; import org.apache.commons.compress.utils.IOUtils; -import org.deeplearning4j.api.storage.Persistable; +import org.deeplearning4j.core.storage.Persistable; import org.deeplearning4j.arbiter.ui.module.ArbiterModule; import java.io.*; diff --git a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/GlobalConfigPersistable.java b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/GlobalConfigPersistable.java index 00a95a628..9a6c3faa9 100644 --- a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/GlobalConfigPersistable.java +++ b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/GlobalConfigPersistable.java @@ -20,13 +20,13 @@ import lombok.Getter; import org.deeplearning4j.arbiter.optimize.config.OptimizationConfiguration; import org.deeplearning4j.arbiter.optimize.serde.jackson.JsonMapper; import org.deeplearning4j.arbiter.ui.module.ArbiterModule; -import org.deeplearning4j.nn.conf.serde.JsonMappers; +import org.deeplearning4j.core.storage.Persistable; import java.io.IOException; /** * - * A {@link org.deeplearning4j.api.storage.Persistable} implemention for global settings + * A {@link Persistable} implemention for global settings * @author Alex Black */ @Getter diff --git a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/ModelInfoPersistable.java b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/ModelInfoPersistable.java index e0ae762bc..4d1ee4e5f 100644 --- a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/ModelInfoPersistable.java +++ b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/data/ModelInfoPersistable.java @@ -18,9 +18,10 @@ package org.deeplearning4j.arbiter.ui.data; import lombok.Data; import org.deeplearning4j.arbiter.optimize.runner.CandidateStatus; +import org.deeplearning4j.core.storage.Persistable; /** - * A {@link org.deeplearning4j.api.storage.Persistable} implemention for model results - i.e., results for + * A {@link Persistable} implemention for model results - i.e., results for * each model * * @author Alex BLack diff --git a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/listener/ArbiterStatusListener.java b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/listener/ArbiterStatusListener.java index 7802762c9..c14258be2 100644 --- a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/listener/ArbiterStatusListener.java +++ b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/listener/ArbiterStatusListener.java @@ -20,8 +20,8 @@ import it.unimi.dsi.fastutil.floats.FloatArrayList; import it.unimi.dsi.fastutil.ints.IntArrayList; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorageRouter; import org.deeplearning4j.arbiter.optimize.api.OptimizationResult; import org.deeplearning4j.arbiter.optimize.runner.CandidateInfo; import org.deeplearning4j.arbiter.optimize.runner.IOptimizationRunner; @@ -31,7 +31,7 @@ import org.deeplearning4j.arbiter.ui.data.GlobalConfigPersistable; import org.deeplearning4j.arbiter.ui.data.ModelInfoPersistable; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.IOException; import java.util.Map; diff --git a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/module/ArbiterModule.java b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/module/ArbiterModule.java index 2f6bfc434..31e86d45f 100644 --- a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/module/ArbiterModule.java +++ b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/module/ArbiterModule.java @@ -20,10 +20,10 @@ package org.deeplearning4j.arbiter.ui.module; import io.netty.handler.codec.http.HttpResponseStatus; import io.vertx.ext.web.RoutingContext; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; -import org.deeplearning4j.api.storage.StatsStorageListener; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorageListener; import org.deeplearning4j.arbiter.BaseNetworkSpace; import org.deeplearning4j.arbiter.layers.LayerSpace; import org.deeplearning4j.arbiter.optimize.api.ParameterSpace; @@ -50,7 +50,7 @@ import org.deeplearning4j.ui.components.text.style.StyleText; import org.deeplearning4j.ui.i18n.I18NResource; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.core.JsonProcessingException; import java.awt.*; @@ -59,8 +59,6 @@ import java.util.List; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -import static org.deeplearning4j.arbiter.ui.misc.JsonMapper.asJson; - /** * A Deeplearning4j {@link UIModule}, for integration with DL4J's user interface * diff --git a/arbiter/arbiter-ui/src/test/java/org/deeplearning4j/arbiter/optimize/AssertTestsExtendBaseClass.java b/arbiter/arbiter-ui/src/test/java/org/deeplearning4j/arbiter/optimize/AssertTestsExtendBaseClass.java index fee20847c..fcf3066e2 100644 --- a/arbiter/arbiter-ui/src/test/java/org/deeplearning4j/arbiter/optimize/AssertTestsExtendBaseClass.java +++ b/arbiter/arbiter-ui/src/test/java/org/deeplearning4j/arbiter/optimize/AssertTestsExtendBaseClass.java @@ -16,7 +16,7 @@ package org.deeplearning4j.arbiter.optimize; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; import org.deeplearning4j.BaseDL4JTest; import java.util.*; diff --git a/arbiter/arbiter-ui/src/test/java/org/deeplearning4j/arbiter/optimize/TestBasic.java b/arbiter/arbiter-ui/src/test/java/org/deeplearning4j/arbiter/optimize/TestBasic.java index ddf73e455..64c873348 100644 --- a/arbiter/arbiter-ui/src/test/java/org/deeplearning4j/arbiter/optimize/TestBasic.java +++ b/arbiter/arbiter-ui/src/test/java/org/deeplearning4j/arbiter/optimize/TestBasic.java @@ -17,7 +17,7 @@ package org.deeplearning4j.arbiter.optimize; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.api.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorage; import org.deeplearning4j.arbiter.ComputationGraphSpace; import org.deeplearning4j.arbiter.MultiLayerSpace; import org.deeplearning4j.arbiter.conf.updater.SgdSpace; @@ -51,7 +51,7 @@ import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.weights.WeightInit; import org.deeplearning4j.ui.api.UIServer; -import org.deeplearning4j.ui.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; import org.junit.Ignore; import org.junit.Test; import org.nd4j.evaluation.classification.Evaluation; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/BaseRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/BaseRecordReader.java index 986984a37..99e26b8f2 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/BaseRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/BaseRecordReader.java @@ -21,11 +21,8 @@ import org.datavec.api.split.InputSplit; import org.datavec.api.split.StreamInputSplit; import org.datavec.api.split.streams.FileStreamCreatorFunction; import org.datavec.api.writable.Writable; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/LineRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/LineRecordReader.java index 407a71fea..c0d39d066 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/LineRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/LineRecordReader.java @@ -31,8 +31,8 @@ import org.datavec.api.split.InputStreamInputSplit; import org.datavec.api.split.StringSplit; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.primitives.Triple; import java.io.*; import java.net.URI; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVMultiSequenceRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVMultiSequenceRecordReader.java index cd5a66e8c..ab80f4bc8 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVMultiSequenceRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVMultiSequenceRecordReader.java @@ -21,7 +21,7 @@ import org.datavec.api.records.metadata.RecordMetaData; import org.datavec.api.records.metadata.RecordMetaDataInterval; import org.datavec.api.records.reader.SequenceRecordReader; import org.datavec.api.writable.Writable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.io.BufferedReader; import java.io.DataInputStream; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVNLinesSequenceRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVNLinesSequenceRecordReader.java index 8f635b220..30fe99ac9 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVNLinesSequenceRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVNLinesSequenceRecordReader.java @@ -25,7 +25,7 @@ import org.datavec.api.records.reader.SequenceRecordReader; import org.datavec.api.split.InputSplit; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import java.io.DataInputStream; import java.io.IOException; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVRecordReader.java index 133fe924c..81d403db9 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVRecordReader.java @@ -25,7 +25,7 @@ import org.datavec.api.records.reader.impl.LineRecordReader; import org.datavec.api.split.InputSplit; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.io.BufferedReader; import java.io.DataInputStream; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVVariableSlidingWindowRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVVariableSlidingWindowRecordReader.java index 0a03dd069..def5fffc9 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVVariableSlidingWindowRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVVariableSlidingWindowRecordReader.java @@ -23,9 +23,7 @@ import org.datavec.api.records.metadata.RecordMetaData; import org.datavec.api.records.metadata.RecordMetaDataLineInterval; import org.datavec.api.records.reader.SequenceRecordReader; import org.datavec.api.split.InputSplit; -import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.primitives.Triple; import java.io.DataInputStream; import java.io.IOException; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/filebatch/FileBatchRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/filebatch/FileBatchRecordReader.java index 66d92bf18..341d77c7b 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/filebatch/FileBatchRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/filebatch/FileBatchRecordReader.java @@ -23,8 +23,8 @@ import org.datavec.api.records.metadata.RecordMetaData; import org.datavec.api.records.reader.RecordReader; import org.datavec.api.split.InputSplit; import org.datavec.api.writable.Writable; -import org.nd4j.api.loader.FileBatch; -import org.nd4j.base.Preconditions; +import org.nd4j.common.loader.FileBatch; +import org.nd4j.common.base.Preconditions; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/filebatch/FileBatchSequenceRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/filebatch/FileBatchSequenceRecordReader.java index 9ce211246..4545f58a5 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/filebatch/FileBatchSequenceRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/filebatch/FileBatchSequenceRecordReader.java @@ -24,8 +24,8 @@ import org.datavec.api.records.metadata.RecordMetaData; import org.datavec.api.records.reader.SequenceRecordReader; import org.datavec.api.split.InputSplit; import org.datavec.api.writable.Writable; -import org.nd4j.api.loader.FileBatch; -import org.nd4j.base.Preconditions; +import org.nd4j.common.loader.FileBatch; +import org.nd4j.common.base.Preconditions; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/regex/RegexSequenceRecordReader.java b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/regex/RegexSequenceRecordReader.java index 410e5b9fe..8faa243c3 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/regex/RegexSequenceRecordReader.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/regex/RegexSequenceRecordReader.java @@ -27,7 +27,7 @@ import org.datavec.api.records.reader.impl.FileRecordReader; import org.datavec.api.split.InputSplit; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/split/FileSplit.java b/datavec/datavec-api/src/main/java/org/datavec/api/split/FileSplit.java index 76e2919a9..ab70d00c1 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/split/FileSplit.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/split/FileSplit.java @@ -21,9 +21,9 @@ import org.apache.commons.io.filefilter.IOFileFilter; import org.apache.commons.io.filefilter.RegexFileFilter; import org.apache.commons.io.filefilter.SuffixFileFilter; import org.datavec.api.util.files.URIUtil; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.collection.CompactHeapStringList; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.collection.CompactHeapStringList; +import org.nd4j.common.util.MathUtils; import java.io.*; import java.net.URI; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/split/StreamInputSplit.java b/datavec/datavec-api/src/main/java/org/datavec/api/split/StreamInputSplit.java index 24737dbab..ca55465ca 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/split/StreamInputSplit.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/split/StreamInputSplit.java @@ -19,8 +19,8 @@ package org.datavec.api.split; import lombok.Data; import lombok.NonNull; import org.datavec.api.util.files.ShuffledListIterator; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.function.Function; +import org.nd4j.common.util.MathUtils; import java.io.InputStream; import java.io.OutputStream; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/split/TransformSplit.java b/datavec/datavec-api/src/main/java/org/datavec/api/split/TransformSplit.java index a0b373327..ca49ad591 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/split/TransformSplit.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/split/TransformSplit.java @@ -17,7 +17,7 @@ package org.datavec.api.split; import lombok.NonNull; -import org.nd4j.linalg.collection.CompactHeapStringList; +import org.nd4j.common.collection.CompactHeapStringList; import java.io.*; import java.net.URI; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/split/streams/FileStreamCreatorFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/split/streams/FileStreamCreatorFunction.java index 53b8a415f..c306da585 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/split/streams/FileStreamCreatorFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/split/streams/FileStreamCreatorFunction.java @@ -16,8 +16,8 @@ package org.datavec.api.split.streams; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.function.Function; import java.io.*; import java.net.URI; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/timeseries/util/TimeSeriesWritableUtils.java b/datavec/datavec-api/src/main/java/org/datavec/api/timeseries/util/TimeSeriesWritableUtils.java index 5d86a90db..fcabe3650 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/timeseries/util/TimeSeriesWritableUtils.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/timeseries/util/TimeSeriesWritableUtils.java @@ -25,11 +25,10 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Iterator; import java.util.List; -import java.util.Random; /** * Simple utils for converting {@link Writable} s diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/TransformProcess.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/TransformProcess.java index 7c57f4daa..9c6d66389 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/TransformProcess.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/TransformProcess.java @@ -64,7 +64,7 @@ import org.datavec.api.transform.transform.time.TimeMathOpTransform; import org.datavec.api.writable.*; import org.datavec.api.writable.comparator.WritableComparator; import org.joda.time.DateTimeZone; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.annotation.JsonProperty; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.databind.exc.InvalidTypeIdException; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/QualityAnalysisAddFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/QualityAnalysisAddFunction.java index 3698df41c..ee90a1b0f 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/QualityAnalysisAddFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/QualityAnalysisAddFunction.java @@ -28,7 +28,7 @@ import org.datavec.api.transform.analysis.quality.time.TimeQualityAnalysisState; import org.datavec.api.transform.metadata.*; import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; import java.util.ArrayList; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/QualityAnalysisCombineFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/QualityAnalysisCombineFunction.java index 7ff6904d0..ece0526ee 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/QualityAnalysisCombineFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/QualityAnalysisCombineFunction.java @@ -16,7 +16,7 @@ package org.datavec.api.transform.analysis.quality; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; import java.util.ArrayList; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/categorical/CategoricalQualityAddFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/categorical/CategoricalQualityAddFunction.java index e96997456..25fc463bd 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/categorical/CategoricalQualityAddFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/categorical/CategoricalQualityAddFunction.java @@ -22,7 +22,7 @@ import org.datavec.api.transform.quality.columns.CategoricalQuality; import org.datavec.api.writable.NullWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/categorical/CategoricalQualityMergeFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/categorical/CategoricalQualityMergeFunction.java index b4ff2ff9d..231b1e785 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/categorical/CategoricalQualityMergeFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/categorical/CategoricalQualityMergeFunction.java @@ -17,7 +17,7 @@ package org.datavec.api.transform.analysis.quality.categorical; import org.datavec.api.transform.quality.columns.CategoricalQuality; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/integer/IntegerQualityAddFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/integer/IntegerQualityAddFunction.java index 622c1cc97..121c3b0cf 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/integer/IntegerQualityAddFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/integer/IntegerQualityAddFunction.java @@ -22,7 +22,7 @@ import org.datavec.api.transform.quality.columns.IntegerQuality; import org.datavec.api.writable.NullWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/integer/IntegerQualityMergeFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/integer/IntegerQualityMergeFunction.java index 72e8337a5..d77b70f30 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/integer/IntegerQualityMergeFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/integer/IntegerQualityMergeFunction.java @@ -17,7 +17,7 @@ package org.datavec.api.transform.analysis.quality.integer; import org.datavec.api.transform.quality.columns.IntegerQuality; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/longq/LongQualityAddFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/longq/LongQualityAddFunction.java index e20ed4785..83ab500fa 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/longq/LongQualityAddFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/longq/LongQualityAddFunction.java @@ -22,7 +22,7 @@ import org.datavec.api.transform.quality.columns.LongQuality; import org.datavec.api.writable.NullWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/longq/LongQualityMergeFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/longq/LongQualityMergeFunction.java index 5cd00d705..fe4163fe9 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/longq/LongQualityMergeFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/longq/LongQualityMergeFunction.java @@ -17,7 +17,7 @@ package org.datavec.api.transform.analysis.quality.longq; import org.datavec.api.transform.quality.columns.LongQuality; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/real/RealQualityAddFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/real/RealQualityAddFunction.java index 0a6a5594c..561deacd4 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/real/RealQualityAddFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/real/RealQualityAddFunction.java @@ -22,7 +22,7 @@ import org.datavec.api.transform.quality.columns.DoubleQuality; import org.datavec.api.writable.NullWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/real/RealQualityMergeFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/real/RealQualityMergeFunction.java index b5d3fea68..8a3243863 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/real/RealQualityMergeFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/real/RealQualityMergeFunction.java @@ -17,7 +17,7 @@ package org.datavec.api.transform.analysis.quality.real; import org.datavec.api.transform.quality.columns.DoubleQuality; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/string/StringQualityAddFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/string/StringQualityAddFunction.java index 2c33d4a54..0b3da66f8 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/string/StringQualityAddFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/string/StringQualityAddFunction.java @@ -22,7 +22,7 @@ import org.datavec.api.transform.metadata.StringMetaData; import org.datavec.api.transform.quality.columns.StringQuality; import org.datavec.api.writable.NullWritable; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/string/StringQualityMergeFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/string/StringQualityMergeFunction.java index 8bd65848b..09deeabaa 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/string/StringQualityMergeFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/string/StringQualityMergeFunction.java @@ -17,7 +17,7 @@ package org.datavec.api.transform.analysis.quality.string; import org.datavec.api.transform.quality.columns.StringQuality; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/time/TimeQualityAddFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/time/TimeQualityAddFunction.java index c445fea7f..1d37b4b86 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/time/TimeQualityAddFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/time/TimeQualityAddFunction.java @@ -22,7 +22,7 @@ import org.datavec.api.transform.quality.columns.TimeQuality; import org.datavec.api.writable.NullWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/time/TimeQualityMergeFunction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/time/TimeQualityMergeFunction.java index 55625ad70..8a2c3acfd 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/time/TimeQualityMergeFunction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/analysis/quality/time/TimeQualityMergeFunction.java @@ -17,7 +17,7 @@ package org.datavec.api.transform.analysis.quality.time; import org.datavec.api.transform.quality.columns.TimeQuality; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/ops/IAggregableReduceOp.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/ops/IAggregableReduceOp.java index d999bfe73..b9a7f2832 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/ops/IAggregableReduceOp.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/ops/IAggregableReduceOp.java @@ -16,8 +16,8 @@ package org.datavec.api.transform.ops; -import org.nd4j.linalg.function.Consumer; -import org.nd4j.linalg.function.Supplier; +import org.nd4j.common.function.Consumer; +import org.nd4j.common.function.Supplier; import java.io.Serializable; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/reduce/impl/GeographicMidpointReduction.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/reduce/impl/GeographicMidpointReduction.java index 1e63f4980..4e6862dee 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/reduce/impl/GeographicMidpointReduction.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/reduce/impl/GeographicMidpointReduction.java @@ -24,7 +24,7 @@ import org.datavec.api.transform.reduce.AggregableColumnReduction; import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.shade.jackson.annotation.JsonProperty; import java.util.Collections; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/trim/SequenceTrimToLengthTransform.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/trim/SequenceTrimToLengthTransform.java index c2527629b..53ddcc7ce 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/trim/SequenceTrimToLengthTransform.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/trim/SequenceTrimToLengthTransform.java @@ -5,7 +5,7 @@ import lombok.EqualsAndHashCode; import org.datavec.api.transform.Transform; import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.Writable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.shade.jackson.annotation.JsonIgnoreProperties; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/categorical/FirstDigitTransform.java b/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/categorical/FirstDigitTransform.java index f244a71ad..4c873f059 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/categorical/FirstDigitTransform.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/categorical/FirstDigitTransform.java @@ -22,7 +22,7 @@ import org.datavec.api.transform.schema.Schema; import org.datavec.api.transform.transform.BaseTransform; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.shade.jackson.annotation.JsonIgnoreProperties; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/util/ClassPathResource.java b/datavec/datavec-api/src/main/java/org/datavec/api/util/ClassPathResource.java index 8445e1aa5..6aa59b705 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/util/ClassPathResource.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/util/ClassPathResource.java @@ -16,22 +16,11 @@ package org.datavec.api.util; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.*; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - /** - * @deprecated Use {@link org.nd4j.linalg.io.ClassPathResource} + * @deprecated Use {@link org.nd4j.common.io.ClassPathResource} */ @Deprecated -public class ClassPathResource extends org.nd4j.linalg.io.ClassPathResource { +public class ClassPathResource extends org.nd4j.common.io.ClassPathResource { @Deprecated public ClassPathResource(String resourceName) { diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/util/ReflectionUtils.java b/datavec/datavec-api/src/main/java/org/datavec/api/util/ReflectionUtils.java index 0b3c1bab8..100e72c44 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/util/ReflectionUtils.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/util/ReflectionUtils.java @@ -29,10 +29,10 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; /** - * @deprecated Use {@link org.nd4j.util.ReflectionUtils} + * @deprecated Use {@link org.nd4j.common.util.ReflectionUtils} */ @Deprecated -public class ReflectionUtils extends org.nd4j.util.ReflectionUtils { +public class ReflectionUtils extends org.nd4j.common.util.ReflectionUtils { private static final Class[] EMPTY_ARRAY = new Class[] {}; private static SerializationFactory serialFactory = null; diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/writable/NDArrayWritable.java b/datavec/datavec-api/src/main/java/org/datavec/api/writable/NDArrayWritable.java index 8d42feaaf..499e77895 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/writable/NDArrayWritable.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/writable/NDArrayWritable.java @@ -24,7 +24,7 @@ import org.nd4j.linalg.api.iter.NdIndexIterator; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.util.MathUtils; import java.io.*; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/AssertTestsExtendBaseClass.java b/datavec/datavec-api/src/test/java/org/datavec/api/AssertTestsExtendBaseClass.java index 43c606123..1a152de97 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/AssertTestsExtendBaseClass.java @@ -19,8 +19,8 @@ import lombok.extern.slf4j.Slf4j; import org.datavec.api.transform.serde.testClasses.CustomCondition; import org.datavec.api.transform.serde.testClasses.CustomFilter; import org.datavec.api.transform.serde.testClasses.CustomTransform; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVLineSequenceRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVLineSequenceRecordReaderTest.java index 84d9b259f..6ef636a1f 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVLineSequenceRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVLineSequenceRecordReaderTest.java @@ -25,7 +25,7 @@ import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVMultiSequenceRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVMultiSequenceRecordReaderTest.java index c293d4544..157699f35 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVMultiSequenceRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVMultiSequenceRecordReaderTest.java @@ -20,14 +20,12 @@ import org.apache.commons.io.FileUtils; import org.datavec.api.records.reader.SequenceRecordReader; import org.datavec.api.records.reader.impl.csv.CSVMultiSequenceRecordReader; import org.datavec.api.split.FileSplit; -import org.datavec.api.split.StringSplit; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.api.ops.impl.controlflow.compat.BaseCompatOp; +import org.nd4j.common.tests.BaseND4JTest; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVNLinesSequenceRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVNLinesSequenceRecordReaderTest.java index 9f297d83b..dee9d3876 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVNLinesSequenceRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVNLinesSequenceRecordReaderTest.java @@ -24,8 +24,8 @@ import org.datavec.api.records.reader.impl.csv.CSVRecordReader; import org.datavec.api.split.FileSplit; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVRecordReaderTest.java index 471dc07c4..6d070296e 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVRecordReaderTest.java @@ -31,8 +31,8 @@ import org.datavec.api.writable.IntWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.io.IOException; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVSequenceRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVSequenceRecordReaderTest.java index e0763bbbc..a25dff0d3 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVSequenceRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVSequenceRecordReaderTest.java @@ -26,8 +26,8 @@ import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.io.InputStream; @@ -237,11 +237,11 @@ public class CSVSequenceRecordReaderTest extends BaseND4JTest { File baseDir = tempDir.newFolder(); //Simple sanity check unit test for (int i = 0; i < 3; i++) { - new org.nd4j.linalg.io.ClassPathResource(String.format("csvsequence_%d.txt", i)).getTempFileFromArchive(baseDir); + new ClassPathResource(String.format("csvsequence_%d.txt", i)).getTempFileFromArchive(baseDir); } //Load time series from CSV sequence files; compare to SequenceRecordReaderDataSetIterator - org.nd4j.linalg.io.ClassPathResource resource = new org.nd4j.linalg.io.ClassPathResource("csvsequence_0.txt"); + ClassPathResource resource = new ClassPathResource("csvsequence_0.txt"); String featuresPath = new File(baseDir, "csvsequence_%d.txt").getAbsolutePath(); SequenceRecordReader featureReader = new CSVSequenceRecordReader(1, ","); diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVVariableSlidingWindowRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVVariableSlidingWindowRecordReaderTest.java index fe0c94c4c..bfe41e5bc 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVVariableSlidingWindowRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/CSVVariableSlidingWindowRecordReaderTest.java @@ -22,8 +22,8 @@ import org.datavec.api.records.reader.impl.csv.CSVVariableSlidingWindowRecordRea import org.datavec.api.split.FileSplit; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.util.LinkedList; import java.util.List; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/FileBatchRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/FileBatchRecordReaderTest.java index d6f03d815..b8b32a3de 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/FileBatchRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/FileBatchRecordReaderTest.java @@ -27,8 +27,8 @@ import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; -import org.nd4j.api.loader.FileBatch; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.loader.FileBatch; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/FileRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/FileRecordReaderTest.java index 6bf66880f..303eb1ff5 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/FileRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/FileRecordReaderTest.java @@ -23,8 +23,8 @@ import org.datavec.api.split.FileSplit; import org.datavec.api.split.InputSplit; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.net.URI; import java.util.ArrayList; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/JacksonLineRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/JacksonLineRecordReaderTest.java index 2f91579f0..642da6d69 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/JacksonLineRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/JacksonLineRecordReaderTest.java @@ -27,8 +27,8 @@ import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.shade.jackson.core.JsonFactory; import org.nd4j.shade.jackson.databind.ObjectMapper; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/JacksonRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/JacksonRecordReaderTest.java index f1fa8d6b2..b6b32edc7 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/JacksonRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/JacksonRecordReaderTest.java @@ -30,8 +30,8 @@ import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.shade.jackson.core.JsonFactory; import org.nd4j.shade.jackson.databind.ObjectMapper; import org.nd4j.shade.jackson.dataformat.xml.XmlFactory; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/LibSvmRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/LibSvmRecordReaderTest.java index 5e8ca6546..f24e7b297 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/LibSvmRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/LibSvmRecordReaderTest.java @@ -24,8 +24,8 @@ import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.IntWritable; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; import java.util.*; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/LineReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/LineReaderTest.java index 17a41f4d4..2864d0ca1 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/LineReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/LineReaderTest.java @@ -29,9 +29,7 @@ import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.nd4j.common.tests.BaseND4JTest; import java.io.File; import java.io.FileInputStream; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/RegexRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/RegexRecordReaderTest.java index 539b0f351..08b494d9f 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/RegexRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/RegexRecordReaderTest.java @@ -32,8 +32,8 @@ import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.ArrayList; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/SVMLightRecordReaderTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/SVMLightRecordReaderTest.java index 25d2959ce..07b507fe0 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/SVMLightRecordReaderTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/SVMLightRecordReaderTest.java @@ -24,8 +24,8 @@ import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.IntWritable; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; import java.util.*; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestCollectionRecordReaders.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestCollectionRecordReaders.java index fa68c4a1f..2d5b35a63 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestCollectionRecordReaders.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestCollectionRecordReaders.java @@ -23,7 +23,7 @@ import org.datavec.api.records.reader.impl.collection.CollectionSequenceRecordRe import org.datavec.api.writable.IntWritable; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestConcatenatingRecordReader.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestConcatenatingRecordReader.java index 266ad2edc..0b64d53f3 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestConcatenatingRecordReader.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestConcatenatingRecordReader.java @@ -20,8 +20,8 @@ import org.datavec.api.records.reader.RecordReader; import org.datavec.api.records.reader.impl.csv.CSVRecordReader; import org.datavec.api.split.FileSplit; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import static org.junit.Assert.assertEquals; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestSerialization.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestSerialization.java index 91fc22886..030c1f139 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestSerialization.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/TestSerialization.java @@ -34,8 +34,8 @@ import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.shade.jackson.core.JsonFactory; import org.nd4j.shade.jackson.databind.ObjectMapper; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/transform/TransformProcessRecordReaderTests.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/transform/TransformProcessRecordReaderTests.java index ff3ceb9be..87c466fec 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/transform/TransformProcessRecordReaderTests.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/reader/impl/transform/TransformProcessRecordReaderTests.java @@ -27,8 +27,8 @@ import org.datavec.api.writable.LongWritable; import org.datavec.api.writable.Writable; import org.joda.time.DateTimeZone; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/CSVRecordWriterTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/CSVRecordWriterTest.java index c3a8f4181..887f4c109 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/CSVRecordWriterTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/CSVRecordWriterTest.java @@ -24,7 +24,7 @@ import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Before; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.io.File; import java.util.ArrayList; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/LibSvmRecordWriterTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/LibSvmRecordWriterTest.java index 91996056d..8e9240bef 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/LibSvmRecordWriterTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/LibSvmRecordWriterTest.java @@ -27,10 +27,10 @@ import org.datavec.api.writable.IntWritable; import org.datavec.api.writable.NDArrayWritable; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.ArrayList; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/SVMLightRecordWriterTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/SVMLightRecordWriterTest.java index f057c7d45..b27af0cf1 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/SVMLightRecordWriterTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/records/writer/impl/SVMLightRecordWriterTest.java @@ -25,10 +25,10 @@ import org.datavec.api.split.partition.NumberOfRecordsPartitioner; import org.datavec.api.writable.*; import org.datavec.api.writable.NDArrayWritable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.ArrayList; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/split/InputSplitTests.java b/datavec/datavec-api/src/test/java/org/datavec/api/split/InputSplitTests.java index 59e1feee8..1e6a25cbc 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/split/InputSplitTests.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/split/InputSplitTests.java @@ -16,7 +16,7 @@ package org.datavec.api.split; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.shade.guava.io.Files; import org.datavec.api.io.filters.BalancedPathFilter; import org.datavec.api.io.filters.RandomPathFilter; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/split/NumberedFileInputSplitTests.java b/datavec/datavec-api/src/test/java/org/datavec/api/split/NumberedFileInputSplitTests.java index f8be04d47..229eec8cd 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/split/NumberedFileInputSplitTests.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/split/NumberedFileInputSplitTests.java @@ -17,7 +17,7 @@ package org.datavec.api.split; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.net.URI; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/split/TestStreamInputSplit.java b/datavec/datavec-api/src/test/java/org/datavec/api/split/TestStreamInputSplit.java index 94119015c..573824ae1 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/split/TestStreamInputSplit.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/split/TestStreamInputSplit.java @@ -24,8 +24,8 @@ import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.function.Function; import java.io.File; import java.io.FileInputStream; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/split/TransformSplitTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/split/TransformSplitTest.java index ea6b9fea4..b37214ef1 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/split/TransformSplitTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/split/TransformSplitTest.java @@ -17,7 +17,7 @@ package org.datavec.api.split; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.net.URI; import java.net.URISyntaxException; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/split/parittion/PartitionerTests.java b/datavec/datavec-api/src/test/java/org/datavec/api/split/parittion/PartitionerTests.java index f27f7527f..e57a9a072 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/split/parittion/PartitionerTests.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/split/parittion/PartitionerTests.java @@ -16,7 +16,7 @@ package org.datavec.api.split.parittion; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.shade.guava.io.Files; import org.datavec.api.conf.Configuration; import org.datavec.api.split.FileSplit; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/TestTransformProcess.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/TestTransformProcess.java index efb9f2b6e..514e4235b 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/TestTransformProcess.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/TestTransformProcess.java @@ -26,7 +26,7 @@ import org.datavec.api.writable.IntWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/condition/TestConditions.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/condition/TestConditions.java index 0c69959d6..5afae3d39 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/condition/TestConditions.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/condition/TestConditions.java @@ -24,7 +24,7 @@ import org.datavec.api.transform.schema.Schema; import org.datavec.api.transform.transform.TestTransforms; import org.datavec.api.writable.*; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/filter/TestFilters.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/filter/TestFilters.java index 314ee72ff..e321f9afe 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/filter/TestFilters.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/filter/TestFilters.java @@ -24,7 +24,7 @@ import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.IntWritable; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/join/TestJoin.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/join/TestJoin.java index 1d113c6ff..14ada81b2 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/join/TestJoin.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/join/TestJoin.java @@ -23,7 +23,7 @@ import org.datavec.api.writable.NullWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/AggregableMultiOpTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/AggregableMultiOpTest.java index 57ec54e8a..3e032f329 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/AggregableMultiOpTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/AggregableMultiOpTest.java @@ -18,7 +18,7 @@ package org.datavec.api.transform.ops; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.io.Serializable; import java.util.*; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/AggregatorImplsTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/AggregatorImplsTest.java index c722dada4..e7afeefdf 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/AggregatorImplsTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/AggregatorImplsTest.java @@ -19,7 +19,7 @@ package org.datavec.api.transform.ops; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/DispatchOpTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/DispatchOpTest.java index a636e7239..667bd77f0 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/DispatchOpTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/ops/DispatchOpTest.java @@ -18,7 +18,7 @@ package org.datavec.api.transform.ops; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/reduce/TestMultiOpReduce.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/reduce/TestMultiOpReduce.java index 9aef39aa4..f75118174 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/reduce/TestMultiOpReduce.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/reduce/TestMultiOpReduce.java @@ -29,7 +29,7 @@ import org.datavec.api.transform.ops.IAggregableReduceOp; import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.*; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/reduce/TestReductions.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/reduce/TestReductions.java index dc6443630..89466e4b5 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/reduce/TestReductions.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/reduce/TestReductions.java @@ -21,7 +21,7 @@ import org.datavec.api.transform.reduce.impl.GeographicMidpointReduction; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.Arrays; import java.util.List; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/schema/TestJsonYaml.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/schema/TestJsonYaml.java index 8e33b742c..0daaaf0b3 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/schema/TestJsonYaml.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/schema/TestJsonYaml.java @@ -19,7 +19,7 @@ package org.datavec.api.transform.schema; import org.datavec.api.transform.metadata.ColumnMetaData; import org.joda.time.DateTimeZone; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import static org.junit.Assert.assertEquals; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/schema/TestSchemaMethods.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/schema/TestSchemaMethods.java index 6cbcafff4..d4e751471 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/schema/TestSchemaMethods.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/schema/TestSchemaMethods.java @@ -18,7 +18,7 @@ package org.datavec.api.transform.schema; import org.datavec.api.transform.ColumnType; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import static org.junit.Assert.assertEquals; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestReduceSequenceByWindowFunction.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestReduceSequenceByWindowFunction.java index 56c8d3f1e..47b595605 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestReduceSequenceByWindowFunction.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestReduceSequenceByWindowFunction.java @@ -30,7 +30,7 @@ import org.datavec.api.writable.NullWritable; import org.datavec.api.writable.Writable; import org.joda.time.DateTimeZone; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestSequenceSplit.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestSequenceSplit.java index 98dd49587..1245dbc49 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestSequenceSplit.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestSequenceSplit.java @@ -24,7 +24,7 @@ import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.joda.time.DateTimeZone; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestWindowFunctions.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestWindowFunctions.java index cc12adc53..7d5f4613c 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestWindowFunctions.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/sequence/TestWindowFunctions.java @@ -26,7 +26,7 @@ import org.datavec.api.writable.LongWritable; import org.datavec.api.writable.Writable; import org.joda.time.DateTimeZone; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/serde/TestCustomTransformJsonYaml.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/serde/TestCustomTransformJsonYaml.java index 1da9f48e5..5ae9181e4 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/serde/TestCustomTransformJsonYaml.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/serde/TestCustomTransformJsonYaml.java @@ -23,7 +23,7 @@ import org.datavec.api.transform.serde.testClasses.CustomCondition; import org.datavec.api.transform.serde.testClasses.CustomFilter; import org.datavec.api.transform.serde.testClasses.CustomTransform; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import static org.junit.Assert.assertEquals; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/serde/TestYamlJsonSerde.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/serde/TestYamlJsonSerde.java index dd6e0941a..dd000429c 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/serde/TestYamlJsonSerde.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/serde/TestYamlJsonSerde.java @@ -61,7 +61,7 @@ import org.datavec.api.writable.comparator.DoubleWritableComparator; import org.joda.time.DateTimeFieldType; import org.joda.time.DateTimeZone; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/stringreduce/TestReduce.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/stringreduce/TestReduce.java index ac69e3397..fc5d313f3 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/stringreduce/TestReduce.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/stringreduce/TestReduce.java @@ -21,7 +21,7 @@ import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/RegressionTestJson.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/RegressionTestJson.java index daa5c15c8..da8f8656f 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/RegressionTestJson.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/RegressionTestJson.java @@ -47,8 +47,8 @@ import org.datavec.api.writable.comparator.LongWritableComparator; import org.joda.time.DateTimeFieldType; import org.joda.time.DateTimeZone; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestJsonYaml.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestJsonYaml.java index 00c4b745f..2264725ff 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestJsonYaml.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestJsonYaml.java @@ -47,7 +47,7 @@ import org.datavec.api.writable.comparator.LongWritableComparator; import org.joda.time.DateTimeFieldType; import org.joda.time.DateTimeZone; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java index 1d440913b..90e129db4 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java @@ -56,7 +56,7 @@ import org.joda.time.DateTimeFieldType; import org.joda.time.DateTimeZone; import org.junit.Assert; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/ndarray/TestNDArrayWritableTransforms.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/ndarray/TestNDArrayWritableTransforms.java index c6dad8359..7d0743908 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/ndarray/TestNDArrayWritableTransforms.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/ndarray/TestNDArrayWritableTransforms.java @@ -26,7 +26,7 @@ import org.datavec.api.writable.NDArrayWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/ndarray/TestYamlJsonSerde.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/ndarray/TestYamlJsonSerde.java index 394457443..4ff4b6c40 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/ndarray/TestYamlJsonSerde.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/ndarray/TestYamlJsonSerde.java @@ -27,7 +27,7 @@ import org.datavec.api.transform.schema.Schema; import org.datavec.api.transform.serde.JsonSerializer; import org.datavec.api.transform.serde.YamlSerializer; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.Arrays; import java.util.List; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/parse/ParseDoubleTransformTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/parse/ParseDoubleTransformTest.java index 4c2c718ae..533b37aea 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/parse/ParseDoubleTransformTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/parse/ParseDoubleTransformTest.java @@ -20,7 +20,7 @@ import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/ui/TestUI.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/ui/TestUI.java index 64f6a4422..31de9d3df 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/ui/TestUI.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/ui/TestUI.java @@ -35,7 +35,7 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.io.File; import java.util.ArrayList; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/util/ClassPathResourceTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/util/ClassPathResourceTest.java index b68ae43ee..037eb52c0 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/util/ClassPathResourceTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/util/ClassPathResourceTest.java @@ -18,7 +18,7 @@ package org.datavec.api.util; import org.junit.Before; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.io.BufferedReader; import java.io.File; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/util/TimeSeriesUtilsTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/util/TimeSeriesUtilsTest.java index d47ec60d7..389c8f311 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/util/TimeSeriesUtilsTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/util/TimeSeriesUtilsTest.java @@ -20,7 +20,7 @@ import org.datavec.api.timeseries.util.TimeSeriesWritableUtils; import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import java.util.ArrayList; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/writable/RecordConverterTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/writable/RecordConverterTest.java index dbc62ed93..b03c289c5 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/writable/RecordConverterTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/writable/RecordConverterTest.java @@ -16,7 +16,7 @@ package org.datavec.api.writable; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.shade.guava.collect.Lists; import org.datavec.api.transform.schema.Schema; import org.datavec.api.util.ndarray.RecordConverter; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/writable/TestNDArrayWritableAndSerialization.java b/datavec/datavec-api/src/test/java/org/datavec/api/writable/TestNDArrayWritableAndSerialization.java index 9242927e1..635126ab2 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/writable/TestNDArrayWritableAndSerialization.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/writable/TestNDArrayWritableAndSerialization.java @@ -18,7 +18,7 @@ package org.datavec.api.writable; import org.datavec.api.transform.metadata.NDArrayMetaData; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/writable/WritableTest.java b/datavec/datavec-api/src/test/java/org/datavec/api/writable/WritableTest.java index bd636e62b..b9ef96991 100644 --- a/datavec/datavec-api/src/test/java/org/datavec/api/writable/WritableTest.java +++ b/datavec/datavec-api/src/test/java/org/datavec/api/writable/WritableTest.java @@ -18,7 +18,7 @@ package org.datavec.api.writable; import org.datavec.api.writable.batch.NDArrayRecordBatch; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/datavec/datavec-arrow/src/main/java/org/datavec/arrow/ArrowConverter.java b/datavec/datavec-arrow/src/main/java/org/datavec/arrow/ArrowConverter.java index f66475357..0169276d5 100644 --- a/datavec/datavec-arrow/src/main/java/org/datavec/arrow/ArrowConverter.java +++ b/datavec/datavec-arrow/src/main/java/org/datavec/arrow/ArrowConverter.java @@ -47,7 +47,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalArgumentException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.serde.binary.BinarySerde; import java.io.File; diff --git a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/ArrowConverterTest.java b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/ArrowConverterTest.java index 5f87d7ce3..6a6099a06 100644 --- a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/ArrowConverterTest.java +++ b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/ArrowConverterTest.java @@ -41,10 +41,10 @@ import org.datavec.arrow.recordreader.ArrowWritableRecordBatch; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/AssertTestsExtendBaseClass.java b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/AssertTestsExtendBaseClass.java index f2cf7ce09..c8868e271 100644 --- a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.arrow; import lombok.extern.slf4j.Slf4j; -import org.nd4j.BaseND4JTest; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; import java.util.*; diff --git a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/RecordMapperTest.java b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/RecordMapperTest.java index 59ba5a546..c5012f146 100644 --- a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/RecordMapperTest.java +++ b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/RecordMapperTest.java @@ -31,8 +31,8 @@ import org.datavec.api.writable.Writable; import org.datavec.arrow.recordreader.ArrowRecordReader; import org.datavec.arrow.recordreader.ArrowRecordWriter; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.primitives.Triple; import java.io.File; import java.nio.file.Files; diff --git a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/recordreader/ArrowWritableRecordTimeSeriesBatchTests.java b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/recordreader/ArrowWritableRecordTimeSeriesBatchTests.java index e49a9fcc4..5100b6826 100644 --- a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/recordreader/ArrowWritableRecordTimeSeriesBatchTests.java +++ b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/recordreader/ArrowWritableRecordTimeSeriesBatchTests.java @@ -27,7 +27,7 @@ import org.datavec.api.writable.Writable; import org.datavec.arrow.ArrowConverter; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/AssertTestsExtendBaseClass.java b/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/AssertTestsExtendBaseClass.java index f2c1bbb75..20cc1ee1f 100644 --- a/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.audio; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/AudioReaderTest.java b/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/AudioReaderTest.java index 96e91cf29..f0c02ab32 100644 --- a/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/AudioReaderTest.java +++ b/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/AudioReaderTest.java @@ -24,7 +24,7 @@ import org.datavec.api.writable.Writable; import org.datavec.audio.recordreader.NativeAudioRecordReader; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.io.File; import java.nio.ShortBuffer; diff --git a/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/TestFastFourierTransform.java b/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/TestFastFourierTransform.java index 0a6660e14..3f5434cd8 100644 --- a/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/TestFastFourierTransform.java +++ b/datavec/datavec-data/datavec-data-audio/src/test/java/org/datavec/audio/TestFastFourierTransform.java @@ -19,7 +19,7 @@ package org.datavec.audio; import org.datavec.audio.dsp.FastFourierTransform; import org.junit.Assert; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; public class TestFastFourierTransform extends BaseND4JTest { diff --git a/datavec/datavec-data/datavec-data-codec/src/test/java/org/datavec/codec/reader/AssertTestsExtendBaseClass.java b/datavec/datavec-data/datavec-data-codec/src/test/java/org/datavec/codec/reader/AssertTestsExtendBaseClass.java index dc450ddc6..611915bb0 100644 --- a/datavec/datavec-data/datavec-data-codec/src/test/java/org/datavec/codec/reader/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-data/datavec-data-codec/src/test/java/org/datavec/codec/reader/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.codec.reader; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-data/datavec-data-codec/src/test/java/org/datavec/codec/reader/CodecReaderTest.java b/datavec/datavec-data/datavec-data-codec/src/test/java/org/datavec/codec/reader/CodecReaderTest.java index a09e81680..7190efa10 100644 --- a/datavec/datavec-data/datavec-data-codec/src/test/java/org/datavec/codec/reader/CodecReaderTest.java +++ b/datavec/datavec-data/datavec-data-codec/src/test/java/org/datavec/codec/reader/CodecReaderTest.java @@ -25,7 +25,7 @@ import org.datavec.api.writable.ArrayWritable; import org.datavec.api.writable.Writable; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.DataInputStream; import java.io.File; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/BaseImageLoader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/BaseImageLoader.java index 6ec7b0935..d2518eeb6 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/BaseImageLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/BaseImageLoader.java @@ -20,7 +20,7 @@ import org.apache.commons.io.FileUtils; import org.datavec.image.data.Image; import org.datavec.image.transform.ImageTransform; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.util.ArchiveUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/CifarLoader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/CifarLoader.java index aad54ad46..3d390c698 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/CifarLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/CifarLoader.java @@ -20,7 +20,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.bytedeco.javacv.OpenCVFrameConverter; import org.nd4j.linalg.api.ops.impl.reduce.same.Sum; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.datavec.image.data.ImageWritable; import org.datavec.image.transform.ColorConversionTransform; import org.datavec.image.transform.EqualizeHistTransform; @@ -35,7 +35,7 @@ import java.nio.ByteBuffer; import java.util.*; import org.bytedeco.opencv.opencv_core.*; -import org.bytedeco.opencv.opencv_imgproc.*; + import static org.bytedeco.opencv.global.opencv_core.*; import static org.bytedeco.opencv.global.opencv_imgproc.*; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/ImageLoader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/ImageLoader.java index 27c0c019d..d246c65ad 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/ImageLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/ImageLoader.java @@ -20,7 +20,7 @@ import com.github.jaiimageio.impl.plugins.tiff.TIFFImageReaderSpi; import com.github.jaiimageio.impl.plugins.tiff.TIFFImageWriterSpi; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.util.NDArrayUtil; import javax.imageio.ImageIO; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/NativeImageLoader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/NativeImageLoader.java index d2be87536..88bc161f2 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/NativeImageLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/NativeImageLoader.java @@ -24,7 +24,6 @@ import org.bytedeco.javacv.OpenCVFrameConverter; import org.datavec.image.data.Image; import org.datavec.image.data.ImageWritable; import org.datavec.image.transform.ImageTransform; -import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.concurrency.AffinityManager; import org.nd4j.linalg.api.memory.pointers.PagedPointer; import org.nd4j.linalg.api.ndarray.INDArray; @@ -32,14 +31,14 @@ import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.io.*; import java.nio.ByteOrder; import org.bytedeco.leptonica.*; import org.bytedeco.opencv.opencv_core.*; -import org.bytedeco.opencv.opencv_imgproc.*; + import static org.bytedeco.leptonica.global.lept.*; import static org.bytedeco.opencv.global.opencv_core.*; import static org.bytedeco.opencv.global.opencv_imgcodecs.*; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/mnist/MnistFetcher.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/mnist/MnistFetcher.java index b953c088f..5d2e6a2e1 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/mnist/MnistFetcher.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/mnist/MnistFetcher.java @@ -17,7 +17,7 @@ package org.datavec.image.mnist; import org.apache.commons.io.FileUtils; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.util.ArchiveUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/objdetect/ObjectDetectionRecordReader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/objdetect/ObjectDetectionRecordReader.java index b761b3143..1a53a05ac 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/objdetect/ObjectDetectionRecordReader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/objdetect/ObjectDetectionRecordReader.java @@ -26,7 +26,7 @@ import org.datavec.image.data.Image; import org.datavec.image.loader.NativeImageLoader; import org.datavec.image.recordreader.BaseImageRecordReader; import org.datavec.image.util.ImageUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.concurrency.AffinityManager; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/transform/PipelineImageTransform.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/transform/PipelineImageTransform.java index a1c87ab6b..9820c7ac7 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/transform/PipelineImageTransform.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/transform/PipelineImageTransform.java @@ -21,12 +21,11 @@ import lombok.NonNull; import org.datavec.image.data.ImageWritable; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; import org.bytedeco.opencv.opencv_core.*; -import static org.bytedeco.opencv.global.opencv_core.*; /** * Allows creation of image transform pipelines, either sequentially or randomly. diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/AssertTestsExtendBaseClass.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/AssertTestsExtendBaseClass.java index ea22492ef..53b1f083a 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.image; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/LabelGeneratorTest.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/LabelGeneratorTest.java index 7b39f193e..44c32f94f 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/LabelGeneratorTest.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/LabelGeneratorTest.java @@ -23,7 +23,7 @@ import org.datavec.image.recordreader.ImageRecordReader; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.Arrays; diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/TestNativeImageLoader.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/TestNativeImageLoader.java index 9d139cbf5..6e7705569 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/TestNativeImageLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/TestNativeImageLoader.java @@ -31,7 +31,7 @@ import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.awt.image.BufferedImage; import java.io.File; diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/FileBatchRecordReaderTest.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/FileBatchRecordReaderTest.java index 6beb8612c..75020ebf1 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/FileBatchRecordReaderTest.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/FileBatchRecordReaderTest.java @@ -27,9 +27,9 @@ import org.datavec.image.loader.NativeImageLoader; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.api.loader.FileBatch; +import org.nd4j.common.loader.FileBatch; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.*; diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestImageRecordReader.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestImageRecordReader.java index d0aad0cde..80cb9b0af 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestImageRecordReader.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestImageRecordReader.java @@ -32,14 +32,13 @@ import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.NDArrayWritable; import org.datavec.api.writable.Writable; import org.datavec.api.writable.batch.NDArrayRecordBatch; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.io.IOException; diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestObjectDetectionRecordReader.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestObjectDetectionRecordReader.java index 70debdc71..d8620096a 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestObjectDetectionRecordReader.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/TestObjectDetectionRecordReader.java @@ -38,7 +38,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.BooleanIndexing; import org.nd4j.linalg.indexing.conditions.Conditions; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.net.URI; diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/objdetect/TestVocLabelProvider.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/objdetect/TestVocLabelProvider.java index 9d7ec6fff..9d12ced22 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/objdetect/TestVocLabelProvider.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/recordreader/objdetect/TestVocLabelProvider.java @@ -20,7 +20,7 @@ import org.datavec.image.recordreader.objdetect.impl.VocLabelProvider; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.Arrays; diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/transform/TestImageTransform.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/transform/TestImageTransform.java index 53c1b466a..bd71a1029 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/transform/TestImageTransform.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/transform/TestImageTransform.java @@ -20,8 +20,8 @@ import org.bytedeco.javacpp.indexer.UByteIndexer; import org.bytedeco.javacv.CanvasFrame; import org.bytedeco.javacv.Frame; import org.bytedeco.javacv.OpenCVFrameConverter; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.primitives.Pair; import org.datavec.image.data.ImageWritable; import org.datavec.image.loader.NativeImageLoader; import org.junit.Ignore; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Random; import org.bytedeco.opencv.opencv_core.*; -import org.bytedeco.opencv.opencv_imgproc.*; + import static org.bytedeco.opencv.global.opencv_core.*; import static org.bytedeco.opencv.global.opencv_imgproc.*; import static org.junit.Assert.*; diff --git a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/metadata/DefaultVocabCache.java b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/metadata/DefaultVocabCache.java index bf6c80b24..16dff8e5f 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/metadata/DefaultVocabCache.java +++ b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/metadata/DefaultVocabCache.java @@ -16,11 +16,11 @@ package org.datavec.nlp.metadata; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import org.datavec.api.conf.Configuration; import org.datavec.nlp.vectorizer.TextVectorizer; -import org.nd4j.linalg.util.MathUtils; -import org.nd4j.util.Index; +import org.nd4j.common.util.MathUtils; +import org.nd4j.common.util.Index; /** * Vocab cache used for storing information diff --git a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/metadata/VocabCache.java b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/metadata/VocabCache.java index ba594796d..64fb1e8cb 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/metadata/VocabCache.java +++ b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/metadata/VocabCache.java @@ -18,7 +18,7 @@ package org.datavec.nlp.metadata; import org.datavec.api.conf.Configuration; -import org.nd4j.util.Index; +import org.nd4j.common.util.Index; /** * Track metadata about vocabs diff --git a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/movingwindow/ContextLabelRetriever.java b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/movingwindow/ContextLabelRetriever.java index 649968561..76b0244bd 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/movingwindow/ContextLabelRetriever.java +++ b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/movingwindow/ContextLabelRetriever.java @@ -18,9 +18,9 @@ package org.datavec.nlp.movingwindow; import org.apache.commons.lang3.StringUtils; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.collection.MultiDimensionalMap; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.collection.MultiDimensionalMap; +import org.nd4j.common.primitives.Pair; import org.datavec.nlp.tokenization.tokenizer.Tokenizer; import org.datavec.nlp.tokenization.tokenizerfactory.TokenizerFactory; diff --git a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/movingwindow/Util.java b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/movingwindow/Util.java index e757ee832..225b2190c 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/movingwindow/Util.java +++ b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/movingwindow/Util.java @@ -17,10 +17,9 @@ package org.datavec.nlp.movingwindow; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import java.util.List; -import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/transforms/TokenizerBagOfWordsTermSequenceIndexTransform.java b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/transforms/TokenizerBagOfWordsTermSequenceIndexTransform.java index 45863b23c..119cf4a21 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/transforms/TokenizerBagOfWordsTermSequenceIndexTransform.java +++ b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/transforms/TokenizerBagOfWordsTermSequenceIndexTransform.java @@ -31,8 +31,8 @@ import org.datavec.nlp.tokenization.tokenizerfactory.DefaultTokenizerFactory; import org.datavec.nlp.tokenization.tokenizerfactory.TokenizerFactory; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.util.MathUtils; import org.nd4j.shade.jackson.annotation.JsonCreator; import org.nd4j.shade.jackson.annotation.JsonInclude; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/vectorizer/TextVectorizer.java b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/vectorizer/TextVectorizer.java index efc72a2d2..dcf588ce9 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/vectorizer/TextVectorizer.java +++ b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/vectorizer/TextVectorizer.java @@ -17,12 +17,11 @@ package org.datavec.nlp.vectorizer; import lombok.Getter; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import org.datavec.api.conf.Configuration; import org.datavec.api.records.Record; import org.datavec.api.records.reader.RecordReader; import org.datavec.api.vector.Vectorizer; -import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.datavec.nlp.metadata.DefaultVocabCache; import org.datavec.nlp.metadata.VocabCache; @@ -30,9 +29,6 @@ import org.datavec.nlp.stopwords.StopWords; import org.datavec.nlp.tokenization.tokenizer.Tokenizer; import org.datavec.nlp.tokenization.tokenizerfactory.TokenizerFactory; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; import java.util.Collection; /** diff --git a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/vectorizer/TfidfVectorizer.java b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/vectorizer/TfidfVectorizer.java index 8df97c0d8..a730bc739 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/vectorizer/TfidfVectorizer.java +++ b/datavec/datavec-data/datavec-data-nlp/src/main/java/org/datavec/nlp/vectorizer/TfidfVectorizer.java @@ -18,7 +18,7 @@ package org.datavec.nlp.vectorizer; import org.datavec.api.conf.Configuration; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import org.datavec.api.records.Record; import org.datavec.api.records.metadata.RecordMetaDataURI; import org.datavec.api.records.reader.RecordReader; diff --git a/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/AssertTestsExtendBaseClass.java b/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/AssertTestsExtendBaseClass.java index 8739b7edb..533c6b3ad 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.nlp; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/reader/TfidfRecordReaderTest.java b/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/reader/TfidfRecordReaderTest.java index 72c3147ba..e0fddecad 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/reader/TfidfRecordReaderTest.java +++ b/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/reader/TfidfRecordReaderTest.java @@ -21,14 +21,13 @@ import org.datavec.api.records.Record; import org.datavec.api.records.reader.RecordReader; import org.datavec.api.split.CollectionInputSplit; import org.datavec.api.split.FileSplit; -import org.datavec.api.split.StreamInputSplit; import org.datavec.api.writable.NDArrayWritable; import org.datavec.api.writable.Writable; import org.datavec.nlp.vectorizer.TfidfVectorizer; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.net.URI; diff --git a/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/transforms/TokenizerBagOfWordsTermSequenceIndexTransformTest.java b/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/transforms/TokenizerBagOfWordsTermSequenceIndexTransformTest.java index 650b3a411..5dc1fd415 100644 --- a/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/transforms/TokenizerBagOfWordsTermSequenceIndexTransformTest.java +++ b/datavec/datavec-data/datavec-data-nlp/src/test/java/org/datavec/nlp/transforms/TokenizerBagOfWordsTermSequenceIndexTransformTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import java.util.*; diff --git a/datavec/datavec-data/datavec-geo/src/test/java/org/datavec/api/transform/transform/TestGeoTransforms.java b/datavec/datavec-data/datavec-geo/src/test/java/org/datavec/api/transform/transform/TestGeoTransforms.java index 93d3c2f3a..aa3e93494 100644 --- a/datavec/datavec-data/datavec-geo/src/test/java/org/datavec/api/transform/transform/TestGeoTransforms.java +++ b/datavec/datavec-data/datavec-geo/src/test/java/org/datavec/api/transform/transform/TestGeoTransforms.java @@ -30,7 +30,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.*; import java.util.Arrays; diff --git a/datavec/datavec-data/datavec-hadoop/src/test/java/org/datavec/hadoop/records/writer/TestMapFileRecordWriter.java b/datavec/datavec-data/datavec-hadoop/src/test/java/org/datavec/hadoop/records/writer/TestMapFileRecordWriter.java index 7cd112c63..c77c0898e 100644 --- a/datavec/datavec-data/datavec-hadoop/src/test/java/org/datavec/hadoop/records/writer/TestMapFileRecordWriter.java +++ b/datavec/datavec-data/datavec-hadoop/src/test/java/org/datavec/hadoop/records/writer/TestMapFileRecordWriter.java @@ -33,7 +33,7 @@ import org.datavec.hadoop.records.reader.mapfile.MapFileSequenceRecordReader; import org.datavec.hadoop.records.writer.mapfile.MapFileRecordWriter; import org.datavec.hadoop.records.writer.mapfile.MapFileSequenceRecordWriter; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.ArrayList; diff --git a/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/AssertTestsExtendBaseClass.java b/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/AssertTestsExtendBaseClass.java index 1b61f7f6c..6caac98a1 100644 --- a/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.poi.excel; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/ExcelRecordReaderTest.java b/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/ExcelRecordReaderTest.java index e02489745..fda21502f 100644 --- a/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/ExcelRecordReaderTest.java +++ b/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/ExcelRecordReaderTest.java @@ -20,7 +20,7 @@ import org.datavec.api.records.reader.RecordReader; import org.datavec.api.split.FileSplit; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.util.List; diff --git a/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/ExcelRecordWriterTest.java b/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/ExcelRecordWriterTest.java index 72f4c85ff..a967fe8b6 100644 --- a/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/ExcelRecordWriterTest.java +++ b/datavec/datavec-excel/src/test/java/org/datavec/poi/excel/ExcelRecordWriterTest.java @@ -25,10 +25,9 @@ import org.datavec.api.writable.Writable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import java.io.File; -import java.nio.file.Files; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-jdbc/src/main/java/org/datavec/api/records/metadata/RecordMetaDataJdbc.java b/datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/records/metadata/RecordMetaDataJdbc.java similarity index 95% rename from datavec/datavec-jdbc/src/main/java/org/datavec/api/records/metadata/RecordMetaDataJdbc.java rename to datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/records/metadata/RecordMetaDataJdbc.java index 4ff25a220..b7489a187 100644 --- a/datavec/datavec-jdbc/src/main/java/org/datavec/api/records/metadata/RecordMetaDataJdbc.java +++ b/datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/records/metadata/RecordMetaDataJdbc.java @@ -14,12 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.api.records.metadata; +package org.datavec.jdbc.records.metadata; import java.net.URI; import java.util.Collections; import java.util.List; import lombok.Getter; +import org.datavec.api.records.metadata.RecordMetaData; /** * Record metadata to use with JDBCRecordReader. To uniquely identify and recover a record, we use a parameterized diff --git a/datavec/datavec-jdbc/src/main/java/org/datavec/api/records/reader/impl/jdbc/JDBCRecordReader.java b/datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/records/reader/impl/jdbc/JDBCRecordReader.java similarity index 98% rename from datavec/datavec-jdbc/src/main/java/org/datavec/api/records/reader/impl/jdbc/JDBCRecordReader.java rename to datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/records/reader/impl/jdbc/JDBCRecordReader.java index 265ea158d..859026406 100644 --- a/datavec/datavec-jdbc/src/main/java/org/datavec/api/records/reader/impl/jdbc/JDBCRecordReader.java +++ b/datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/records/reader/impl/jdbc/JDBCRecordReader.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.api.records.reader.impl.jdbc; +package org.datavec.jdbc.records.reader.impl.jdbc; import com.zaxxer.hikari.util.DriverDataSource; import java.io.DataInputStream; @@ -38,11 +38,11 @@ import org.apache.commons.dbutils.handlers.ArrayHandler; import org.datavec.api.conf.Configuration; import org.datavec.api.records.Record; import org.datavec.api.records.metadata.RecordMetaData; -import org.datavec.api.records.metadata.RecordMetaDataJdbc; +import org.datavec.jdbc.records.metadata.RecordMetaDataJdbc; import org.datavec.api.records.reader.BaseRecordReader; import org.datavec.api.split.InputSplit; -import org.datavec.api.util.jdbc.JdbcWritableConverter; -import org.datavec.api.util.jdbc.ResettableResultSetIterator; +import org.datavec.jdbc.util.JdbcWritableConverter; +import org.datavec.jdbc.util.ResettableResultSetIterator; import org.datavec.api.writable.Writable; /** diff --git a/datavec/datavec-jdbc/src/main/java/org/datavec/api/util/jdbc/JdbcWritableConverter.java b/datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/util/JdbcWritableConverter.java similarity index 98% rename from datavec/datavec-jdbc/src/main/java/org/datavec/api/util/jdbc/JdbcWritableConverter.java rename to datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/util/JdbcWritableConverter.java index ae3c0da72..d366c99ab 100644 --- a/datavec/datavec-jdbc/src/main/java/org/datavec/api/util/jdbc/JdbcWritableConverter.java +++ b/datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/util/JdbcWritableConverter.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.api.util.jdbc; +package org.datavec.jdbc.util; import java.math.BigDecimal; import java.sql.Types; diff --git a/datavec/datavec-jdbc/src/main/java/org/datavec/api/util/jdbc/ResettableResultSetIterator.java b/datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/util/ResettableResultSetIterator.java similarity index 97% rename from datavec/datavec-jdbc/src/main/java/org/datavec/api/util/jdbc/ResettableResultSetIterator.java rename to datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/util/ResettableResultSetIterator.java index 9fa1c4cce..a5f79d31c 100644 --- a/datavec/datavec-jdbc/src/main/java/org/datavec/api/util/jdbc/ResettableResultSetIterator.java +++ b/datavec/datavec-jdbc/src/main/java/org/datavec/jdbc/util/ResettableResultSetIterator.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.api.util.jdbc; +package org.datavec.jdbc.util; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/datavec/datavec-jdbc/src/test/java/org/datavec/api/records/reader/AssertTestsExtendBaseClass.java b/datavec/datavec-jdbc/src/test/java/org/datavec/api/records/reader/AssertTestsExtendBaseClass.java index 1db810b7b..ac6c3e472 100644 --- a/datavec/datavec-jdbc/src/test/java/org/datavec/api/records/reader/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-jdbc/src/test/java/org/datavec/api/records/reader/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.api.records.reader; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; /** diff --git a/datavec/datavec-jdbc/src/test/java/org/datavec/api/records/reader/impl/JDBCRecordReaderTest.java b/datavec/datavec-jdbc/src/test/java/org/datavec/api/records/reader/impl/JDBCRecordReaderTest.java index ac884569a..5b56e6408 100644 --- a/datavec/datavec-jdbc/src/test/java/org/datavec/api/records/reader/impl/JDBCRecordReaderTest.java +++ b/datavec/datavec-jdbc/src/test/java/org/datavec/api/records/reader/impl/JDBCRecordReaderTest.java @@ -35,9 +35,9 @@ import org.datavec.api.records.Record; import org.datavec.api.records.listener.RecordListener; import org.datavec.api.records.listener.impl.LogRecordListener; import org.datavec.api.records.metadata.RecordMetaData; -import org.datavec.api.records.metadata.RecordMetaDataJdbc; +import org.datavec.jdbc.records.metadata.RecordMetaDataJdbc; import org.datavec.api.records.metadata.RecordMetaDataLine; -import org.datavec.api.records.reader.impl.jdbc.JDBCRecordReader; +import org.datavec.jdbc.records.reader.impl.jdbc.JDBCRecordReader; import org.datavec.api.writable.BooleanWritable; import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.FloatWritable; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/LocalTransformExecutor.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/LocalTransformExecutor.java index f0d882f92..95db743d5 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/LocalTransformExecutor.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/LocalTransformExecutor.java @@ -47,9 +47,9 @@ import org.datavec.local.transforms.sequence.*; import org.datavec.local.transforms.transform.LocalTransformFunction; import org.datavec.local.transforms.transform.SequenceSplitFunction; import org.datavec.local.transforms.transform.filter.LocalFilterFunction; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.function.FunctionalUtils; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.function.FunctionalUtils; +import org.nd4j.common.primitives.Pair; import java.util.*; import java.util.function.BiPredicate; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/SequenceEmptyRecordFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/SequenceEmptyRecordFunction.java index d5cabc925..d0f521586 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/SequenceEmptyRecordFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/SequenceEmptyRecordFunction.java @@ -17,7 +17,7 @@ package org.datavec.local.transforms; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/aggregate/AnalysisAddFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/aggregate/AnalysisAddFunction.java index 191bd3387..8b3a0e0dc 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/aggregate/AnalysisAddFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/aggregate/AnalysisAddFunction.java @@ -22,7 +22,7 @@ import org.datavec.api.transform.analysis.AnalysisCounter; import org.datavec.api.transform.analysis.counter.*; import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/aggregate/AnalysisCombineFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/aggregate/AnalysisCombineFunction.java index 5af92a7c2..2f8ad918f 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/aggregate/AnalysisCombineFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/aggregate/AnalysisCombineFunction.java @@ -17,7 +17,7 @@ package org.datavec.local.transforms.analysis.aggregate; import org.datavec.api.transform.analysis.AnalysisCounter; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/histogram/HistogramAddFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/histogram/HistogramAddFunction.java index a5ac3c154..3b0bdb592 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/histogram/HistogramAddFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/histogram/HistogramAddFunction.java @@ -22,7 +22,7 @@ import org.datavec.api.transform.analysis.histogram.*; import org.datavec.api.transform.metadata.CategoricalMetaData; import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/histogram/HistogramCombineFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/histogram/HistogramCombineFunction.java index c0c07b855..bbdf924e8 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/histogram/HistogramCombineFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/analysis/histogram/HistogramCombineFunction.java @@ -17,7 +17,7 @@ package org.datavec.local.transforms.analysis.histogram; import org.datavec.api.transform.analysis.histogram.HistogramCounter; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/EmptyRecordFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/EmptyRecordFunction.java index e50691f1d..2ac4feea5 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/EmptyRecordFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/EmptyRecordFunction.java @@ -17,7 +17,7 @@ package org.datavec.local.transforms.functions; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/LineRecordReaderFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/LineRecordReaderFunction.java index f7c5a9294..b978d266e 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/LineRecordReaderFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/LineRecordReaderFunction.java @@ -19,9 +19,8 @@ package org.datavec.local.transforms.functions; import org.datavec.api.records.reader.RecordReader; import org.datavec.api.split.StringSplit; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; -import java.io.IOException; import java.util.List; /** diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/RecordReaderFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/RecordReaderFunction.java index 174cbebea..4cd61f9c1 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/RecordReaderFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/RecordReaderFunction.java @@ -19,8 +19,8 @@ package org.datavec.local.transforms.functions; import org.datavec.api.records.reader.RecordReader; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.io.DataInputStream; import java.io.IOException; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/SequenceRecordReaderFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/SequenceRecordReaderFunction.java index 94026f2cf..1604ded5b 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/SequenceRecordReaderFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/SequenceRecordReaderFunction.java @@ -20,8 +20,8 @@ package org.datavec.local.transforms.functions; import lombok.extern.slf4j.Slf4j; import org.datavec.api.records.reader.SequenceRecordReader; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.io.DataInputStream; import java.io.IOException; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/FilesAsBytesFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/FilesAsBytesFunction.java index 2a7e209bd..64fd3acd8 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/FilesAsBytesFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/FilesAsBytesFunction.java @@ -20,8 +20,8 @@ package org.datavec.local.transforms.functions.data; import org.apache.commons.io.IOUtils; import org.datavec.api.writable.BytesWritable; import org.datavec.api.writable.Text; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.io.IOException; import java.io.InputStream; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/RecordReaderBytesFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/RecordReaderBytesFunction.java index 10f82d1e4..1017dfb71 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/RecordReaderBytesFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/RecordReaderBytesFunction.java @@ -20,8 +20,8 @@ import org.datavec.api.records.reader.RecordReader; import org.datavec.api.writable.BytesWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/SequenceRecordReaderBytesFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/SequenceRecordReaderBytesFunction.java index 44fb7987b..bac1d7d59 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/SequenceRecordReaderBytesFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/functions/data/SequenceRecordReaderBytesFunction.java @@ -21,8 +21,8 @@ import org.datavec.api.records.reader.SequenceRecordReader; import org.datavec.api.writable.BytesWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExecuteJoinFromCoGroupFlatMapFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExecuteJoinFromCoGroupFlatMapFunction.java index 2a4d32a0a..4fbe0812a 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExecuteJoinFromCoGroupFlatMapFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExecuteJoinFromCoGroupFlatMapFunction.java @@ -19,7 +19,7 @@ package org.datavec.local.transforms.join; import org.datavec.api.transform.join.Join; import org.datavec.api.writable.Writable; import org.datavec.local.transforms.BaseFlatMapFunctionAdaptee; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExecuteJoinFromCoGroupFlatMapFunctionAdapter.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExecuteJoinFromCoGroupFlatMapFunctionAdapter.java index 276d79f88..fed6762b0 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExecuteJoinFromCoGroupFlatMapFunctionAdapter.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExecuteJoinFromCoGroupFlatMapFunctionAdapter.java @@ -20,7 +20,7 @@ import org.nd4j.shade.guava.collect.Iterables; import org.datavec.api.transform.join.Join; import org.datavec.api.writable.Writable; import org.datavec.local.transforms.functions.FlatMapFunctionAdapter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExtractKeysFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExtractKeysFunction.java index 93f0f5799..42d205c99 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExtractKeysFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/join/ExtractKeysFunction.java @@ -18,8 +18,8 @@ package org.datavec.local.transforms.join; import lombok.AllArgsConstructor; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Collections; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/ColumnAsKeyPairFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/ColumnAsKeyPairFunction.java index 1c7316f22..76921daf9 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/ColumnAsKeyPairFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/ColumnAsKeyPairFunction.java @@ -18,8 +18,8 @@ package org.datavec.local.transforms.misc; import lombok.AllArgsConstructor; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/ColumnToKeyPairTransform.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/ColumnToKeyPairTransform.java index 9455712f0..92e867098 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/ColumnToKeyPairTransform.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/ColumnToKeyPairTransform.java @@ -19,8 +19,8 @@ package org.datavec.local.transforms.misc; import lombok.AllArgsConstructor; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/NDArrayToWritablesFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/NDArrayToWritablesFunction.java index ed8bb1b90..98533e382 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/NDArrayToWritablesFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/NDArrayToWritablesFunction.java @@ -21,7 +21,7 @@ import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.NDArrayWritable; import org.datavec.api.writable.Writable; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SequenceMergeFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SequenceMergeFunction.java index 60d22d46e..46dae0034 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SequenceMergeFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SequenceMergeFunction.java @@ -18,8 +18,8 @@ package org.datavec.local.transforms.misc; import org.datavec.api.transform.sequence.merge.SequenceMerge; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SequenceWritablesToStringFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SequenceWritablesToStringFunction.java index 9e8dc3401..56f5e48dc 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SequenceWritablesToStringFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SequenceWritablesToStringFunction.java @@ -18,7 +18,7 @@ package org.datavec.local.transforms.misc; import lombok.AllArgsConstructor; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/StringToWritablesFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/StringToWritablesFunction.java index 3c12cf3f9..06b543f1a 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/StringToWritablesFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/StringToWritablesFunction.java @@ -20,7 +20,7 @@ import lombok.AllArgsConstructor; import org.datavec.api.records.reader.RecordReader; import org.datavec.api.split.StringSplit; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.io.IOException; import java.util.ArrayList; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SumLongsFunction2.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SumLongsFunction2.java index 4f6f57794..95d1adcca 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SumLongsFunction2.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/SumLongsFunction2.java @@ -17,8 +17,8 @@ package org.datavec.local.transforms.misc; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; /** * Created by Alex on 03/09/2016. diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/WritablesToNDArrayFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/WritablesToNDArrayFunction.java index 856003b01..0334ddd93 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/WritablesToNDArrayFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/WritablesToNDArrayFunction.java @@ -20,7 +20,7 @@ import org.datavec.api.writable.NDArrayWritable; import org.datavec.api.writable.Writable; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import org.nd4j.linalg.indexing.NDArrayIndex; import java.util.Arrays; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/WritablesToStringFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/WritablesToStringFunction.java index fa643ae8b..b1decb094 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/WritablesToStringFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/WritablesToStringFunction.java @@ -18,7 +18,7 @@ package org.datavec.local.transforms.misc; import lombok.AllArgsConstructor; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/comparator/Tuple2Comparator.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/comparator/Tuple2Comparator.java index b9937bcd4..b53ac6fe2 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/comparator/Tuple2Comparator.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/misc/comparator/Tuple2Comparator.java @@ -17,7 +17,7 @@ package org.datavec.local.transforms.misc.comparator; import lombok.AllArgsConstructor; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; import java.util.Comparator; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/rank/UnzipForCalculateSortedRankFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/rank/UnzipForCalculateSortedRankFunction.java index c0f37ea1e..e569fe940 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/rank/UnzipForCalculateSortedRankFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/rank/UnzipForCalculateSortedRankFunction.java @@ -18,8 +18,8 @@ package org.datavec.local.transforms.rank; import org.datavec.api.writable.LongWritable; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/reduce/MapToPairForReducerFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/reduce/MapToPairForReducerFunction.java index 9867b6f06..f84315241 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/reduce/MapToPairForReducerFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/reduce/MapToPairForReducerFunction.java @@ -20,8 +20,8 @@ import lombok.AllArgsConstructor; import org.datavec.api.transform.reduce.IAssociativeReducer; import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/reduce/ReducerFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/reduce/ReducerFunction.java index 9b3434528..b1b449bea 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/reduce/ReducerFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/reduce/ReducerFunction.java @@ -19,7 +19,7 @@ package org.datavec.local.transforms.reduce; import lombok.AllArgsConstructor; import org.datavec.api.transform.reduce.IAssociativeReducer; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/ConvertToSequenceLengthOne.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/ConvertToSequenceLengthOne.java index 02ac1bbee..18324eba0 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/ConvertToSequenceLengthOne.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/ConvertToSequenceLengthOne.java @@ -17,7 +17,7 @@ package org.datavec.local.transforms.sequence; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.Collections; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalGroupToSequenceFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalGroupToSequenceFunction.java index 54ef7b5c1..7b2bde115 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalGroupToSequenceFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalGroupToSequenceFunction.java @@ -19,7 +19,7 @@ package org.datavec.local.transforms.sequence; import lombok.AllArgsConstructor; import org.datavec.api.transform.sequence.SequenceComparator; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.ArrayList; import java.util.Collections; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalMapToPairByColumnFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalMapToPairByColumnFunction.java index 47dee675c..7131966f7 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalMapToPairByColumnFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalMapToPairByColumnFunction.java @@ -18,8 +18,8 @@ package org.datavec.local.transforms.sequence; import lombok.AllArgsConstructor; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalMapToPairByMultipleColumnsFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalMapToPairByMultipleColumnsFunction.java index a89163a72..1f4e36af1 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalMapToPairByMultipleColumnsFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalMapToPairByMultipleColumnsFunction.java @@ -18,8 +18,8 @@ package org.datavec.local.transforms.sequence; import lombok.AllArgsConstructor; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalSequenceFilterFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalSequenceFilterFunction.java index 4cf514fb4..90573b983 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalSequenceFilterFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalSequenceFilterFunction.java @@ -19,7 +19,7 @@ package org.datavec.local.transforms.sequence; import lombok.AllArgsConstructor; import org.datavec.api.transform.filter.Filter; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalSequenceTransformFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalSequenceTransformFunction.java index b19908da5..401f9fdac 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalSequenceTransformFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalSequenceTransformFunction.java @@ -19,7 +19,7 @@ package org.datavec.local.transforms.sequence; import lombok.AllArgsConstructor; import org.datavec.api.transform.Transform; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/LocalTransformFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/LocalTransformFunction.java index d0dbceecd..c27f0d2ec 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/LocalTransformFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/LocalTransformFunction.java @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.datavec.api.transform.Transform; import org.datavec.api.writable.Writable; import org.datavec.local.transforms.LocalTransformExecutor; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/filter/FilterWritablesBySchemaFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/filter/FilterWritablesBySchemaFunction.java index 665b02abd..08973dee2 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/filter/FilterWritablesBySchemaFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/filter/FilterWritablesBySchemaFunction.java @@ -20,7 +20,7 @@ import org.datavec.api.transform.metadata.ColumnMetaData; import org.datavec.api.writable.NullWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; /** * Created by Alex on 6/03/2016. diff --git a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/filter/LocalFilterFunction.java b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/filter/LocalFilterFunction.java index bc5bfe4d6..ac6c56fae 100644 --- a/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/filter/LocalFilterFunction.java +++ b/datavec/datavec-local/src/main/java/org/datavec/local/transforms/transform/filter/LocalFilterFunction.java @@ -19,7 +19,7 @@ package org.datavec.local.transforms.transform.filter; import lombok.AllArgsConstructor; import org.datavec.api.transform.filter.Filter; import org.datavec.api.writable.Writable; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.List; diff --git a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/AssertTestsExtendBaseClass.java b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/AssertTestsExtendBaseClass.java index 991b8466d..f6c9ac5ec 100644 --- a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.local.transforms; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/LocalTransformProcessRecordReaderTests.java b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/LocalTransformProcessRecordReaderTests.java index 1d738c54e..e2ab3ddd7 100644 --- a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/LocalTransformProcessRecordReaderTests.java +++ b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/LocalTransformProcessRecordReaderTests.java @@ -33,7 +33,7 @@ import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; import org.joda.time.DateTimeZone; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.util.ArrayList; import java.util.Arrays; diff --git a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/analysis/TestAnalyzeLocal.java b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/analysis/TestAnalyzeLocal.java index 1a46789ad..95a30b6cc 100644 --- a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/analysis/TestAnalyzeLocal.java +++ b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/analysis/TestAnalyzeLocal.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.util.ArrayList; import java.util.List; diff --git a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/functions/TestLineRecordReaderFunction.java b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/functions/TestLineRecordReaderFunction.java index 22bdc99b4..9ed9f528d 100644 --- a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/functions/TestLineRecordReaderFunction.java +++ b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/functions/TestLineRecordReaderFunction.java @@ -24,7 +24,7 @@ import org.datavec.api.split.FileSplit; import org.datavec.api.writable.Writable; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.HashSet; diff --git a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/transform/TestGeoTransforms.java b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/transform/TestGeoTransforms.java index ba1f2566c..4dc4a3fe6 100644 --- a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/transform/TestGeoTransforms.java +++ b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/transform/TestGeoTransforms.java @@ -29,7 +29,7 @@ import org.datavec.api.writable.Writable; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.*; import java.util.Arrays; diff --git a/datavec/datavec-python/src/main/java/org/datavec/python/PythonCondition.java b/datavec/datavec-python/src/main/java/org/datavec/python/PythonCondition.java index 2f9e7cc79..e94e5a171 100644 --- a/datavec/datavec-python/src/main/java/org/datavec/python/PythonCondition.java +++ b/datavec/datavec-python/src/main/java/org/datavec/python/PythonCondition.java @@ -22,8 +22,8 @@ import org.datavec.api.writable.*; import java.util.List; import static org.datavec.python.PythonUtils.schemaToPythonVariables; -import static org.nd4j.base.Preconditions.checkNotNull; -import static org.nd4j.base.Preconditions.checkState; +import static org.nd4j.common.base.Preconditions.checkNotNull; +import static org.nd4j.common.base.Preconditions.checkState; /** * Lets a condition be defined as a python method f that takes no arguments diff --git a/datavec/datavec-python/src/main/java/org/datavec/python/PythonExecutioner.java b/datavec/datavec-python/src/main/java/org/datavec/python/PythonExecutioner.java index d0ed42e36..dd48cb104 100644 --- a/datavec/datavec-python/src/main/java/org/datavec/python/PythonExecutioner.java +++ b/datavec/datavec-python/src/main/java/org/datavec/python/PythonExecutioner.java @@ -22,10 +22,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.bytedeco.cpython.global.python; import org.bytedeco.numpy.global.numpy; -import org.nd4j.linalg.api.concurrency.AffinityManager; -import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.io.IOException; diff --git a/datavec/datavec-python/src/main/java/org/datavec/python/PythonTransform.java b/datavec/datavec-python/src/main/java/org/datavec/python/PythonTransform.java index ab67adc46..a4b119b4c 100644 --- a/datavec/datavec-python/src/main/java/org/datavec/python/PythonTransform.java +++ b/datavec/datavec-python/src/main/java/org/datavec/python/PythonTransform.java @@ -19,22 +19,15 @@ package org.datavec.python; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.io.IOUtils; -import org.datavec.api.transform.ColumnType; import org.datavec.api.transform.Transform; import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.*; -import org.json.JSONPropertyIgnore; -import org.nd4j.base.Preconditions; -import org.nd4j.jackson.objectmapper.holder.ObjectMapperHolder; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.holder.ObjectMapperHolder; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.io.ClassPathResource; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.annotation.JsonIgnoreProperties; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/datavec/datavec-python/src/main/java/org/datavec/python/PythonUtils.java b/datavec/datavec-python/src/main/java/org/datavec/python/PythonUtils.java index c510d8130..d3e991b35 100644 --- a/datavec/datavec-python/src/main/java/org/datavec/python/PythonUtils.java +++ b/datavec/datavec-python/src/main/java/org/datavec/python/PythonUtils.java @@ -5,7 +5,7 @@ import org.datavec.api.transform.metadata.BooleanMetaData; import org.datavec.api.transform.schema.Schema; import org.json.JSONArray; import org.json.JSONObject; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import java.util.ArrayList; diff --git a/datavec/datavec-python/src/test/java/org/datavec/python/AssertTestsExtendBaseClass.java b/datavec/datavec-python/src/test/java/org/datavec/python/AssertTestsExtendBaseClass.java index 83aa2fe5a..50e46e8f7 100644 --- a/datavec/datavec-python/src/test/java/org/datavec/python/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-python/src/test/java/org/datavec/python/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.python; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/main/java/org/datavec/spark/transform/client/DataVecTransformClient.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/main/java/org/datavec/spark/inference/client/DataVecTransformClient.java similarity index 98% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/main/java/org/datavec/spark/transform/client/DataVecTransformClient.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/main/java/org/datavec/spark/inference/client/DataVecTransformClient.java index a481f2cea..978753451 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/main/java/org/datavec/spark/transform/client/DataVecTransformClient.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/main/java/org/datavec/spark/inference/client/DataVecTransformClient.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform.client; +package org.datavec.spark.inference.client; import com.mashape.unirest.http.ObjectMapper; @@ -24,8 +24,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.datavec.api.transform.TransformProcess; import org.datavec.image.transform.ImageTransformProcess; -import org.datavec.spark.transform.model.*; -import org.datavec.spark.transform.service.DataVecTransformService; +import org.datavec.spark.inference.model.model.*; +import org.datavec.spark.inference.model.service.DataVecTransformService; import org.nd4j.shade.jackson.core.JsonProcessingException; import java.io.IOException; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/test/java/org/datavec/transform/client/AssertTestsExtendBaseClass.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/test/java/org/datavec/transform/client/AssertTestsExtendBaseClass.java index 3bff86e98..a919a8fd9 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/test/java/org/datavec/transform/client/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/test/java/org/datavec/transform/client/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.transform.client; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; /** diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/test/java/org/datavec/transform/client/DataVecTransformClientTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/test/java/org/datavec/transform/client/DataVecTransformClientTest.java index 763827c64..7ec08b613 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/test/java/org/datavec/transform/client/DataVecTransformClientTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-client/src/test/java/org/datavec/transform/client/DataVecTransformClientTest.java @@ -19,12 +19,12 @@ package org.datavec.transform.client; import org.apache.commons.io.FileUtils; import org.datavec.api.transform.TransformProcess; import org.datavec.api.transform.schema.Schema; -import org.datavec.spark.transform.CSVSparkTransformServer; -import org.datavec.spark.transform.client.DataVecTransformClient; -import org.datavec.spark.transform.model.Base64NDArrayBody; -import org.datavec.spark.transform.model.BatchCSVRecord; -import org.datavec.spark.transform.model.SequenceBatchCSVRecord; -import org.datavec.spark.transform.model.SingleCSVRecord; +import org.datavec.spark.inference.server.CSVSparkTransformServer; +import org.datavec.spark.inference.client.DataVecTransformClient; +import org.datavec.spark.inference.model.model.Base64NDArrayBody; +import org.datavec.spark.inference.model.model.BatchCSVRecord; +import org.datavec.spark.inference.model.model.SequenceBatchCSVRecord; +import org.datavec.spark.inference.model.model.SingleCSVRecord; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/CSVSparkTransform.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/CSVSparkTransform.java similarity index 97% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/CSVSparkTransform.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/CSVSparkTransform.java index bc7ad126c..6b3c80800 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/CSVSparkTransform.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/CSVSparkTransform.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform; +package org.datavec.spark.inference.model; import lombok.AllArgsConstructor; import lombok.Getter; @@ -30,10 +30,10 @@ import org.datavec.arrow.ArrowConverter; import org.datavec.arrow.recordreader.ArrowWritableRecordBatch; import org.datavec.arrow.recordreader.ArrowWritableRecordTimeSeriesBatch; import org.datavec.local.transforms.LocalTransformExecutor; -import org.datavec.spark.transform.model.Base64NDArrayBody; -import org.datavec.spark.transform.model.BatchCSVRecord; -import org.datavec.spark.transform.model.SequenceBatchCSVRecord; -import org.datavec.spark.transform.model.SingleCSVRecord; +import org.datavec.spark.inference.model.model.Base64NDArrayBody; +import org.datavec.spark.inference.model.model.BatchCSVRecord; +import org.datavec.spark.inference.model.model.SequenceBatchCSVRecord; +import org.datavec.spark.inference.model.model.SingleCSVRecord; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.serde.base64.Nd4jBase64; @@ -44,7 +44,6 @@ import java.util.List; import static org.datavec.arrow.ArrowConverter.*; import static org.datavec.local.transforms.LocalTransformExecutor.execute; -import static org.datavec.local.transforms.LocalTransformExecutor.executeSequenceToSequence; import static org.datavec.local.transforms.LocalTransformExecutor.executeToSequence; /** diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/ImageSparkTransform.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/ImageSparkTransform.java similarity index 90% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/ImageSparkTransform.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/ImageSparkTransform.java index 0ba264598..1e30d1ead 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/ImageSparkTransform.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/ImageSparkTransform.java @@ -14,15 +14,15 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform; +package org.datavec.spark.inference.model; import lombok.AllArgsConstructor; import lombok.Getter; import org.datavec.image.data.ImageWritable; import org.datavec.image.transform.ImageTransformProcess; -import org.datavec.spark.transform.model.Base64NDArrayBody; -import org.datavec.spark.transform.model.BatchImageRecord; -import org.datavec.spark.transform.model.SingleImageRecord; +import org.datavec.spark.inference.model.model.Base64NDArrayBody; +import org.datavec.spark.inference.model.model.BatchImageRecord; +import org.datavec.spark.inference.model.model.SingleImageRecord; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.serde.base64.Nd4jBase64; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/Base64NDArrayBody.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/Base64NDArrayBody.java similarity index 95% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/Base64NDArrayBody.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/Base64NDArrayBody.java index 24e196e44..b2a6b9dc3 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/Base64NDArrayBody.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/Base64NDArrayBody.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform.model; +package org.datavec.spark.inference.model.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/BatchCSVRecord.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/BatchCSVRecord.java similarity index 98% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/BatchCSVRecord.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/BatchCSVRecord.java index 16b4d868c..bba2621c6 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/BatchCSVRecord.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/BatchCSVRecord.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform.model; +package org.datavec.spark.inference.model.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/BatchImageRecord.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/BatchImageRecord.java similarity index 96% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/BatchImageRecord.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/BatchImageRecord.java index 3db85a33f..5d7b52c4f 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/BatchImageRecord.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/BatchImageRecord.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform.model; +package org.datavec.spark.inference.model.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/SequenceBatchCSVRecord.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/SequenceBatchCSVRecord.java similarity index 98% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/SequenceBatchCSVRecord.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/SequenceBatchCSVRecord.java index af160a195..bbbb64f8d 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/SequenceBatchCSVRecord.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/SequenceBatchCSVRecord.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform.model; +package org.datavec.spark.inference.model.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/SingleCSVRecord.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/SingleCSVRecord.java similarity index 98% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/SingleCSVRecord.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/SingleCSVRecord.java index 81f581947..62ab812b4 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/SingleCSVRecord.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/SingleCSVRecord.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform.model; +package org.datavec.spark.inference.model.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/SingleImageRecord.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/SingleImageRecord.java similarity index 95% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/SingleImageRecord.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/SingleImageRecord.java index 2ac7e3e4c..e864bcd9d 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/model/SingleImageRecord.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/model/SingleImageRecord.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform.model; +package org.datavec.spark.inference.model.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/service/DataVecTransformService.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/service/DataVecTransformService.java similarity index 96% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/service/DataVecTransformService.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/service/DataVecTransformService.java index 0ff17b760..caefc649f 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/transform/service/DataVecTransformService.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/main/java/org/datavec/spark/inference/model/service/DataVecTransformService.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform.service; +package org.datavec.spark.inference.model.service; import org.datavec.api.transform.TransformProcess; import org.datavec.image.transform.ImageTransformProcess; -import org.datavec.spark.transform.model.*; +import org.datavec.spark.inference.model.model.*; import java.io.IOException; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/AssertTestsExtendBaseClass.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/AssertTestsExtendBaseClass.java index 4c6f529b9..56e24fef3 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.spark.transform; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/BatchCSVRecordTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/BatchCSVRecordTest.java index 32ca1aae7..7b0bdbf11 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/BatchCSVRecordTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/BatchCSVRecordTest.java @@ -16,7 +16,7 @@ package org.datavec.spark.transform; -import org.datavec.spark.transform.model.BatchCSVRecord; +import org.datavec.spark.inference.model.model.BatchCSVRecord; import org.junit.Test; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/CSVSparkTransformTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/CSVSparkTransformTest.java index 9bc445a49..72947bc8c 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/CSVSparkTransformTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/CSVSparkTransformTest.java @@ -23,19 +23,18 @@ import org.datavec.api.transform.transform.nlp.TextToCharacterIndexTransform; import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.Text; import org.datavec.api.writable.Writable; -import org.datavec.spark.transform.model.Base64NDArrayBody; -import org.datavec.spark.transform.model.BatchCSVRecord; -import org.datavec.spark.transform.model.SequenceBatchCSVRecord; -import org.datavec.spark.transform.model.SingleCSVRecord; +import org.datavec.spark.inference.model.CSVSparkTransform; +import org.datavec.spark.inference.model.model.Base64NDArrayBody; +import org.datavec.spark.inference.model.model.BatchCSVRecord; +import org.datavec.spark.inference.model.model.SequenceBatchCSVRecord; +import org.datavec.spark.inference.model.model.SingleCSVRecord; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.aggregates.Batch; import org.nd4j.serde.base64.Nd4jBase64; import java.util.*; import static org.junit.Assert.*; -import static org.junit.Assume.assumeNotNull; /** * Created by agibsonccc on 12/24/16. diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/ImageSparkTransformTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/ImageSparkTransformTest.java index c3474ab85..080b339b8 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/ImageSparkTransformTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/ImageSparkTransformTest.java @@ -17,14 +17,15 @@ package org.datavec.spark.transform; import org.datavec.image.transform.ImageTransformProcess; -import org.datavec.spark.transform.model.Base64NDArrayBody; -import org.datavec.spark.transform.model.BatchImageRecord; -import org.datavec.spark.transform.model.SingleImageRecord; +import org.datavec.spark.inference.model.ImageSparkTransform; +import org.datavec.spark.inference.model.model.Base64NDArrayBody; +import org.datavec.spark.inference.model.model.BatchImageRecord; +import org.datavec.spark.inference.model.model.SingleImageRecord; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.serde.base64.Nd4jBase64; import java.io.File; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/SingleCSVRecordTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/SingleCSVRecordTest.java index 010619264..0a8e1f14e 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/SingleCSVRecordTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/SingleCSVRecordTest.java @@ -16,7 +16,7 @@ package org.datavec.spark.transform; -import org.datavec.spark.transform.model.SingleCSVRecord; +import org.datavec.spark.inference.model.model.SingleCSVRecord; import org.junit.Test; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/SingleImageRecordTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/SingleImageRecordTest.java index 9d12d3769..4b7be1f60 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/SingleImageRecordTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-model/src/test/java/org/datavec/spark/transform/SingleImageRecordTest.java @@ -16,11 +16,11 @@ package org.datavec.spark.transform; -import org.datavec.spark.transform.model.SingleImageRecord; +import org.datavec.spark.inference.model.model.SingleImageRecord; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/CSVSparkTransformServer.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/CSVSparkTransformServer.java similarity index 98% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/CSVSparkTransformServer.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/CSVSparkTransformServer.java index f20799905..dd1d8f9f8 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/CSVSparkTransformServer.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/CSVSparkTransformServer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform; +package org.datavec.spark.inference.server; import com.beust.jcommander.JCommander; import com.beust.jcommander.ParameterException; @@ -23,7 +23,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.datavec.api.transform.TransformProcess; import org.datavec.image.transform.ImageTransformProcess; -import org.datavec.spark.transform.model.*; +import org.datavec.spark.inference.model.CSVSparkTransform; +import org.datavec.spark.inference.model.model.*; import play.BuiltInComponents; import play.Mode; import play.routing.Router; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/ImageSparkTransformServer.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/ImageSparkTransformServer.java similarity index 98% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/ImageSparkTransformServer.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/ImageSparkTransformServer.java index d64416d32..5b7b29cd2 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/ImageSparkTransformServer.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/ImageSparkTransformServer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform; +package org.datavec.spark.inference.server; import com.beust.jcommander.JCommander; import com.beust.jcommander.ParameterException; @@ -23,7 +23,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.datavec.api.transform.TransformProcess; import org.datavec.image.transform.ImageTransformProcess; -import org.datavec.spark.transform.model.*; +import org.datavec.spark.inference.model.ImageSparkTransform; +import org.datavec.spark.inference.model.model.*; import play.BuiltInComponents; import play.Mode; import play.libs.Files; @@ -36,9 +37,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.function.Function; -import static play.mvc.Controller.request; import static play.mvc.Results.*; /** diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/SparkTransformServer.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/SparkTransformServer.java similarity index 89% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/SparkTransformServer.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/SparkTransformServer.java index 411872006..c613f74e3 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/SparkTransformServer.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/SparkTransformServer.java @@ -14,19 +14,17 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform; +package org.datavec.spark.inference.server; import com.beust.jcommander.Parameter; import com.fasterxml.jackson.databind.JsonNode; -import org.datavec.spark.transform.model.Base64NDArrayBody; -import org.datavec.spark.transform.model.BatchCSVRecord; -import org.datavec.spark.transform.service.DataVecTransformService; +import org.datavec.spark.inference.model.model.Base64NDArrayBody; +import org.datavec.spark.inference.model.model.BatchCSVRecord; +import org.datavec.spark.inference.model.service.DataVecTransformService; import org.nd4j.shade.jackson.databind.ObjectMapper; import play.mvc.Http; import play.server.Server; -import static play.mvc.Controller.request; - /** * Created by kepricon on 17. 6. 20. */ diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/SparkTransformServerChooser.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/SparkTransformServerChooser.java similarity index 98% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/SparkTransformServerChooser.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/SparkTransformServerChooser.java index d610e208f..10013329d 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/SparkTransformServerChooser.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/SparkTransformServerChooser.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform; +package org.datavec.spark.inference.server; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/TransformDataType.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/TransformDataType.java similarity index 95% rename from datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/TransformDataType.java rename to datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/TransformDataType.java index 9b35e6db3..d2c1932dc 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/transform/TransformDataType.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/main/java/org/datavec/spark/inference/server/TransformDataType.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.datavec.spark.transform; +package org.datavec.spark.inference.server; /** * Created by kepricon on 17. 6. 20. diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/AssertTestsExtendBaseClass.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/AssertTestsExtendBaseClass.java index 4c6f529b9..56e24fef3 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.spark.transform; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/CSVSparkTransformServerNoJsonTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/CSVSparkTransformServerNoJsonTest.java index e524f00a7..bd9f2a55e 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/CSVSparkTransformServerNoJsonTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/CSVSparkTransformServerNoJsonTest.java @@ -16,16 +16,16 @@ package org.datavec.spark.transform; -import com.fasterxml.jackson.core.JsonProcessingException; import com.mashape.unirest.http.JsonNode; import com.mashape.unirest.http.ObjectMapper; import com.mashape.unirest.http.Unirest; import org.apache.commons.io.FileUtils; import org.datavec.api.transform.TransformProcess; import org.datavec.api.transform.schema.Schema; -import org.datavec.spark.transform.model.Base64NDArrayBody; -import org.datavec.spark.transform.model.BatchCSVRecord; -import org.datavec.spark.transform.model.SingleCSVRecord; +import org.datavec.spark.inference.server.CSVSparkTransformServer; +import org.datavec.spark.inference.model.model.Base64NDArrayBody; +import org.datavec.spark.inference.model.model.BatchCSVRecord; +import org.datavec.spark.inference.model.model.SingleCSVRecord; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/CSVSparkTransformServerTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/CSVSparkTransformServerTest.java index a9e24d78e..667d13553 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/CSVSparkTransformServerTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/CSVSparkTransformServerTest.java @@ -23,9 +23,10 @@ import com.mashape.unirest.http.Unirest; import org.apache.commons.io.FileUtils; import org.datavec.api.transform.TransformProcess; import org.datavec.api.transform.schema.Schema; -import org.datavec.spark.transform.model.Base64NDArrayBody; -import org.datavec.spark.transform.model.BatchCSVRecord; -import org.datavec.spark.transform.model.SingleCSVRecord; +import org.datavec.spark.inference.server.CSVSparkTransformServer; +import org.datavec.spark.inference.model.model.Base64NDArrayBody; +import org.datavec.spark.inference.model.model.BatchCSVRecord; +import org.datavec.spark.inference.model.model.SingleCSVRecord; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/ImageSparkTransformServerTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/ImageSparkTransformServerTest.java index 049e08e47..0c82f5adb 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/ImageSparkTransformServerTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/ImageSparkTransformServerTest.java @@ -22,16 +22,17 @@ import com.mashape.unirest.http.ObjectMapper; import com.mashape.unirest.http.Unirest; import org.apache.commons.io.FileUtils; import org.datavec.image.transform.ImageTransformProcess; -import org.datavec.spark.transform.model.Base64NDArrayBody; -import org.datavec.spark.transform.model.BatchImageRecord; -import org.datavec.spark.transform.model.SingleImageRecord; +import org.datavec.spark.inference.server.ImageSparkTransformServer; +import org.datavec.spark.inference.model.model.Base64NDArrayBody; +import org.datavec.spark.inference.model.model.BatchImageRecord; +import org.datavec.spark.inference.model.model.SingleImageRecord; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.serde.base64.Nd4jBase64; import java.io.File; diff --git a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/SparkTransformServerTest.java b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/SparkTransformServerTest.java index e08d881ef..30e01b9ba 100644 --- a/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/SparkTransformServerTest.java +++ b/datavec/datavec-spark-inference-parent/datavec-spark-inference-server/src/test/java/org/datavec/spark/transform/SparkTransformServerTest.java @@ -24,12 +24,14 @@ import org.apache.commons.io.FileUtils; import org.datavec.api.transform.TransformProcess; import org.datavec.api.transform.schema.Schema; import org.datavec.image.transform.ImageTransformProcess; -import org.datavec.spark.transform.model.*; +import org.datavec.spark.inference.server.SparkTransformServerChooser; +import org.datavec.spark.inference.server.TransformDataType; +import org.datavec.spark.inference.model.model.*; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.serde.base64.Nd4jBase64; import java.io.File; diff --git a/datavec/datavec-spark/src/main/java/org/datavec/spark/transform/DataFrames.java b/datavec/datavec-spark/src/main/java/org/datavec/spark/transform/DataFrames.java index 5d0bff7f3..11fc41759 100644 --- a/datavec/datavec-spark/src/main/java/org/datavec/spark/transform/DataFrames.java +++ b/datavec/datavec-spark/src/main/java/org/datavec/spark/transform/DataFrames.java @@ -26,7 +26,7 @@ import org.apache.spark.sql.types.DataTypes; import org.apache.spark.sql.types.Metadata; import org.apache.spark.sql.types.StructField; import org.apache.spark.sql.types.StructType; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.datavec.api.transform.schema.Schema; import org.datavec.api.writable.*; import org.datavec.spark.transform.sparkfunction.SequenceToRows; diff --git a/datavec/datavec-spark/src/main/java/org/datavec/spark/transform/utils/adapter/BiFunctionAdapter.java b/datavec/datavec-spark/src/main/java/org/datavec/spark/transform/utils/adapter/BiFunctionAdapter.java index b83e1be5c..4c6c06eca 100644 --- a/datavec/datavec-spark/src/main/java/org/datavec/spark/transform/utils/adapter/BiFunctionAdapter.java +++ b/datavec/datavec-spark/src/main/java/org/datavec/spark/transform/utils/adapter/BiFunctionAdapter.java @@ -17,7 +17,7 @@ package org.datavec.spark.transform.utils.adapter; import org.apache.spark.api.java.function.Function2; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; public class BiFunctionAdapter implements Function2 { diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/AssertTestsExtendBaseClass.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/AssertTestsExtendBaseClass.java index 9539251e6..feb030f9e 100644 --- a/datavec/datavec-spark/src/test/java/org/datavec/spark/AssertTestsExtendBaseClass.java +++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/AssertTestsExtendBaseClass.java @@ -16,8 +16,8 @@ package org.datavec.spark; import lombok.extern.slf4j.Slf4j; -import org.nd4j.AbstractAssertTestsClass; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/TestKryoSerialization.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/TestKryoSerialization.java index 8c873a6dd..76e94fb1d 100644 --- a/datavec/datavec-spark/src/test/java/org/datavec/spark/TestKryoSerialization.java +++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/TestKryoSerialization.java @@ -16,14 +16,13 @@ package org.datavec.spark; -import org.apache.spark.serializer.KryoSerializer; import org.apache.spark.serializer.KryoSerializerInstance; import org.apache.spark.serializer.SerializerInstance; import org.datavec.api.records.reader.RecordReader; import org.datavec.api.records.reader.impl.csv.CSVRecordReader; import org.datavec.api.split.FileSplit; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.nio.ByteBuffer; diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestLineRecordReaderFunction.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestLineRecordReaderFunction.java index 35ff02d85..61c4b2e6b 100644 --- a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestLineRecordReaderFunction.java +++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestLineRecordReaderFunction.java @@ -24,7 +24,7 @@ import org.datavec.api.split.FileSplit; import org.datavec.api.writable.Writable; import org.datavec.spark.BaseSparkTest; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.HashSet; diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestPairSequenceRecordReaderBytesFunction.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestPairSequenceRecordReaderBytesFunction.java index f75564bdf..4c4c52e1e 100644 --- a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestPairSequenceRecordReaderBytesFunction.java +++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestPairSequenceRecordReaderBytesFunction.java @@ -36,7 +36,7 @@ import org.datavec.spark.util.DataVecSparkUtil; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import scala.Tuple2; import java.io.File; diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestRecordReaderBytesFunction.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestRecordReaderBytesFunction.java index 32c32c69d..30e72b7ee 100644 --- a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestRecordReaderBytesFunction.java +++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestRecordReaderBytesFunction.java @@ -34,7 +34,7 @@ import org.datavec.spark.functions.data.RecordReaderBytesFunction; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.nio.file.Files; diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestRecordReaderFunction.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestRecordReaderFunction.java index 35938a072..54c6bfcf4 100644 --- a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestRecordReaderFunction.java +++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestRecordReaderFunction.java @@ -29,7 +29,7 @@ import org.datavec.spark.BaseSparkTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.ArrayList; diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestSequenceRecordReaderBytesFunction.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestSequenceRecordReaderBytesFunction.java index 1384ab388..58f030178 100644 --- a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestSequenceRecordReaderBytesFunction.java +++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestSequenceRecordReaderBytesFunction.java @@ -34,7 +34,7 @@ import org.datavec.spark.functions.data.SequenceRecordReaderBytesFunction; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.nio.file.Files; diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestSequenceRecordReaderFunction.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestSequenceRecordReaderFunction.java index 4d1fcd178..bd6969030 100644 --- a/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestSequenceRecordReaderFunction.java +++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/functions/TestSequenceRecordReaderFunction.java @@ -32,7 +32,7 @@ import org.datavec.spark.BaseSparkTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.ArrayList; diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/transform/analysis/TestAnalysis.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/transform/analysis/TestAnalysis.java index d251d18d1..f89df72af 100644 --- a/datavec/datavec-spark/src/test/java/org/datavec/spark/transform/analysis/TestAnalysis.java +++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/transform/analysis/TestAnalysis.java @@ -37,7 +37,7 @@ import org.joda.time.DateTimeZone; import org.junit.Test; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.nio.file.Files; diff --git a/deeplearning4j/deeplearning4j-common-tests/src/main/java/org/deeplearning4j/BaseDL4JTest.java b/deeplearning4j/deeplearning4j-common-tests/src/main/java/org/deeplearning4j/BaseDL4JTest.java index 22bdd19ae..46daaa5f5 100644 --- a/deeplearning4j/deeplearning4j-common-tests/src/main/java/org/deeplearning4j/BaseDL4JTest.java +++ b/deeplearning4j/deeplearning4j-common-tests/src/main/java/org/deeplearning4j/BaseDL4JTest.java @@ -25,8 +25,8 @@ import org.junit.Before; import org.junit.Rule; import org.junit.rules.TestName; import org.junit.rules.Timeout; -import org.nd4j.base.Preconditions; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ops.executioner.OpExecutioner; diff --git a/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/config/DL4JEnvironmentVars.java b/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/config/DL4JEnvironmentVars.java similarity index 96% rename from deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/config/DL4JEnvironmentVars.java rename to deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/config/DL4JEnvironmentVars.java index a4100124b..a4e1e37c9 100644 --- a/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/config/DL4JEnvironmentVars.java +++ b/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/config/DL4JEnvironmentVars.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.config; +package org.deeplearning4j.common.config; /** * DL4JSystemProperties class contains the environment variables that can be used to configure various aspects of DL4J. diff --git a/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/config/DL4JSystemProperties.java b/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/config/DL4JSystemProperties.java similarity index 99% rename from deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/config/DL4JSystemProperties.java rename to deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/config/DL4JSystemProperties.java index 4c4d2844f..d00532ada 100644 --- a/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/config/DL4JSystemProperties.java +++ b/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/config/DL4JSystemProperties.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.config; +package org.deeplearning4j.common.config; /** * DL4JSystemProperties class contains the system properties that can be used to configure various aspects of DL4J. diff --git a/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/resources/DL4JResources.java b/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/resources/DL4JResources.java index fab713e8e..394e3cc89 100644 --- a/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/resources/DL4JResources.java +++ b/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/resources/DL4JResources.java @@ -17,8 +17,8 @@ package org.deeplearning4j.common.resources; import lombok.NonNull; -import org.deeplearning4j.config.DL4JSystemProperties; -import org.nd4j.base.Preconditions; +import org.deeplearning4j.common.config.DL4JSystemProperties; +import org.nd4j.common.base.Preconditions; import java.io.File; import java.net.MalformedURLException; diff --git a/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/util/DL4JFileUtils.java b/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/util/DL4JFileUtils.java similarity index 94% rename from deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/util/DL4JFileUtils.java rename to deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/util/DL4JFileUtils.java index dbd7a1f3a..7246a07d8 100644 --- a/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/util/DL4JFileUtils.java +++ b/deeplearning4j/deeplearning4j-common/src/main/java/org/deeplearning4j/common/util/DL4JFileUtils.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.util; +package org.deeplearning4j.common.util; -import org.deeplearning4j.config.DL4JSystemProperties; +import org.deeplearning4j.common.config.DL4JSystemProperties; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/test/TestDataSetIterator.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/datasets/test/TestDataSetIterator.java old mode 100755 new mode 100644 similarity index 98% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/test/TestDataSetIterator.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/datasets/test/TestDataSetIterator.java index d17a2185e..fe9ee593e --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/test/TestDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/datasets/test/TestDataSetIterator.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.datasets.test; +package org.deeplearning4j.core.datasets.test; import lombok.Getter; import org.nd4j.linalg.dataset.DataSet; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/vectorizer/Vectorizer.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/datasets/vectorizer/Vectorizer.java old mode 100755 new mode 100644 similarity index 95% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/vectorizer/Vectorizer.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/datasets/vectorizer/Vectorizer.java index 2473fef91..ceca4196d --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/vectorizer/Vectorizer.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/datasets/vectorizer/Vectorizer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.datasets.vectorizer; +package org.deeplearning4j.core.datasets.vectorizer; import org.nd4j.linalg.dataset.DataSet; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/evaluation/EvaluationTools.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/evaluation/EvaluationTools.java similarity index 99% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/evaluation/EvaluationTools.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/evaluation/EvaluationTools.java index cb7b3731e..0f2e9b344 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/evaluation/EvaluationTools.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/evaluation/EvaluationTools.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.evaluation; +package org.deeplearning4j.core.evaluation; import org.apache.commons.io.FileUtils; import org.deeplearning4j.ui.api.Component; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/DeviceMetric.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/DeviceMetric.java similarity index 96% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/DeviceMetric.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/DeviceMetric.java index 9c94473c6..d31e95a52 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/DeviceMetric.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/DeviceMetric.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.perf.listener; +package org.deeplearning4j.core.listener; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/DiskInfo.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/DiskInfo.java similarity index 96% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/DiskInfo.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/DiskInfo.java index e9729a402..1c3325e9e 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/DiskInfo.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/DiskInfo.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.perf.listener; +package org.deeplearning4j.core.listener; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/HardwareMetric.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/HardwareMetric.java similarity index 99% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/HardwareMetric.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/HardwareMetric.java index 3db19dac4..3749bc0db 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/HardwareMetric.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/HardwareMetric.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.perf.listener; +package org.deeplearning4j.core.listener; import lombok.*; import org.nd4j.linalg.api.environment.Nd4jEnvironment; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/SystemInfoFilePrintListener.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/SystemInfoFilePrintListener.java similarity index 98% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/SystemInfoFilePrintListener.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/SystemInfoFilePrintListener.java index 692c30ab8..1c66c921f 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/SystemInfoFilePrintListener.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/SystemInfoFilePrintListener.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.perf.listener; +package org.deeplearning4j.core.listener; import lombok.NonNull; import lombok.Builder; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/SystemInfoPrintListener.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/SystemInfoPrintListener.java similarity index 98% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/SystemInfoPrintListener.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/SystemInfoPrintListener.java index dc9981535..efff7c8e7 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/SystemInfoPrintListener.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/SystemInfoPrintListener.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.perf.listener; +package org.deeplearning4j.core.listener; import lombok.Builder; import lombok.extern.slf4j.Slf4j; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/SystemPolling.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/SystemPolling.java similarity index 99% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/SystemPolling.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/SystemPolling.java index 323f6e96e..efc0d047a 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/perf/listener/SystemPolling.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/listener/SystemPolling.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.perf.listener; +package org.deeplearning4j.core.listener; import lombok.extern.slf4j.Slf4j; import org.nd4j.shade.jackson.databind.ObjectMapper; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/DataSetLoader.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/DataSetLoader.java similarity index 83% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/DataSetLoader.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/DataSetLoader.java index 00310371c..d35107a89 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/DataSetLoader.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/DataSetLoader.java @@ -14,13 +14,14 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.loader; +package org.deeplearning4j.core.loader; -import org.nd4j.api.loader.Loader; +import org.nd4j.common.loader.Loader; +import org.nd4j.common.loader.Source; import org.nd4j.linalg.dataset.DataSet; /** - * An interface for loading DataSets from a {@link org.nd4j.api.loader.Source} + * An interface for loading DataSets from a {@link Source} * * @author Alex Black */ diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/MultiDataSetLoader.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/MultiDataSetLoader.java similarity index 83% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/MultiDataSetLoader.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/MultiDataSetLoader.java index 409ae1344..2eca0e068 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/MultiDataSetLoader.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/MultiDataSetLoader.java @@ -14,13 +14,14 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.loader; +package org.deeplearning4j.core.loader; -import org.nd4j.api.loader.Loader; +import org.nd4j.common.loader.Loader; +import org.nd4j.common.loader.Source; import org.nd4j.linalg.dataset.api.MultiDataSet; /** - * An interface for loading MultiDataSets from a {@link org.nd4j.api.loader.Source} + * An interface for loading MultiDataSets from a {@link Source} * * @author Alex Black */ diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/impl/RecordReaderFileBatchLoader.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/impl/RecordReaderFileBatchLoader.java similarity index 96% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/impl/RecordReaderFileBatchLoader.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/impl/RecordReaderFileBatchLoader.java index cde389c0d..187470529 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/impl/RecordReaderFileBatchLoader.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/impl/RecordReaderFileBatchLoader.java @@ -14,16 +14,16 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.loader.impl; +package org.deeplearning4j.core.loader.impl; import lombok.Getter; import lombok.Setter; import org.datavec.api.records.reader.RecordReader; import org.datavec.api.records.reader.impl.filebatch.FileBatchRecordReader; -import org.deeplearning4j.api.loader.DataSetLoader; +import org.deeplearning4j.core.loader.DataSetLoader; import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator; -import org.nd4j.api.loader.FileBatch; -import org.nd4j.api.loader.Source; +import org.nd4j.common.loader.FileBatch; +import org.nd4j.common.loader.Source; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/impl/SerializedDataSetLoader.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/impl/SerializedDataSetLoader.java similarity index 90% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/impl/SerializedDataSetLoader.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/impl/SerializedDataSetLoader.java index 6afc6e85d..7a3c5d8b7 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/impl/SerializedDataSetLoader.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/impl/SerializedDataSetLoader.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.loader.impl; +package org.deeplearning4j.core.loader.impl; -import org.deeplearning4j.api.loader.DataSetLoader; -import org.nd4j.api.loader.Source; +import org.deeplearning4j.core.loader.DataSetLoader; +import org.nd4j.common.loader.Source; import org.nd4j.linalg.dataset.DataSet; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/impl/SerializedMultiDataSetLoader.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/impl/SerializedMultiDataSetLoader.java similarity index 90% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/impl/SerializedMultiDataSetLoader.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/impl/SerializedMultiDataSetLoader.java index 9d3a5016b..78e9b2d8c 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/loader/impl/SerializedMultiDataSetLoader.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/loader/impl/SerializedMultiDataSetLoader.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.loader.impl; +package org.deeplearning4j.core.loader.impl; -import org.deeplearning4j.api.loader.MultiDataSetLoader; -import org.nd4j.api.loader.Source; +import org.deeplearning4j.core.loader.MultiDataSetLoader; +import org.nd4j.common.loader.Source; import org.nd4j.linalg.dataset.api.MultiDataSet; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/parallelism/AsyncIterator.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/parallelism/AsyncIterator.java similarity index 99% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/parallelism/AsyncIterator.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/parallelism/AsyncIterator.java index b2d3e1169..b0e31d787 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/parallelism/AsyncIterator.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/parallelism/AsyncIterator.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.parallelism; +package org.deeplearning4j.core.parallelism; import lombok.Getter; import lombok.NonNull; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/Persistable.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/Persistable.java similarity index 98% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/Persistable.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/Persistable.java index dccfaae37..8bf35d234 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/Persistable.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/Persistable.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage; +package org.deeplearning4j.core.storage; import java.io.IOException; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorage.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorage.java similarity index 99% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorage.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorage.java index 0567a519d..9669fc2b4 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorage.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorage.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage; +package org.deeplearning4j.core.storage; import java.io.IOException; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageEvent.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageEvent.java similarity index 97% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageEvent.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageEvent.java index 374891fd7..e7a873319 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageEvent.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageEvent.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage; +package org.deeplearning4j.core.storage; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageListener.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageListener.java similarity index 97% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageListener.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageListener.java index 05766130c..144534f87 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageListener.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageListener.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage; +package org.deeplearning4j.core.storage; /** * A listener interface, so that classes can be notified of changes to a {@link StatsStorage} diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageRouter.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageRouter.java similarity index 98% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageRouter.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageRouter.java index ba6f99725..32f86583c 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageRouter.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageRouter.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage; +package org.deeplearning4j.core.storage; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageRouterProvider.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageRouterProvider.java similarity index 96% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageRouterProvider.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageRouterProvider.java index 77960838b..fe9bc1963 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StatsStorageRouterProvider.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StatsStorageRouterProvider.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage; +package org.deeplearning4j.core.storage; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StorageMetaData.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StorageMetaData.java similarity index 97% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StorageMetaData.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StorageMetaData.java index 7a177fa39..ea6ac06fd 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StorageMetaData.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StorageMetaData.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage; +package org.deeplearning4j.core.storage; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StorageType.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StorageType.java similarity index 95% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StorageType.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StorageType.java index 89ca0f696..586a9ce3d 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/StorageType.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/StorageType.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage; +package org.deeplearning4j.core.storage; /** * Type of storage information diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/impl/CollectionStatsStorageRouter.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/impl/CollectionStatsStorageRouter.java similarity index 90% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/impl/CollectionStatsStorageRouter.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/impl/CollectionStatsStorageRouter.java index a63395807..f537bae41 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/impl/CollectionStatsStorageRouter.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/impl/CollectionStatsStorageRouter.java @@ -14,12 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage.impl; +package org.deeplearning4j.core.storage.impl; import lombok.AllArgsConstructor; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.StorageMetaData; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StorageMetaData; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/impl/RemoteUIStatsStorageRouter.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/impl/RemoteUIStatsStorageRouter.java similarity index 98% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/impl/RemoteUIStatsStorageRouter.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/impl/RemoteUIStatsStorageRouter.java index 1e4c62c3c..9d70ab2da 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/impl/RemoteUIStatsStorageRouter.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/impl/RemoteUIStatsStorageRouter.java @@ -14,15 +14,15 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage.impl; +package org.deeplearning4j.core.storage.impl; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.api.storage.StorageType; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.core.storage.StorageType; import org.nd4j.shade.jackson.databind.ObjectMapper; import javax.xml.bind.DatatypeConverter; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/listener/RoutingIterationListener.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/listener/RoutingIterationListener.java similarity index 85% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/listener/RoutingIterationListener.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/listener/RoutingIterationListener.java index 15b3c6939..12f028a37 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/api/storage/listener/RoutingIterationListener.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/storage/listener/RoutingIterationListener.java @@ -14,20 +14,21 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.api.storage.listener; +package org.deeplearning4j.core.storage.listener; -import org.deeplearning4j.api.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StatsStorageRouterProvider; import org.deeplearning4j.optimize.api.TrainingListener; import java.io.Serializable; /** * An extension of the {@link TrainingListener} interface for those listeners that pass data off to a - * {@link org.deeplearning4j.api.storage.StatsStorageRouter} instance. + * {@link StatsStorageRouter} instance. * The most common use case here is in distributed training scenarios: each worker has a set of listeners, that have * to be serialized and transferred across the network, to some storage mechanism.
* The StatsStorageRouter implementations themselves may not be serializable, or should be shared between multiple workers, - * so instead, we use a {@link org.deeplearning4j.api.storage.StatsStorageRouterProvider} + * so instead, we use a {@link StatsStorageRouterProvider} * * @author Alex Black */ diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/ui/UiConnectionInfo.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/ui/UiConnectionInfo.java similarity index 99% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/ui/UiConnectionInfo.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/ui/UiConnectionInfo.java index c8b3f3b00..390618d4e 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/ui/UiConnectionInfo.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/ui/UiConnectionInfo.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui; +package org.deeplearning4j.core.ui; import lombok.Data; import lombok.NonNull; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesser.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/ModelGuesser.java similarity index 97% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesser.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/ModelGuesser.java index ed2d146cc..a393d100b 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesser.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/ModelGuesser.java @@ -14,16 +14,18 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.util; +package org.deeplearning4j.core.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.deeplearning4j.config.DL4JSystemProperties; +import org.deeplearning4j.common.util.DL4JFileUtils; +import org.deeplearning4j.common.config.DL4JSystemProperties; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.modelimport.keras.KerasModelImport; +import org.deeplearning4j.util.ModelSerializer; import org.nd4j.linalg.dataset.api.preprocessor.Normalizer; import java.io.*; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesserException.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/ModelGuesserException.java similarity index 96% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesserException.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/ModelGuesserException.java index 3d1e38ef3..a098d5554 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ModelGuesserException.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/ModelGuesserException.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.util; +package org.deeplearning4j.core.util; public class ModelGuesserException extends Exception { diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/MovingWindowMatrix.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/MovingWindowMatrix.java similarity index 99% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/MovingWindowMatrix.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/MovingWindowMatrix.java index 101db930b..871947254 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/MovingWindowMatrix.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/MovingWindowMatrix.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.util; +package org.deeplearning4j.core.util; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ThreadUtils.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/ThreadUtils.java similarity index 98% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ThreadUtils.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/ThreadUtils.java index 77465280f..60eae4d61 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/ThreadUtils.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/ThreadUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.util; +package org.deeplearning4j.core.util; import java.util.concurrent.locks.LockSupport; diff --git a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/UIDProvider.java b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/UIDProvider.java similarity index 99% rename from deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/UIDProvider.java rename to deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/UIDProvider.java index a6ba4ae9b..471f924de 100644 --- a/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/util/UIDProvider.java +++ b/deeplearning4j/deeplearning4j-core/src/main/java/org/deeplearning4j/core/util/UIDProvider.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.util; +package org.deeplearning4j.core.util; import lombok.extern.slf4j.Slf4j; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java index 34d4db39e..a8c555143 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java @@ -16,9 +16,9 @@ package org.deeplearning4j; import lombok.extern.slf4j.Slf4j; -import org.junit.Test; + import java.util.*; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; /** * This class checks that all test classes (i.e., anything with one or more methods annotated with @Test) diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/LayerHelperValidationUtil.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/LayerHelperValidationUtil.java index 1b769a32d..b06db266d 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/LayerHelperValidationUtil.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/LayerHelperValidationUtil.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; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/TestUtils.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/TestUtils.java index dac854d9d..c004c5c0d 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/TestUtils.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/TestUtils.java @@ -31,7 +31,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-core/src/test/java/org/deeplearning4j/datasets/MnistFetcherTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/MnistFetcherTest.java index 362e099e4..b7a3a6f00 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/MnistFetcherTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/MnistFetcherTest.java @@ -17,7 +17,7 @@ package org.deeplearning4j.datasets; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.base.MnistFetcher; +import org.deeplearning4j.datasets.base.MnistFetcher; import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; import org.junit.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java index 7e073b22e..22cd30684 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java @@ -54,9 +54,9 @@ import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization; import org.nd4j.linalg.dataset.api.preprocessor.NormalizerMinMaxScaler; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.resources.Resources; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.resources.Resources; import java.io.*; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIteratorTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIteratorTest.java index 897876112..d4f3eb94d 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIteratorTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIteratorTest.java @@ -19,7 +19,6 @@ package org.deeplearning4j.datasets.datavec; import org.junit.rules.Timeout; import org.nd4j.shade.guava.io.Files; -import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.datavec.api.conf.Configuration; @@ -53,8 +52,8 @@ import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.resources.Resources; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.resources.Resources; import java.io.*; import java.net.URI; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/AbstractDataSetIteratorTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/AbstractDataSetIteratorTest.java index 935c445bf..7c1681c42 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/AbstractDataSetIteratorTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/AbstractDataSetIteratorTest.java @@ -21,7 +21,7 @@ import org.deeplearning4j.BaseDL4JTest; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/DataSetIteratorTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/DataSetIteratorTest.java index 1db60ad4a..b2f45089d 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/DataSetIteratorTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/DataSetIteratorTest.java @@ -35,7 +35,6 @@ import org.deeplearning4j.nn.conf.layers.OutputLayer; import org.deeplearning4j.nn.conf.layers.SubsamplingLayer; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; -import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.optimize.listeners.CollectScoresIterationListener; import org.deeplearning4j.optimize.listeners.ScoreIterationListener; import org.junit.Ignore; @@ -45,11 +44,10 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.lossfunctions.LossFunctions; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Random; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/EarlyTerminationMultiDataSetIteratorTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/EarlyTerminationMultiDataSetIteratorTest.java index 8c888a09e..6aa761579 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/EarlyTerminationMultiDataSetIteratorTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/EarlyTerminationMultiDataSetIteratorTest.java @@ -18,10 +18,10 @@ package org.deeplearning4j.datasets.iterator; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/LoaderIteratorTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/LoaderIteratorTests.java index aa49c9b50..9dcb8b3e0 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/LoaderIteratorTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/LoaderIteratorTests.java @@ -20,9 +20,9 @@ import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.datasets.iterator.loader.DataSetLoaderIterator; import org.deeplearning4j.datasets.iterator.loader.MultiDataSetLoaderIterator; import org.junit.Test; -import org.nd4j.api.loader.Loader; -import org.nd4j.api.loader.LocalFileSourceFactory; -import org.nd4j.api.loader.Source; +import org.nd4j.common.loader.Loader; +import org.nd4j.common.loader.LocalFileSourceFactory; +import org.nd4j.common.loader.Source; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.MultiDataSet; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/MultipleEpochsIteratorTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/MultipleEpochsIteratorTest.java index 10a4285a1..7c9ca3099 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/MultipleEpochsIteratorTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/MultipleEpochsIteratorTest.java @@ -28,8 +28,8 @@ import org.junit.rules.Timeout; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.resources.Resources; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.resources.Resources; import java.util.Iterator; import java.util.concurrent.atomic.AtomicLong; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java index bd65af6a3..ba8a23e8d 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java @@ -53,7 +53,7 @@ import org.nd4j.linalg.dataset.api.preprocessor.NormalizerStandardize; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvaluationToolsTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvaluationToolsTests.java index 032b06ed0..2f68dc4c1 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvaluationToolsTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvaluationToolsTests.java @@ -18,7 +18,7 @@ package org.deeplearning4j.eval; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; -import org.deeplearning4j.evaluation.EvaluationTools; +import org.deeplearning4j.core.evaluation.EvaluationTools; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.layers.DenseLayer; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/DropoutGradientCheck.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/DropoutGradientCheck.java index 76b14cbb4..c4f9d2843 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/DropoutGradientCheck.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/DropoutGradientCheck.java @@ -36,7 +36,7 @@ import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.Consumer; +import org.nd4j.common.function.Consumer; import org.nd4j.linalg.learning.config.NoOp; import org.nd4j.linalg.lossfunctions.LossFunctions.LossFunction; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/LossFunctionGradientCheck.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/LossFunctionGradientCheck.java index ab6c8215a..88ea98ca2 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/LossFunctionGradientCheck.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/LossFunctionGradientCheck.java @@ -43,8 +43,8 @@ import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.learning.config.NoOp; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.impl.*; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.shade.jackson.databind.ObjectMapper; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java index a99f613b7..5646b6519 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java @@ -43,7 +43,7 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.learning.config.NoOp; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/adapters/Regression2dAdapterTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/adapters/Regression2dAdapterTest.java index ab81aceb1..52dfa98b0 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/adapters/Regression2dAdapterTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/adapters/Regression2dAdapterTest.java @@ -20,7 +20,7 @@ import lombok.val; import org.deeplearning4j.BaseDL4JTest; import org.junit.Test; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/dropout/TestDropout.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/dropout/TestDropout.java index 6cc891488..574cb0d39 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/dropout/TestDropout.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/dropout/TestDropout.java @@ -36,11 +36,9 @@ import org.nd4j.linalg.api.ops.impl.reduce.longer.MatchCondition; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.schedule.MapSchedule; import org.nd4j.linalg.schedule.ScheduleType; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/graph/ElementWiseVertexTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/graph/ElementWiseVertexTest.java index 5bbb8846d..547b29049 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/graph/ElementWiseVertexTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/graph/ElementWiseVertexTest.java @@ -17,7 +17,6 @@ package org.deeplearning4j.nn.conf.graph; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.TestUtils; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; @@ -35,12 +34,11 @@ import org.nd4j.linalg.activations.impl.ActivationTanH; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.rng.distribution.impl.UniformDistribution; -import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions.LossFunction; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/graph/ShiftVertexTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/graph/ShiftVertexTest.java index a6e9cecd0..62c6eebc6 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/graph/ShiftVertexTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/graph/ShiftVertexTest.java @@ -37,7 +37,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions.LossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Map; import java.util.TreeMap; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/preprocessor/custom/MyCustomPreprocessor.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/preprocessor/custom/MyCustomPreprocessor.java index 55d72dbe2..77061e398 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/preprocessor/custom/MyCustomPreprocessor.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/conf/preprocessor/custom/MyCustomPreprocessor.java @@ -21,7 +21,7 @@ import org.deeplearning4j.nn.api.MaskState; import org.deeplearning4j.nn.conf.InputPreProcessor; import org.deeplearning4j.nn.conf.inputs.InputType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; /** diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/ComputationGraphTestRNN.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/ComputationGraphTestRNN.java index a6778626f..d4b401111 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/ComputationGraphTestRNN.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/ComputationGraphTestRNN.java @@ -48,7 +48,7 @@ import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collections; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestCompGraphCNN.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestCompGraphCNN.java index eaf65f802..fac54e933 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestCompGraphCNN.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestCompGraphCNN.java @@ -23,9 +23,7 @@ import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.inputs.InputType; -import org.deeplearning4j.nn.conf.inputs.InvalidInputTypeException; import org.deeplearning4j.nn.conf.layers.*; -import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.weights.WeightInit; import org.junit.Before; import org.junit.Ignore; @@ -36,12 +34,10 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java index 7ba76894d..743e16710 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java @@ -72,14 +72,13 @@ import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.io.ClassPathResource; import org.nd4j.linalg.learning.config.AdaGrad; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.NoOp; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.resources.Resources; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.resources.Resources; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/graphnodes/TestGraphNodes.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/graphnodes/TestGraphNodes.java index b9e9cf698..b51282505 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/graphnodes/TestGraphNodes.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/graphnodes/TestGraphNodes.java @@ -47,7 +47,7 @@ import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.learning.config.AdaDelta; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/RepeatVectorTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/RepeatVectorTest.java index f7624ec7a..c6b4173ba 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/RepeatVectorTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/RepeatVectorTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/ConvDataFormatTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/ConvDataFormatTests.java index c91bb8e56..5d540baa7 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/ConvDataFormatTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/ConvDataFormatTests.java @@ -42,7 +42,7 @@ import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayerSetupTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayerSetupTest.java index eba4939e3..1d354ef51 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayerSetupTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayerSetupTest.java @@ -42,7 +42,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.lossfunctions.LossFunctions; import org.nd4j.linalg.util.FeatureUtil; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/SubsamplingLayerTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/SubsamplingLayerTest.java index e0e556f39..58acf8767 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/SubsamplingLayerTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/SubsamplingLayerTest.java @@ -37,7 +37,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/Upsampling1DTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/Upsampling1DTest.java index abc6745fc..0675285c2 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/Upsampling1DTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/Upsampling1DTest.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/Upsampling2DTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/Upsampling2DTest.java index 24bf3dd09..e797b8cdc 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/Upsampling2DTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/convolution/Upsampling2DTest.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/custom/testclasses/CustomActivation.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/custom/testclasses/CustomActivation.java index 5ead0a053..01d94e6dc 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/custom/testclasses/CustomActivation.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/custom/testclasses/CustomActivation.java @@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; import org.nd4j.linalg.activations.BaseActivationFunction; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Created by Alex on 19/12/2016. diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/normalization/BatchNormalizationTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/normalization/BatchNormalizationTest.java index 2c88cef3c..e2c38bfad 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/normalization/BatchNormalizationTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/normalization/BatchNormalizationTest.java @@ -59,11 +59,10 @@ import org.nd4j.linalg.learning.config.AdaDelta; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.lossfunctions.LossFunctions; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/normalization/LocalResponseTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/normalization/LocalResponseTest.java index f88d999cb..b4daf9161 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/normalization/LocalResponseTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/normalization/LocalResponseTest.java @@ -39,7 +39,7 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import static org.junit.Assert.assertArrayEquals; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/objdetect/TestYolo2OutputLayer.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/objdetect/TestYolo2OutputLayer.java index 14f3ee6c0..699d6bf55 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/objdetect/TestYolo2OutputLayer.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/objdetect/TestYolo2OutputLayer.java @@ -25,7 +25,7 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.buffer.DataType; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.datavec.image.recordreader.objdetect.ObjectDetectionRecordReader; import org.datavec.image.recordreader.objdetect.impl.VocLabelProvider; import org.deeplearning4j.BaseDL4JTest; @@ -48,11 +48,8 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.learning.config.AdaDelta; import org.nd4j.linalg.learning.config.Adam; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -import org.nd4j.linalg.schedule.MapSchedule; -import org.nd4j.linalg.schedule.ScheduleType; import java.io.File; import java.io.FileOutputStream; @@ -60,7 +57,6 @@ import java.io.InputStream; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.net.URI; -import java.nio.file.Files; import java.util.Collections; import java.util.Comparator; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/BidirectionalTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/BidirectionalTest.java index 489687679..2fef54844 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/BidirectionalTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/BidirectionalTest.java @@ -53,7 +53,7 @@ import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/GravesBidirectionalLSTMTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/GravesBidirectionalLSTMTest.java index 441267e86..b879056c5 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/GravesBidirectionalLSTMTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/GravesBidirectionalLSTMTest.java @@ -41,7 +41,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.AdaGrad; import org.nd4j.linalg.learning.config.NoOp; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/GravesLSTMTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/GravesLSTMTest.java index 66b4c8eab..9c0f16f5e 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/GravesLSTMTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/GravesLSTMTest.java @@ -34,11 +34,10 @@ import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java index 43dd93f56..93566050f 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java @@ -42,10 +42,9 @@ import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestRnnLayers.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestRnnLayers.java index 83b312308..b2b789d58 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestRnnLayers.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestRnnLayers.java @@ -40,7 +40,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.NoOp; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/samediff/SameDiffCustomLayerTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/samediff/SameDiffCustomLayerTests.java index 034c3e03b..243909bd9 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/samediff/SameDiffCustomLayerTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/samediff/SameDiffCustomLayerTests.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/misc/TestMemoryReports.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/misc/TestMemoryReports.java index 2d8713478..3027ad6c1 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/misc/TestMemoryReports.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/misc/TestMemoryReports.java @@ -33,12 +33,11 @@ import org.deeplearning4j.nn.conf.memory.MemoryUseMode; import org.deeplearning4j.nn.conf.preprocessor.FeedForwardToCnnPreProcessor; import org.junit.Test; import org.nd4j.linalg.activations.Activation; -import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.nio.charset.Charset; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/misc/WorkspaceTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/misc/WorkspaceTests.java index d2bf06a56..4282c5e62 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/misc/WorkspaceTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/misc/WorkspaceTests.java @@ -45,7 +45,7 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/mkldnn/ValidateMKLDNN.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/mkldnn/ValidateMKLDNN.java index 7013311ba..bb06a0e01 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/mkldnn/ValidateMKLDNN.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/mkldnn/ValidateMKLDNN.java @@ -39,7 +39,7 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java index ac1656e92..3139b096a 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java @@ -70,7 +70,7 @@ import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.NoOp; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTestRNN.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTestRNN.java index 0c25ce7e3..7e6cf2cfe 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTestRNN.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTestRNN.java @@ -47,7 +47,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.lossfunctions.LossFunctions; import org.nd4j.linalg.lossfunctions.LossFunctions.LossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimize/solver/TestOptimizers.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimize/solver/TestOptimizers.java index c2f5cd595..30cce7c28 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimize/solver/TestOptimizers.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimize/solver/TestOptimizers.java @@ -54,7 +54,7 @@ import org.nd4j.linalg.indexing.conditions.Condition; import org.nd4j.linalg.learning.config.AdaGrad; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions.LossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimize/solver/accumulation/SmartFancyBlockingQueueTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimize/solver/accumulation/SmartFancyBlockingQueueTest.java index 6496fd9e3..63a69b82c 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimize/solver/accumulation/SmartFancyBlockingQueueTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimize/solver/accumulation/SmartFancyBlockingQueueTest.java @@ -21,16 +21,14 @@ import lombok.val; import org.apache.commons.lang3.RandomUtils; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.optimize.solvers.accumulation.SmartFancyBlockingQueue; -import org.deeplearning4j.util.ThreadUtils; +import org.deeplearning4j.core.util.ThreadUtils; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import java.util.ArrayList; import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CyclicBarrier; -import java.util.concurrent.LinkedBlockingQueue; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimizer/listener/TestCheckpointListener.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimizer/listener/TestCheckpointListener.java index 721786eef..5c5f9e385 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimizer/listener/TestCheckpointListener.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimizer/listener/TestCheckpointListener.java @@ -31,7 +31,7 @@ import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimizer/listener/TestListeners.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimizer/listener/TestListeners.java index ec95397c6..8cd72e770 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimizer/listener/TestListeners.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/optimizer/listener/TestListeners.java @@ -19,8 +19,8 @@ package org.deeplearning4j.optimizer.listener; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.listener.RoutingIterationListener; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.listener.RoutingIterationListener; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.Model; @@ -47,7 +47,7 @@ import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/parallelism/AsyncIteratorTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/parallelism/AsyncIteratorTest.java index 3bf8059a4..b1f8226bb 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/parallelism/AsyncIteratorTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/parallelism/AsyncIteratorTest.java @@ -17,6 +17,7 @@ package org.deeplearning4j.parallelism; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.core.parallelism.AsyncIterator; import org.junit.Test; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/parallelism/ParallelExistingMiniBatchDataSetIteratorTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/parallelism/ParallelExistingMiniBatchDataSetIteratorTest.java index 516222712..e96d8e892 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/parallelism/ParallelExistingMiniBatchDataSetIteratorTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/parallelism/ParallelExistingMiniBatchDataSetIteratorTest.java @@ -19,14 +19,14 @@ package org.deeplearning4j.parallelism; import lombok.extern.slf4j.Slf4j; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.datasets.iterator.callbacks.DataSetDeserializer; import org.deeplearning4j.datasets.iterator.parallel.FileSplitParallelDataSetIterator; import org.junit.Before; import org.junit.Test; import org.nd4j.linalg.dataset.DataSet; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/SystemPollingTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/SystemPollingTest.java index ae46692fc..bf87ee70a 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/SystemPollingTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/SystemPollingTest.java @@ -18,6 +18,8 @@ package org.deeplearning4j.perf.listener; import org.apache.commons.io.FileUtils; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.core.listener.HardwareMetric; +import org.deeplearning4j.core.listener.SystemPolling; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -25,7 +27,6 @@ import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.factory.Nd4j; import java.io.File; -import java.util.Arrays; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestHardWareMetric.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestHardWareMetric.java index b9589398b..7e2009b8e 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestHardWareMetric.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestHardWareMetric.java @@ -17,6 +17,7 @@ package org.deeplearning4j.perf.listener; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.core.listener.HardwareMetric; import org.junit.Ignore; import org.junit.Test; import oshi.json.SystemInfo; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestSystemInfoPrintListener.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestSystemInfoPrintListener.java index 6ce531f12..bc2e36e2b 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestSystemInfoPrintListener.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestSystemInfoPrintListener.java @@ -17,6 +17,8 @@ package org.deeplearning4j.perf.listener; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.core.listener.SystemInfoFilePrintListener; +import org.deeplearning4j.core.listener.SystemInfoPrintListener; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/plot/BarnesHutTsneTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/plot/BarnesHutTsneTest.java index 7a818810a..502c6a741 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/plot/BarnesHutTsneTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/plot/BarnesHutTsneTest.java @@ -27,7 +27,6 @@ import org.deeplearning4j.clustering.algorithm.Distance; import org.deeplearning4j.clustering.sptree.DataPoint; import org.deeplearning4j.clustering.sptree.SpTree; import org.deeplearning4j.clustering.vptree.VPTree; -import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; import org.deeplearning4j.nn.gradient.Gradient; import org.junit.Before; import org.junit.Ignore; @@ -41,13 +40,12 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.resources.Resources; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertArrayEquals; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/MiscRegressionTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/MiscRegressionTests.java index 952084713..c4ecd7891 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/MiscRegressionTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/MiscRegressionTests.java @@ -27,7 +27,7 @@ import org.deeplearning4j.nn.conf.layers.DenseLayer; import org.deeplearning4j.nn.conf.layers.Layer; import org.deeplearning4j.nn.conf.layers.misc.FrozenLayer; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest050.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest050.java index c76a9fbbe..da2671817 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest050.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest050.java @@ -34,17 +34,15 @@ import org.junit.rules.Timeout; import org.nd4j.linalg.activations.impl.ActivationLReLU; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; import org.nd4j.linalg.learning.config.Nesterovs; import org.nd4j.linalg.learning.config.RmsProp; import org.nd4j.linalg.learning.regularization.WeightDecay; import org.nd4j.linalg.lossfunctions.impl.LossMCXENT; import org.nd4j.linalg.lossfunctions.impl.LossMSE; import org.nd4j.linalg.lossfunctions.impl.LossNegativeLogLikelihood; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; -import java.sql.Time; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest060.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest060.java index d6d404d7d..0f6005884 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest060.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest060.java @@ -37,14 +37,13 @@ import org.junit.Test; import org.nd4j.linalg.activations.impl.ActivationLReLU; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; import org.nd4j.linalg.learning.config.Nesterovs; import org.nd4j.linalg.learning.config.RmsProp; import org.nd4j.linalg.learning.regularization.WeightDecay; import org.nd4j.linalg.lossfunctions.impl.LossMCXENT; import org.nd4j.linalg.lossfunctions.impl.LossMSE; import org.nd4j.linalg.lossfunctions.impl.LossNegativeLogLikelihood; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest071.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest071.java index 2c157b046..76027ca59 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest071.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest071.java @@ -38,14 +38,13 @@ import org.nd4j.linalg.activations.impl.ActivationIdentity; import org.nd4j.linalg.activations.impl.ActivationLReLU; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; import org.nd4j.linalg.learning.config.Nesterovs; import org.nd4j.linalg.learning.config.RmsProp; import org.nd4j.linalg.learning.regularization.WeightDecay; import org.nd4j.linalg.lossfunctions.impl.LossMCXENT; import org.nd4j.linalg.lossfunctions.impl.LossMSE; import org.nd4j.linalg.lossfunctions.impl.LossNegativeLogLikelihood; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest080.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest080.java index 9a8dd5ee0..b4aa72712 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest080.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest080.java @@ -37,14 +37,13 @@ import org.junit.Test; import org.nd4j.linalg.activations.impl.*; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; import org.nd4j.linalg.learning.config.Nesterovs; import org.nd4j.linalg.learning.config.RmsProp; import org.nd4j.linalg.learning.regularization.WeightDecay; import org.nd4j.linalg.lossfunctions.impl.LossMCXENT; import org.nd4j.linalg.lossfunctions.impl.LossMSE; import org.nd4j.linalg.lossfunctions.impl.LossNegativeLogLikelihood; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100a.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100a.java index 05bb8b5eb..dda910b0e 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100a.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100a.java @@ -43,7 +43,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.RmsProp; import org.nd4j.linalg.learning.regularization.WeightDecay; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.DataInputStream; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java index a28c1b845..a96d4cc30 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java @@ -36,16 +36,14 @@ import org.nd4j.linalg.activations.impl.*; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.RmsProp; import org.nd4j.linalg.learning.regularization.WeightDecay; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b4.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b4.java index ec8531eb2..2be2970a7 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b4.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b4.java @@ -65,7 +65,7 @@ import org.nd4j.linalg.learning.config.RmsProp; import org.nd4j.linalg.learning.regularization.L2Regularization; import org.nd4j.linalg.lossfunctions.impl.LossMAE; import org.nd4j.linalg.lossfunctions.impl.LossMCXENT; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; public class RegressionTest100b4 extends BaseDL4JTest { diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b6.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b6.java index e43e4ca74..34bca6cc2 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b6.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b6.java @@ -41,7 +41,7 @@ import org.nd4j.linalg.learning.config.RmsProp; import org.nd4j.linalg.learning.regularization.L2Regularization; import org.nd4j.linalg.lossfunctions.impl.LossMAE; import org.nd4j.linalg.lossfunctions.impl.LossMCXENT; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.DataInputStream; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/customlayer100a/CustomLayerImpl.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/customlayer100a/CustomLayerImpl.java index e6c4260fd..a21202c1d 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/customlayer100a/CustomLayerImpl.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/customlayer100a/CustomLayerImpl.java @@ -27,7 +27,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Layer (implementation) class for the custom layer example diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/ui/UiConnectionInfoTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/ui/UiConnectionInfoTest.java index 5497e57b5..a772c9edc 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/ui/UiConnectionInfoTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/ui/UiConnectionInfoTest.java @@ -17,6 +17,7 @@ package org.deeplearning4j.ui; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.core.ui.UiConnectionInfo; import org.junit.Before; import org.junit.Test; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ArrayUtilTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ArrayUtilTest.java index 14847bba9..96a0c1bc0 100755 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ArrayUtilTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ArrayUtilTest.java @@ -18,7 +18,7 @@ package org.deeplearning4j.util; import org.deeplearning4j.BaseDL4JTest; import org.junit.Test; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelGuesserTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelGuesserTest.java index 5973bae71..7894a6cc6 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelGuesserTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelGuesserTest.java @@ -18,6 +18,7 @@ package org.deeplearning4j.util; import org.apache.commons.compress.utils.IOUtils; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.core.util.ModelGuesser; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; @@ -35,13 +36,12 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.preprocessor.Normalizer; import org.nd4j.linalg.dataset.api.preprocessor.NormalizerMinMaxScaler; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.*; -import java.util.UUID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelSerializerTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelSerializerTest.java index e42f8d298..a26e37ac5 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelSerializerTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelSerializerTest.java @@ -42,7 +42,7 @@ import org.nd4j.linalg.dataset.api.preprocessor.NormalizerStandardize; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.io.FileInputStream; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelValidatorTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelValidatorTests.java index a704a1899..8caefcf6b 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelValidatorTests.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelValidatorTests.java @@ -13,7 +13,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.learning.config.Adam; -import org.nd4j.validation.ValidationResult; +import org.nd4j.common.validation.ValidationResult; import java.io.BufferedOutputStream; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/MovingWindowMatrixTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/MovingWindowMatrixTest.java index 9382f7ea9..3021555b6 100755 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/MovingWindowMatrixTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/MovingWindowMatrixTest.java @@ -17,6 +17,7 @@ package org.deeplearning4j.util; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.core.util.MovingWindowMatrix; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; @@ -33,10 +34,10 @@ public class MovingWindowMatrixTest extends BaseDL4JTest { @Test public void testMovingWindow() { INDArray ones = Nd4j.ones(4, 4); - MovingWindowMatrix m = new MovingWindowMatrix(ones, 2, 2); + org.deeplearning4j.core.util.MovingWindowMatrix m = new org.deeplearning4j.core.util.MovingWindowMatrix(ones, 2, 2); List windows = m.windows(); assertEquals(4, windows.size()); - MovingWindowMatrix m2 = new MovingWindowMatrix(ones, 2, 2, true); + org.deeplearning4j.core.util.MovingWindowMatrix m2 = new MovingWindowMatrix(ones, 2, 2, true); List windowsRotate = m2.windows(); assertEquals(16, windowsRotate.size()); diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/SerializationUtilsTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/SerializationUtilsTest.java index 6b93b6b46..266ed901f 100755 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/SerializationUtilsTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/SerializationUtilsTest.java @@ -16,17 +16,16 @@ package org.deeplearning4j.util; -import org.apache.commons.io.FileUtils; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import java.io.File; -import java.io.IOException; import static org.junit.Assert.assertEquals; @@ -46,9 +45,9 @@ public class SerializationUtilsTest extends BaseDL4JTest { DataSet freshDataSet = iter.next(150); File f = testDir.newFile(irisData); - org.nd4j.linalg.util.SerializationUtils.saveObject(freshDataSet, f); + SerializationUtils.saveObject(freshDataSet, f); - DataSet readDataSet = org.nd4j.linalg.util.SerializationUtils.readObject(f); + DataSet readDataSet = SerializationUtils.readObject(f); assertEquals(freshDataSet.getFeatures(), readDataSet.getFeatures()); assertEquals(freshDataSet.getLabels(), readDataSet.getLabels()); diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/TestUIDProvider.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/TestUIDProvider.java index fd1d6ca7c..403810aae 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/TestUIDProvider.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/TestUIDProvider.java @@ -17,6 +17,7 @@ package org.deeplearning4j.util; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.core.util.UIDProvider; import org.junit.Test; import static junit.framework.TestCase.assertTrue; @@ -30,8 +31,8 @@ public class TestUIDProvider extends BaseDL4JTest { @Test public void testUIDProvider() { - String jvmUID = UIDProvider.getJVMUID(); - String hardwareUID = UIDProvider.getHardwareUID(); + String jvmUID = org.deeplearning4j.core.util.UIDProvider.getJVMUID(); + String hardwareUID = org.deeplearning4j.core.util.UIDProvider.getHardwareUID(); assertNotNull(jvmUID); assertNotNull(hardwareUID); @@ -39,7 +40,7 @@ public class TestUIDProvider extends BaseDL4JTest { assertTrue(!jvmUID.isEmpty()); assertTrue(!hardwareUID.isEmpty()); - assertEquals(jvmUID, UIDProvider.getJVMUID()); + assertEquals(jvmUID, org.deeplearning4j.core.util.UIDProvider.getJVMUID()); assertEquals(hardwareUID, UIDProvider.getHardwareUID()); System.out.println("JVM uid: " + jvmUID); diff --git a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/BaseCudnnHelper.java b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/BaseCudnnHelper.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/BaseCudnnHelper.java rename to deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/BaseCudnnHelper.java index 91ea087d6..faea99273 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/BaseCudnnHelper.java +++ b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/BaseCudnnHelper.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.nn.layers; +package org.deeplearning4j.cuda; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; diff --git a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/convolution/CudnnConvolutionHelper.java b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/convolution/CudnnConvolutionHelper.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/convolution/CudnnConvolutionHelper.java rename to deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/convolution/CudnnConvolutionHelper.java index 3583fc6a7..a4dddb759 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/convolution/CudnnConvolutionHelper.java +++ b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/convolution/CudnnConvolutionHelper.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.nn.layers.convolution; +package org.deeplearning4j.cuda.convolution; import lombok.AllArgsConstructor; import lombok.Data; @@ -32,7 +32,8 @@ import org.deeplearning4j.nn.conf.layers.ConvolutionLayer.FwdAlgo; import org.deeplearning4j.nn.conf.layers.PoolingType; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; -import org.deeplearning4j.nn.layers.BaseCudnnHelper; +import org.deeplearning4j.cuda.BaseCudnnHelper; +import org.deeplearning4j.nn.layers.convolution.ConvolutionHelper; import org.deeplearning4j.nn.params.ConvolutionParamInitializer; import org.deeplearning4j.util.ConvolutionUtils; import org.nd4j.jita.allocator.Allocator; @@ -46,10 +47,10 @@ import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.jcublas.context.CudaContext; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; -import org.nd4j.util.OneTimeLogger; +import org.nd4j.common.util.OneTimeLogger; import java.util.Arrays; import java.util.Collections; @@ -57,7 +58,7 @@ import java.util.Map; import org.bytedeco.cuda.cudart.*; import org.bytedeco.cuda.cudnn.*; -import static org.bytedeco.cuda.global.cudart.*; + import static org.bytedeco.cuda.global.cudnn.*; import static org.nd4j.linalg.indexing.NDArrayIndex.all; import static org.nd4j.linalg.indexing.NDArrayIndex.interval; diff --git a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/CudnnSubsamplingHelper.java b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/convolution/subsampling/CudnnSubsamplingHelper.java similarity index 97% rename from deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/CudnnSubsamplingHelper.java rename to deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/convolution/subsampling/CudnnSubsamplingHelper.java index 84ed6ef63..c733022a7 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/CudnnSubsamplingHelper.java +++ b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/convolution/subsampling/CudnnSubsamplingHelper.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.nn.layers.convolution.subsampling; +package org.deeplearning4j.cuda.convolution.subsampling; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -24,8 +24,9 @@ import org.deeplearning4j.nn.conf.ConvolutionMode; import org.deeplearning4j.nn.conf.layers.PoolingType; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; -import org.deeplearning4j.nn.layers.BaseCudnnHelper; -import org.deeplearning4j.nn.layers.convolution.CudnnConvolutionHelper; +import org.deeplearning4j.cuda.BaseCudnnHelper; +import org.deeplearning4j.cuda.convolution.CudnnConvolutionHelper; +import org.deeplearning4j.nn.layers.convolution.subsampling.SubsamplingHelper; import org.nd4j.jita.allocator.Allocator; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.jita.conf.CudaEnvironment; @@ -35,7 +36,7 @@ import org.nd4j.linalg.api.ops.executioner.GridExecutioner; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.jcublas.context.CudaContext; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; @@ -44,9 +45,9 @@ import java.util.Map; import org.bytedeco.cuda.cudart.*; import org.bytedeco.cuda.cudnn.*; -import static org.bytedeco.cuda.global.cudart.*; + import static org.bytedeco.cuda.global.cudnn.*; -import static org.deeplearning4j.nn.layers.convolution.CudnnConvolutionHelper.getCudnnForwardArgs; +import static org.deeplearning4j.cuda.convolution.CudnnConvolutionHelper.getCudnnForwardArgs; import static org.nd4j.linalg.indexing.NDArrayIndex.all; import static org.nd4j.linalg.indexing.NDArrayIndex.interval; diff --git a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/dropout/CudnnDropoutHelper.java b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/dropout/CudnnDropoutHelper.java similarity index 98% rename from deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/dropout/CudnnDropoutHelper.java rename to deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/dropout/CudnnDropoutHelper.java index 6dbed3423..05bf4ca44 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/dropout/CudnnDropoutHelper.java +++ b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/dropout/CudnnDropoutHelper.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.nn.layers.dropout; +package org.deeplearning4j.cuda.dropout; import lombok.Data; import lombok.extern.slf4j.Slf4j; import com.jakewharton.byteunits.BinaryByteUnit; import org.bytedeco.javacpp.*; import org.deeplearning4j.nn.conf.dropout.DropoutHelper; -import org.deeplearning4j.nn.layers.BaseCudnnHelper; +import org.deeplearning4j.cuda.BaseCudnnHelper; import org.nd4j.jita.allocator.Allocator; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.jita.conf.CudaEnvironment; @@ -29,11 +29,11 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.jcublas.context.CudaContext; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.bytedeco.cuda.cudart.*; import org.bytedeco.cuda.cudnn.*; -import static org.bytedeco.cuda.global.cudart.*; + import static org.bytedeco.cuda.global.cudnn.*; /** diff --git a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/normalization/CudnnBatchNormalizationHelper.java b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/normalization/CudnnBatchNormalizationHelper.java similarity index 98% rename from deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/normalization/CudnnBatchNormalizationHelper.java rename to deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/normalization/CudnnBatchNormalizationHelper.java index fd8cd2657..6c5664930 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/normalization/CudnnBatchNormalizationHelper.java +++ b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/normalization/CudnnBatchNormalizationHelper.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.nn.layers.normalization; +package org.deeplearning4j.cuda.normalization; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -22,7 +22,8 @@ import org.bytedeco.javacpp.Pointer; import org.deeplearning4j.nn.conf.CNN2DFormat; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; -import org.deeplearning4j.nn.layers.BaseCudnnHelper; +import org.deeplearning4j.cuda.BaseCudnnHelper; +import org.deeplearning4j.nn.layers.normalization.BatchNormalizationHelper; import org.deeplearning4j.nn.params.BatchNormalizationParamInitializer; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; @@ -36,8 +37,8 @@ import org.nd4j.linalg.api.ops.executioner.GridExecutioner; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.jcublas.context.CudaContext; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import java.util.HashMap; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/normalization/CudnnLocalResponseNormalizationHelper.java b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/normalization/CudnnLocalResponseNormalizationHelper.java similarity index 97% rename from deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/normalization/CudnnLocalResponseNormalizationHelper.java rename to deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/normalization/CudnnLocalResponseNormalizationHelper.java index 9859ef2d7..fcc924928 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/normalization/CudnnLocalResponseNormalizationHelper.java +++ b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/normalization/CudnnLocalResponseNormalizationHelper.java @@ -14,15 +14,15 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.nn.layers.normalization; +package org.deeplearning4j.cuda.normalization; -import lombok.experimental.var; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.bytedeco.javacpp.Pointer; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; -import org.deeplearning4j.nn.layers.BaseCudnnHelper; +import org.deeplearning4j.cuda.BaseCudnnHelper; +import org.deeplearning4j.nn.layers.normalization.LocalResponseNormalizationHelper; import org.nd4j.jita.allocator.Allocator; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.jita.conf.CudaEnvironment; @@ -32,17 +32,17 @@ import org.nd4j.linalg.api.ops.executioner.GridExecutioner; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.jcublas.context.CudaContext; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Collections; import java.util.Map; import org.bytedeco.cuda.cudart.*; import org.bytedeco.cuda.cudnn.*; -import static org.bytedeco.cuda.global.cudart.*; + import static org.bytedeco.cuda.global.cudnn.*; /** diff --git a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/recurrent/CudnnLSTMHelper.java b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/recurrent/CudnnLSTMHelper.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/recurrent/CudnnLSTMHelper.java rename to deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/recurrent/CudnnLSTMHelper.java index 6d03f3f99..88e5a0d0c 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/nn/layers/recurrent/CudnnLSTMHelper.java +++ b/deeplearning4j/deeplearning4j-cuda/src/main/java/org/deeplearning4j/cuda/recurrent/CudnnLSTMHelper.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.nn.layers.recurrent; +package org.deeplearning4j.cuda.recurrent; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -24,7 +24,9 @@ import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; -import org.deeplearning4j.nn.layers.BaseCudnnHelper; +import org.deeplearning4j.cuda.BaseCudnnHelper; +import org.deeplearning4j.nn.layers.recurrent.FwdPassReturn; +import org.deeplearning4j.nn.layers.recurrent.LSTMHelper; import org.nd4j.jita.allocator.Allocator; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.linalg.activations.IActivation; @@ -35,11 +37,10 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.jcublas.context.CudaContext; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; -import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/CuDNNTestUtils.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/CuDNNTestUtils.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/CuDNNTestUtils.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/CuDNNTestUtils.java index 101a37f37..644fbcaf9 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/CuDNNTestUtils.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/CuDNNTestUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j; +package org.deeplearning4j.cuda; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.layers.convolution.ConvolutionLayer; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/TestDataTypes.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestDataTypes.java similarity index 98% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/TestDataTypes.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestDataTypes.java index 0d85e781a..851b75413 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/TestDataTypes.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestDataTypes.java @@ -14,9 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j; +package org.deeplearning4j.cuda; import lombok.extern.slf4j.Slf4j; +import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; import org.deeplearning4j.nn.conf.ConvolutionMode; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/TestUtils.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestUtils.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/TestUtils.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestUtils.java index d54693f73..6c736b78b 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/TestUtils.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/TestUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j; +package org.deeplearning4j.cuda; import org.apache.commons.compress.utils.IOUtils; import org.deeplearning4j.nn.api.Layer; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/ValidateCuDNN.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/ValidateCuDNN.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/ValidateCuDNN.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/ValidateCuDNN.java index 4ba80c3be..b2093868b 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/ValidateCuDNN.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/ValidateCuDNN.java @@ -14,9 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j; +package org.deeplearning4j.cuda; import lombok.extern.slf4j.Slf4j; +import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.datasets.iterator.ExistingDataSetIterator; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; @@ -26,8 +27,7 @@ import org.deeplearning4j.nn.conf.layers.*; import org.deeplearning4j.nn.layers.convolution.ConvolutionLayer; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; -import org.deeplearning4j.util.CuDNNValidationUtil; -import org.junit.BeforeClass; +import org.deeplearning4j.cuda.util.CuDNNValidationUtil; import org.junit.Ignore; import org.junit.Test; import org.nd4j.linalg.activations.IActivation; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/convolution/ConvDataFormatTests.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/ConvDataFormatTests.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/convolution/ConvDataFormatTests.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/ConvDataFormatTests.java index 8210903ef..fd46c1a8b 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/convolution/ConvDataFormatTests.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/ConvDataFormatTests.java @@ -13,12 +13,12 @@ * * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.convolution; +package org.deeplearning4j.cuda.convolution; import lombok.*; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.CuDNNTestUtils; -import org.deeplearning4j.TestUtils; +import org.deeplearning4j.cuda.CuDNNTestUtils; +import org.deeplearning4j.cuda.TestUtils; import org.deeplearning4j.nn.api.MaskState; import org.deeplearning4j.nn.conf.CNN2DFormat; import org.deeplearning4j.nn.conf.ConvolutionMode; @@ -40,7 +40,7 @@ import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/convolution/TestConvolution.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/TestConvolution.java similarity index 98% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/convolution/TestConvolution.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/TestConvolution.java index 72ab2c043..7af68ec94 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/convolution/TestConvolution.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/convolution/TestConvolution.java @@ -14,12 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.convolution; +package org.deeplearning4j.cuda.convolution; import org.apache.commons.io.FileUtils; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.CuDNNTestUtils; -import org.deeplearning4j.TestUtils; +import org.deeplearning4j.cuda.CuDNNTestUtils; +import org.deeplearning4j.cuda.TestUtils; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.conf.ConvolutionMode; import org.deeplearning4j.nn.conf.GradientNormalization; @@ -39,20 +39,19 @@ import org.deeplearning4j.nn.modelimport.keras.KerasModelImport; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.nd4j.common.resources.Resources; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.resources.Resources; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.lang.reflect.Field; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CNNGradientCheckTest.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CNNGradientCheckTest.java index eb06a70ae..41b69f2a2 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CNNGradientCheckTest.java @@ -14,12 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.gradientcheck; +package org.deeplearning4j.cuda.gradientcheck; import lombok.val; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.TestUtils; +import org.deeplearning4j.cuda.TestUtils; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; +import org.deeplearning4j.gradientcheck.GradientCheckUtil; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.ConvolutionMode; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CuDNNGradientChecks.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CuDNNGradientChecks.java similarity index 98% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CuDNNGradientChecks.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CuDNNGradientChecks.java index a2ab8236f..2524609a9 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CuDNNGradientChecks.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/gradientcheck/CuDNNGradientChecks.java @@ -14,11 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.gradientcheck; +package org.deeplearning4j.cuda.gradientcheck; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.TestUtils; +import org.deeplearning4j.cuda.TestUtils; +import org.deeplearning4j.gradientcheck.GradientCheckUtil; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.ConvolutionMode; @@ -31,14 +32,14 @@ import org.deeplearning4j.nn.conf.dropout.IDropout; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.conf.layers.*; import org.deeplearning4j.nn.layers.convolution.ConvolutionHelper; -import org.deeplearning4j.nn.layers.convolution.CudnnConvolutionHelper; +import org.deeplearning4j.cuda.convolution.CudnnConvolutionHelper; import org.deeplearning4j.nn.layers.convolution.subsampling.SubsamplingHelper; -import org.deeplearning4j.nn.layers.dropout.CudnnDropoutHelper; +import org.deeplearning4j.cuda.dropout.CudnnDropoutHelper; import org.deeplearning4j.nn.layers.normalization.BatchNormalizationHelper; -import org.deeplearning4j.nn.layers.normalization.CudnnBatchNormalizationHelper; -import org.deeplearning4j.nn.layers.normalization.CudnnLocalResponseNormalizationHelper; +import org.deeplearning4j.cuda.normalization.CudnnBatchNormalizationHelper; +import org.deeplearning4j.cuda.normalization.CudnnLocalResponseNormalizationHelper; import org.deeplearning4j.nn.layers.normalization.LocalResponseNormalizationHelper; -import org.deeplearning4j.nn.layers.recurrent.CudnnLSTMHelper; +import org.deeplearning4j.cuda.recurrent.CudnnLSTMHelper; import org.deeplearning4j.nn.layers.recurrent.LSTMHelper; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/lstm/ValidateCudnnDropout.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/lstm/ValidateCudnnDropout.java similarity index 97% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/lstm/ValidateCudnnDropout.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/lstm/ValidateCudnnDropout.java index c46bb99d9..b59bd64d6 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/lstm/ValidateCudnnDropout.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/lstm/ValidateCudnnDropout.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.lstm; +package org.deeplearning4j.cuda.lstm; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.nn.layers.dropout.CudnnDropoutHelper; +import org.deeplearning4j.cuda.dropout.CudnnDropoutHelper; import org.junit.Test; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/lstm/ValidateCudnnLSTM.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/lstm/ValidateCudnnLSTM.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/lstm/ValidateCudnnLSTM.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/lstm/ValidateCudnnLSTM.java index 6bbb934a5..8d5ece6ff 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/lstm/ValidateCudnnLSTM.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/lstm/ValidateCudnnLSTM.java @@ -14,17 +14,17 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.lstm; +package org.deeplearning4j.cuda.lstm; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.TestUtils; +import org.deeplearning4j.cuda.TestUtils; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.conf.*; import org.deeplearning4j.nn.conf.distribution.NormalDistribution; import org.deeplearning4j.nn.conf.layers.LSTM; import org.deeplearning4j.nn.conf.layers.RnnOutputLayer; import org.deeplearning4j.nn.gradient.Gradient; -import org.deeplearning4j.nn.layers.recurrent.CudnnLSTMHelper; +import org.deeplearning4j.cuda.recurrent.CudnnLSTMHelper; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.junit.Test; import org.nd4j.linalg.activations.Activation; diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/util/CuDNNValidationUtil.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/util/CuDNNValidationUtil.java similarity index 99% rename from deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/util/CuDNNValidationUtil.java rename to deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/util/CuDNNValidationUtil.java index 591a19e17..4532d0831 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/util/CuDNNValidationUtil.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/cuda/util/CuDNNValidationUtil.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.util; +package org.deeplearning4j.cuda.util; import it.unimi.dsi.fastutil.doubles.DoubleArrayList; import lombok.*; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/base/EmnistFetcher.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/base/EmnistFetcher.java similarity index 99% rename from deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/base/EmnistFetcher.java rename to deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/base/EmnistFetcher.java index 777ace9c3..1930c312c 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/base/EmnistFetcher.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/base/EmnistFetcher.java @@ -14,14 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.base; +package org.deeplearning4j.datasets.base; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.datasets.iterator.impl.EmnistDataSetIterator; -import java.io.File; - /** * Downloader for EMNIST dataset * diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/base/IrisUtils.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/base/IrisUtils.java old mode 100755 new mode 100644 similarity index 97% rename from deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/base/IrisUtils.java rename to deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/base/IrisUtils.java index 6df2212ce..19412067f --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/base/IrisUtils.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/base/IrisUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.base; +package org.deeplearning4j.datasets.base; import org.apache.commons.io.IOUtils; import org.deeplearning4j.common.resources.DL4JResources; @@ -22,7 +22,7 @@ import org.deeplearning4j.common.resources.ResourceType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.resources.Downloader; +import org.nd4j.common.resources.Downloader; import java.io.File; import java.io.FileInputStream; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/base/MnistFetcher.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/base/MnistFetcher.java old mode 100755 new mode 100644 similarity index 96% rename from deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/base/MnistFetcher.java rename to deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/base/MnistFetcher.java index a588d9fc1..cd8c4ae01 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/base/MnistFetcher.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/base/MnistFetcher.java @@ -14,18 +14,14 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.base; +package org.deeplearning4j.datasets.base; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.common.resources.ResourceType; -import org.nd4j.resources.Downloader; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.resources.Downloader; import java.io.*; import java.net.URL; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/CacheableExtractableDataSetFetcher.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/CacheableExtractableDataSetFetcher.java index 4a8d01aa4..889005894 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/CacheableExtractableDataSetFetcher.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/CacheableExtractableDataSetFetcher.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.common.resources.ResourceType; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.util.ArchiveUtils; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/Cifar10Fetcher.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/Cifar10Fetcher.java index 74d0031cf..e723cab1d 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/Cifar10Fetcher.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/Cifar10Fetcher.java @@ -25,7 +25,7 @@ import org.datavec.image.loader.BaseImageLoader; import org.datavec.image.recordreader.ImageRecordReader; import org.datavec.image.transform.ImageTransform; import org.deeplearning4j.common.resources.DL4JResources; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.io.File; import java.util.Random; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/EmnistDataFetcher.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/EmnistDataFetcher.java index 071c8c009..cec1e8ad5 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/EmnistDataFetcher.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/EmnistDataFetcher.java @@ -19,7 +19,7 @@ package org.deeplearning4j.datasets.fetchers; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; -import org.deeplearning4j.base.EmnistFetcher; +import org.deeplearning4j.datasets.base.EmnistFetcher; import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.common.resources.ResourceType; import org.deeplearning4j.datasets.iterator.impl.EmnistDataSetIterator; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/IrisDataFetcher.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/IrisDataFetcher.java index 9fb045957..120858433 100755 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/IrisDataFetcher.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/IrisDataFetcher.java @@ -16,7 +16,7 @@ package org.deeplearning4j.datasets.fetchers; -import org.deeplearning4j.base.IrisUtils; +import org.deeplearning4j.datasets.base.IrisUtils; import org.nd4j.linalg.dataset.api.iterator.fetcher.BaseDataFetcher; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/MnistDataFetcher.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/MnistDataFetcher.java index 3be8401d7..b9ad2fe04 100755 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/MnistDataFetcher.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/MnistDataFetcher.java @@ -18,7 +18,7 @@ package org.deeplearning4j.datasets.fetchers; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; -import org.deeplearning4j.base.MnistFetcher; +import org.deeplearning4j.datasets.base.MnistFetcher; import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.common.resources.ResourceType; import org.deeplearning4j.datasets.mnist.MnistManager; @@ -28,7 +28,7 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.fetcher.BaseDataFetcher; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.util.MathUtils; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/TinyImageNetFetcher.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/TinyImageNetFetcher.java index 6eaaf835a..04bd63c98 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/TinyImageNetFetcher.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/fetchers/TinyImageNetFetcher.java @@ -16,7 +16,6 @@ package org.deeplearning4j.datasets.fetchers; -import org.apache.commons.io.FileUtils; import org.datavec.api.io.filters.RandomPathFilter; import org.datavec.api.io.labels.ParentPathLabelGenerator; import org.datavec.api.records.reader.RecordReader; @@ -25,17 +24,10 @@ import org.datavec.api.split.InputSplit; import org.datavec.image.loader.BaseImageLoader; import org.datavec.image.recordreader.ImageRecordReader; import org.datavec.image.transform.ImageTransform; -import org.datavec.image.transform.MultiImageTransform; -import org.datavec.image.transform.ResizeImageTransform; import org.deeplearning4j.common.resources.DL4JResources; -import org.nd4j.base.Preconditions; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.nd4j.common.base.Preconditions; import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import java.util.Random; /** diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/iterator/impl/Cifar10DataSetIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/iterator/impl/Cifar10DataSetIterator.java index 23e3fb62d..c2373d6c4 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/iterator/impl/Cifar10DataSetIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/iterator/impl/Cifar10DataSetIterator.java @@ -24,8 +24,7 @@ import org.deeplearning4j.common.resources.ResourceType; import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator; import org.deeplearning4j.datasets.fetchers.Cifar10Fetcher; import org.deeplearning4j.datasets.fetchers.DataSetType; -import org.deeplearning4j.datasets.fetchers.TinyImageNetFetcher; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/iterator/impl/TinyImageNetDataSetIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/iterator/impl/TinyImageNetDataSetIterator.java index 8eba24ceb..fbbe3cc97 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/iterator/impl/TinyImageNetDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datasets/src/main/java/org/deeplearning4j/datasets/iterator/impl/TinyImageNetDataSetIterator.java @@ -24,7 +24,7 @@ import org.deeplearning4j.common.resources.ResourceType; import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator; import org.deeplearning4j.datasets.fetchers.DataSetType; import org.deeplearning4j.datasets.fetchers.TinyImageNetFetcher; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java index 9f7813d5c..38d931184 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java @@ -30,7 +30,7 @@ import org.datavec.api.records.reader.SequenceRecordReader; import org.datavec.api.records.reader.impl.ConcatenatingRecordReader; import org.datavec.api.records.reader.impl.collection.CollectionRecordReader; import org.datavec.api.writable.Writable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIterator.java index 92d5d579e..3096ca886 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-datavec-iterators/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIterator.java @@ -33,7 +33,7 @@ import org.datavec.api.writable.NDArrayWritable; import org.datavec.api.writable.Writable; import org.datavec.api.writable.batch.NDArrayRecordBatch; import org.deeplearning4j.datasets.datavec.exception.ZeroLengthSequenceException; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.MultiDataSetPreProcessor; @@ -41,7 +41,7 @@ import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.IOException; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/AbstractDataSetIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/AbstractDataSetIterator.java index 619b31bdf..18b1b00b6 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/AbstractDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/AbstractDataSetIterator.java @@ -22,7 +22,7 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Iterator; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/DoublesDataSetIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/DoublesDataSetIterator.java index 7738d3176..629f282dd 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/DoublesDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/DoublesDataSetIterator.java @@ -17,7 +17,7 @@ package org.deeplearning4j.datasets.iterator; import lombok.NonNull; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * A simple utility iterator for creating a DataSetIterator from an {@code Iterable>}. diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/FloatsDataSetIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/FloatsDataSetIterator.java index 59c8f02e7..bd55fa7c2 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/FloatsDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/FloatsDataSetIterator.java @@ -17,7 +17,7 @@ package org.deeplearning4j.datasets.iterator; import lombok.NonNull; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/INDArrayDataSetIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/INDArrayDataSetIterator.java index 6859c9346..f8d462a1f 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/INDArrayDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/INDArrayDataSetIterator.java @@ -18,7 +18,7 @@ package org.deeplearning4j.datasets.iterator; import lombok.NonNull; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * A simple utility iterator for creating a DataSetIterator from an {@code Iterable>}. diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/RandomMultiDataSetIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/RandomMultiDataSetIterator.java index 2d085595e..14564441a 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/RandomMultiDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/RandomMultiDataSetIterator.java @@ -19,7 +19,7 @@ package org.deeplearning4j.datasets.iterator; import lombok.Getter; import lombok.NonNull; import lombok.Setter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.random.impl.BernoulliDistribution; import org.nd4j.linalg.dataset.api.MultiDataSet; @@ -27,7 +27,7 @@ import org.nd4j.linalg.dataset.api.MultiDataSetPreProcessor; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/file/BaseFileIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/file/BaseFileIterator.java index 01bd0c2a9..a0cabdf7c 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/file/BaseFileIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/file/BaseFileIterator.java @@ -21,9 +21,9 @@ import lombok.NonNull; import lombok.Setter; import org.apache.commons.io.FileUtils; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.collection.CompactHeapStringList; +import org.nd4j.common.collection.CompactHeapStringList; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.util.MathUtils; import java.io.File; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/impl/MovingWindowDataSetFetcher.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/impl/MovingWindowDataSetFetcher.java index 96958ea82..e8bee9092 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/impl/MovingWindowDataSetFetcher.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/impl/MovingWindowDataSetFetcher.java @@ -20,7 +20,7 @@ import org.deeplearning4j.util.MovingWindowMatrix; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.fetcher.BaseDataFetcher; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/loader/DataSetLoaderIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/loader/DataSetLoaderIterator.java index 31462aec6..18ca8ca5c 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/loader/DataSetLoaderIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/loader/DataSetLoaderIterator.java @@ -19,20 +19,21 @@ package org.deeplearning4j.datasets.iterator.loader; import lombok.Data; import lombok.Getter; import lombok.Setter; -import org.nd4j.api.loader.Loader; -import org.nd4j.api.loader.Source; -import org.nd4j.api.loader.SourceFactory; +import org.nd4j.common.loader.Loader; +import org.nd4j.common.loader.Source; +import org.nd4j.common.loader.SourceFactory; +import org.nd4j.common.loader.LocalFileSourceFactory; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.util.MathUtils; import java.io.IOException; import java.util.*; /** * A DataSetLoader that loads DataSets from a path, using a {@code Loader} such as SerializedDataSetLoader. - * Paths are converted to input streams using {@link SourceFactory} such as {@link org.nd4j.api.loader.LocalFileSourceFactory}. + * Paths are converted to input streams using {@link SourceFactory} such as {@link LocalFileSourceFactory}. * Note that this iterator does not implement any sort of merging/batching functionality - it simply returns the DataSets * as-is from the path/loader. * diff --git a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/loader/MultiDataSetLoaderIterator.java b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/loader/MultiDataSetLoaderIterator.java index 241123b56..faba56093 100644 --- a/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/loader/MultiDataSetLoaderIterator.java +++ b/deeplearning4j/deeplearning4j-data/deeplearning4j-utility-iterators/src/main/java/org/deeplearning4j/datasets/iterator/loader/MultiDataSetLoaderIterator.java @@ -17,20 +17,21 @@ package org.deeplearning4j.datasets.iterator.loader; import lombok.Data; -import org.nd4j.api.loader.Loader; -import org.nd4j.api.loader.Source; -import org.nd4j.api.loader.SourceFactory; +import org.nd4j.common.loader.Loader; +import org.nd4j.common.loader.Source; +import org.nd4j.common.loader.SourceFactory; +import org.nd4j.common.loader.LocalFileSourceFactory; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.MultiDataSetPreProcessor; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.util.MathUtils; import java.io.IOException; import java.util.*; /** * A MultiDataSetLoader that loads MultiDataSets from a path, using a {@code Loader} such as {@link SerializedMultiDataSetLoader}. - * Paths are converted to input streams using {@link SourceFactory} such as {@link org.nd4j.api.loader.LocalFileSourceFactory}. + * Paths are converted to input streams using {@link SourceFactory} such as {@link LocalFileSourceFactory}. * Note that this iterator does not implement any sort of merging/batching functionality - it simply returns the DataSets * as-is from the path/loader. * diff --git a/deeplearning4j/deeplearning4j-graph/src/main/java/org/deeplearning4j/graph/models/embeddings/GraphVectorsImpl.java b/deeplearning4j/deeplearning4j-graph/src/main/java/org/deeplearning4j/graph/models/embeddings/GraphVectorsImpl.java index 0fc0e5a60..bfc174f75 100644 --- a/deeplearning4j/deeplearning4j-graph/src/main/java/org/deeplearning4j/graph/models/embeddings/GraphVectorsImpl.java +++ b/deeplearning4j/deeplearning4j-graph/src/main/java/org/deeplearning4j/graph/models/embeddings/GraphVectorsImpl.java @@ -25,7 +25,7 @@ import org.nd4j.linalg.api.blas.Level1; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Comparator; import java.util.PriorityQueue; diff --git a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/AssertTestsExtendedBaseClass.java b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/AssertTestsExtendedBaseClass.java index 7341a3a2c..4aa3f5507 100644 --- a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/AssertTestsExtendedBaseClass.java +++ b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/AssertTestsExtendedBaseClass.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.*; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; /** * This class checks that all test classes (i.e., anything with one or more methods annotated with @Test) diff --git a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/data/TestGraphLoading.java b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/data/TestGraphLoading.java index f4c970a22..b80a8c976 100644 --- a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/data/TestGraphLoading.java +++ b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/data/TestGraphLoading.java @@ -26,7 +26,7 @@ import org.deeplearning4j.graph.graph.Graph; import org.deeplearning4j.graph.vertexfactory.StringVertexFactory; import org.deeplearning4j.graph.vertexfactory.VertexFactory; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/data/TestGraphLoadingWeighted.java b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/data/TestGraphLoadingWeighted.java index 77903f51e..524fa9de1 100644 --- a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/data/TestGraphLoadingWeighted.java +++ b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/data/TestGraphLoadingWeighted.java @@ -25,7 +25,7 @@ import org.deeplearning4j.graph.graph.Graph; import org.deeplearning4j.graph.vertexfactory.StringVertexFactory; import org.deeplearning4j.graph.vertexfactory.VertexFactory; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/graph/TestGraph.java b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/graph/TestGraph.java index b0adf3283..6a241393b 100644 --- a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/graph/TestGraph.java +++ b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/graph/TestGraph.java @@ -24,9 +24,8 @@ import org.deeplearning4j.graph.iterator.RandomWalkIterator; import org.deeplearning4j.graph.iterator.WeightedRandomWalkIterator; import org.deeplearning4j.graph.vertexfactory.VertexFactory; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/models/deepwalk/DeepWalkGradientCheck.java b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/models/deepwalk/DeepWalkGradientCheck.java index f0343bde9..eb217b068 100644 --- a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/models/deepwalk/DeepWalkGradientCheck.java +++ b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/models/deepwalk/DeepWalkGradientCheck.java @@ -24,15 +24,12 @@ import org.deeplearning4j.graph.iterator.RandomWalkIterator; import org.deeplearning4j.graph.models.embeddings.InMemoryGraphLookupTable; import org.junit.Before; import org.junit.Test; -import org.nd4j.linalg.api.buffer.DataBuffer; 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.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; -import java.util.Arrays; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/models/deepwalk/TestDeepWalk.java b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/models/deepwalk/TestDeepWalk.java index 97359cf15..91939430f 100644 --- a/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/models/deepwalk/TestDeepWalk.java +++ b/deeplearning4j/deeplearning4j-graph/src/test/java/org/deeplearning4j/graph/models/deepwalk/TestDeepWalk.java @@ -16,7 +16,6 @@ package org.deeplearning4j.graph.models.deepwalk; -import org.apache.commons.io.FilenameUtils; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.graph.api.Edge; import org.deeplearning4j.graph.api.IGraph; @@ -34,11 +33,10 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.io.IOException; -import java.util.Arrays; import java.util.Random; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/src/main/java/org/deeplearning4j/plot/BarnesHutTsne.java b/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/src/main/java/org/deeplearning4j/plot/BarnesHutTsne.java index 7595a0777..a9f92cefc 100644 --- a/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/src/main/java/org/deeplearning4j/plot/BarnesHutTsne.java +++ b/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/src/main/java/org/deeplearning4j/plot/BarnesHutTsne.java @@ -22,7 +22,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.math3.util.FastMath; import org.deeplearning4j.clustering.algorithm.Distance; import org.deeplearning4j.clustering.sptree.DataPoint; import org.deeplearning4j.clustering.sptree.SpTree; @@ -43,8 +42,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.BooleanIndexing; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.learning.legacy.AdaGrad; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; import java.io.BufferedWriter; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/src/main/java/org/deeplearning4j/plot/Tsne.java b/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/src/main/java/org/deeplearning4j/plot/Tsne.java index c530d768a..18061674f 100644 --- a/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/src/main/java/org/deeplearning4j/plot/Tsne.java +++ b/deeplearning4j/deeplearning4j-manifold/deeplearning4j-tsne/src/main/java/org/deeplearning4j/plot/Tsne.java @@ -26,8 +26,8 @@ import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.SpecifiedIndex; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.learning.legacy.AdaGrad; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-modelexport-solr/src/main/java/org/deeplearning4j/nn/modelexport/solr/handler/ModelTupleStream.java b/deeplearning4j/deeplearning4j-modelexport-solr/src/main/java/org/deeplearning4j/nn/modelexport/solr/handler/ModelTupleStream.java index e7a48163c..2dd353dec 100644 --- a/deeplearning4j/deeplearning4j-modelexport-solr/src/main/java/org/deeplearning4j/nn/modelexport/solr/handler/ModelTupleStream.java +++ b/deeplearning4j/deeplearning4j-modelexport-solr/src/main/java/org/deeplearning4j/nn/modelexport/solr/handler/ModelTupleStream.java @@ -37,7 +37,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; import org.apache.solr.core.SolrResourceLoader; import org.apache.solr.handler.SolrDefaultStreamFactory; import org.deeplearning4j.nn.api.Model; -import org.deeplearning4j.util.ModelGuesser; +import org.deeplearning4j.core.util.ModelGuesser; import org.deeplearning4j.util.NetworkUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/deeplearning4j/deeplearning4j-modelexport-solr/src/main/java/org/deeplearning4j/nn/modelexport/solr/ltr/model/ScoringModel.java b/deeplearning4j/deeplearning4j-modelexport-solr/src/main/java/org/deeplearning4j/nn/modelexport/solr/ltr/model/ScoringModel.java index a35201250..60aac48c2 100644 --- a/deeplearning4j/deeplearning4j-modelexport-solr/src/main/java/org/deeplearning4j/nn/modelexport/solr/ltr/model/ScoringModel.java +++ b/deeplearning4j/deeplearning4j-modelexport-solr/src/main/java/org/deeplearning4j/nn/modelexport/solr/ltr/model/ScoringModel.java @@ -32,7 +32,7 @@ import org.apache.solr.ltr.norm.Normalizer; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.deeplearning4j.util.ModelGuesser; +import org.deeplearning4j.core.util.ModelGuesser; import org.deeplearning4j.util.NetworkUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/deeplearning4j/deeplearning4j-modelexport-solr/src/test/java/org/deeplearning4j/nn/modelexport/solr/handler/ModelTupleStreamTest.java b/deeplearning4j/deeplearning4j-modelexport-solr/src/test/java/org/deeplearning4j/nn/modelexport/solr/handler/ModelTupleStreamTest.java index 80073677f..dbbe6b880 100644 --- a/deeplearning4j/deeplearning4j-modelexport-solr/src/test/java/org/deeplearning4j/nn/modelexport/solr/handler/ModelTupleStreamTest.java +++ b/deeplearning4j/deeplearning4j-modelexport-solr/src/test/java/org/deeplearning4j/nn/modelexport/solr/handler/ModelTupleStreamTest.java @@ -44,7 +44,7 @@ import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.layers.OutputLayer; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.deeplearning4j.util.ModelGuesser; +import org.deeplearning4j.core.util.ModelGuesser; import org.deeplearning4j.util.ModelSerializer; import org.deeplearning4j.util.NetworkUtils; import static org.junit.Assert.assertFalse; diff --git a/deeplearning4j/deeplearning4j-modelexport-solr/src/test/java/org/deeplearning4j/nn/modelexport/solr/ltr/model/ScoringModelTest.java b/deeplearning4j/deeplearning4j-modelexport-solr/src/test/java/org/deeplearning4j/nn/modelexport/solr/ltr/model/ScoringModelTest.java index 7b4741174..37d58312d 100644 --- a/deeplearning4j/deeplearning4j-modelexport-solr/src/test/java/org/deeplearning4j/nn/modelexport/solr/ltr/model/ScoringModelTest.java +++ b/deeplearning4j/deeplearning4j-modelexport-solr/src/test/java/org/deeplearning4j/nn/modelexport/solr/ltr/model/ScoringModelTest.java @@ -43,7 +43,7 @@ import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.layers.OutputLayer; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.deeplearning4j.util.ModelGuesser; +import org.deeplearning4j.core.util.ModelGuesser; import org.deeplearning4j.util.ModelSerializer; import org.nd4j.linalg.activations.Activation; import static org.junit.Assert.assertEquals; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java index 4c36b2ac4..8aa38439c 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java @@ -38,7 +38,7 @@ import org.deeplearning4j.nn.modelimport.keras.utils.KerasModelBuilder; import org.deeplearning4j.nn.modelimport.keras.utils.KerasModelUtils; import org.deeplearning4j.nn.modelimport.keras.utils.KerasOptimizerUtils; import org.nd4j.linalg.learning.config.IUpdater; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.IOException; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModelImport.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModelImport.java index ac700c8a5..e56fc05c2 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModelImport.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModelImport.java @@ -24,7 +24,7 @@ import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.modelimport.keras.exceptions.InvalidKerasConfigurationException; import org.deeplearning4j.nn.modelimport.keras.exceptions.UnsupportedKerasConfigurationException; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.deeplearning4j.util.DL4JFileUtils; +import org.deeplearning4j.common.util.DL4JFileUtils; import java.io.*; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasSequentialModel.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasSequentialModel.java index d163c0776..9175fa9d6 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasSequentialModel.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasSequentialModel.java @@ -28,7 +28,7 @@ import org.deeplearning4j.nn.modelimport.keras.layers.KerasInput; import org.deeplearning4j.nn.modelimport.keras.utils.KerasModelBuilder; import org.deeplearning4j.nn.modelimport.keras.utils.KerasModelUtils; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.IOException; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/TFOpLayerImpl.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/TFOpLayerImpl.java index ebc1ca5f0..751f939c9 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/TFOpLayerImpl.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/TFOpLayerImpl.java @@ -27,7 +27,7 @@ import org.nd4j.TFGraphRunnerService; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/advanced/activations/KerasPReLU.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/advanced/activations/KerasPReLU.java index 8877d8b5a..8dad3d35e 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/advanced/activations/KerasPReLU.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/advanced/activations/KerasPReLU.java @@ -28,7 +28,7 @@ import org.deeplearning4j.nn.modelimport.keras.utils.KerasLayerUtils; import org.deeplearning4j.nn.params.PReLUParamInitializer; import org.deeplearning4j.nn.weights.IWeightInit; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.HashMap; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/convolutional/KerasConvolutionUtils.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/convolutional/KerasConvolutionUtils.java index d60e5f6e8..ff3a2cd4c 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/convolutional/KerasConvolutionUtils.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/convolutional/KerasConvolutionUtils.java @@ -21,7 +21,7 @@ import org.deeplearning4j.nn.modelimport.keras.config.KerasLayerConfiguration; import org.deeplearning4j.nn.modelimport.keras.exceptions.InvalidKerasConfigurationException; import org.deeplearning4j.nn.modelimport.keras.exceptions.UnsupportedKerasConfigurationException; import org.deeplearning4j.nn.modelimport.keras.utils.KerasLayerUtils; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/core/KerasPermute.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/core/KerasPermute.java index 344c71cae..3c3f7dc41 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/core/KerasPermute.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/core/KerasPermute.java @@ -24,7 +24,7 @@ import org.deeplearning4j.nn.modelimport.keras.exceptions.InvalidKerasConfigurat import org.deeplearning4j.nn.modelimport.keras.exceptions.UnsupportedKerasConfigurationException; import org.deeplearning4j.nn.modelimport.keras.preprocessors.PermutePreprocessor; import org.deeplearning4j.nn.modelimport.keras.utils.KerasLayerUtils; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Arrays; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/recurrent/KerasLSTM.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/recurrent/KerasLSTM.java index 3ab596cd5..d2b9f42ff 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/recurrent/KerasLSTM.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/recurrent/KerasLSTM.java @@ -41,7 +41,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collections; import java.util.HashMap; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/recurrent/KerasSimpleRnn.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/recurrent/KerasSimpleRnn.java index 3e44bd1f9..3a8b9806f 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/recurrent/KerasSimpleRnn.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/recurrent/KerasSimpleRnn.java @@ -23,7 +23,6 @@ import org.deeplearning4j.nn.api.layers.LayerConstraint; import org.deeplearning4j.nn.conf.InputPreProcessor; import org.deeplearning4j.nn.conf.RNNFormat; import org.deeplearning4j.nn.conf.inputs.InputType; -import org.deeplearning4j.nn.conf.layers.BaseRecurrentLayer; import org.deeplearning4j.nn.conf.layers.FeedForwardLayer; import org.deeplearning4j.nn.conf.layers.InputTypeUtil; import org.deeplearning4j.nn.conf.layers.Layer; @@ -40,7 +39,7 @@ import org.deeplearning4j.nn.params.SimpleRnnParamInitializer; import org.deeplearning4j.nn.weights.IWeightInit; import org.deeplearning4j.util.TimeSeriesUtils; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collections; import java.util.HashMap; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGenerator.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGenerator.java index 2a81886e0..b08a6a35c 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGenerator.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGenerator.java @@ -24,7 +24,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.IOException; import java.nio.file.Files; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/preprocessors/ReshapePreprocessor.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/preprocessors/ReshapePreprocessor.java index e6819a3bf..16fa1eed2 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/preprocessors/ReshapePreprocessor.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/preprocessors/ReshapePreprocessor.java @@ -36,7 +36,7 @@ import org.nd4j.shade.jackson.annotation.JsonProperty; import java.util.Arrays; -import static org.nd4j.linalg.util.ArrayUtil.prodLong; +import static org.nd4j.common.util.ArrayUtil.prodLong; /** * Generic reshape preprocessor. diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/DL4JKerasModelValidator.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/DL4JKerasModelValidator.java index 2ace14aa3..71cfca4a7 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/DL4JKerasModelValidator.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/DL4JKerasModelValidator.java @@ -5,8 +5,8 @@ import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.modelimport.keras.Hdf5Archive; import org.deeplearning4j.nn.modelimport.keras.config.KerasModelConfiguration; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.nd4j.validation.Nd4jCommonValidator; -import org.nd4j.validation.ValidationResult; +import org.nd4j.common.validation.Nd4jCommonValidator; +import org.nd4j.common.validation.ValidationResult; import java.io.File; import java.util.Collections; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasLayerUtils.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasLayerUtils.java index a0578a4df..13d555281 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasLayerUtils.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasLayerUtils.java @@ -44,7 +44,7 @@ import org.deeplearning4j.nn.modelimport.keras.layers.recurrent.KerasLSTM; import org.deeplearning4j.nn.modelimport.keras.layers.recurrent.KerasSimpleRnn; import org.deeplearning4j.nn.modelimport.keras.layers.wrappers.KerasBidirectional; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.lang.reflect.Constructor; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/MiscTests.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/MiscTests.java index 92c55c891..4a379dbbd 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/MiscTests.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/MiscTests.java @@ -23,8 +23,8 @@ import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.resources.Resources; -import org.nd4j.validation.ValidationResult; +import org.nd4j.common.resources.Resources; +import org.nd4j.common.validation.ValidationResult; import java.io.BufferedInputStream; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/TestTFKerasModelImport.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/TestTFKerasModelImport.java index 455d7ca56..d066017c7 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/TestTFKerasModelImport.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/TestTFKerasModelImport.java @@ -26,12 +26,12 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.nd4j.common.resources.Resources; import org.nd4j.common.tests.ResourceUtils; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.concurrency.AffinityManager; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.resources.Resources; import java.io.File; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/FullModelComparisons.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/FullModelComparisons.java index ee5129b84..9d7966420 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/FullModelComparisons.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/FullModelComparisons.java @@ -41,8 +41,8 @@ import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.resources.Resources; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/Keras1ModelConfigurationTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/Keras1ModelConfigurationTest.java index d4b8e453a..d7772f32f 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/Keras1ModelConfigurationTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/Keras1ModelConfigurationTest.java @@ -24,7 +24,7 @@ import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.nn.modelimport.keras.KerasModel; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/Keras2ModelConfigurationTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/Keras2ModelConfigurationTest.java index 7f566a6cb..84243be31 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/Keras2ModelConfigurationTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/Keras2ModelConfigurationTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/KerasModelImportTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/KerasModelImportTest.java index 5a10760d5..15221c325 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/KerasModelImportTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/KerasModelImportTest.java @@ -23,7 +23,7 @@ import org.deeplearning4j.nn.modelimport.keras.exceptions.InvalidKerasConfigurat import org.deeplearning4j.nn.modelimport.keras.exceptions.UnsupportedKerasConfigurationException; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasLambdaTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasLambdaTest.java index 1d55a5d2c..b4abeef90 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasLambdaTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasLambdaTest.java @@ -31,7 +31,7 @@ import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java index f705f9f86..122e5443f 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java @@ -49,12 +49,12 @@ import org.nd4j.linalg.activations.impl.*; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.BiFunction; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.BiFunction; +import org.nd4j.common.function.Function; import org.nd4j.linalg.learning.config.NoOp; import org.nd4j.linalg.lossfunctions.LossFunctions; import org.nd4j.linalg.lossfunctions.impl.LossSparseMCXENT; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasYolo9000Test.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasYolo9000Test.java index f428a0dbd..c8ff853e5 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasYolo9000Test.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasYolo9000Test.java @@ -26,7 +26,7 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/layers/convolution/KerasDepthwiseConvolution2DTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/layers/convolution/KerasDepthwiseConvolution2DTest.java index 6b173ba8e..d0fdb5df4 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/layers/convolution/KerasDepthwiseConvolution2DTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/layers/convolution/KerasDepthwiseConvolution2DTest.java @@ -29,7 +29,7 @@ import org.deeplearning4j.nn.modelimport.keras.layers.convolutional.KerasDepthwi import org.deeplearning4j.nn.weights.IWeightInit; import org.deeplearning4j.nn.weights.WeightInitXavier; import org.junit.Test; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/optimizers/OptimizerImport.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/optimizers/OptimizerImport.java index d030158f0..0e8d6feb8 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/optimizers/OptimizerImport.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/optimizers/OptimizerImport.java @@ -20,9 +20,9 @@ import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.nn.modelimport.keras.KerasModel; import org.deeplearning4j.nn.modelimport.keras.KerasSequentialModel; import org.deeplearning4j.nn.modelimport.keras.utils.KerasModelBuilder; -import org.deeplearning4j.util.DL4JFileUtils; +import org.deeplearning4j.common.util.DL4JFileUtils; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGeneratorImportTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGeneratorImportTest.java index fc0cbfe9b..035d0025d 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGeneratorImportTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGeneratorImportTest.java @@ -19,7 +19,7 @@ package org.deeplearning4j.nn.modelimport.keras.preprocessing.sequence; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.nn.modelimport.keras.exceptions.InvalidKerasConfigurationException; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGeneratorTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGeneratorTest.java index b068881e1..7495446ee 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGeneratorTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/sequence/TimeSeriesGeneratorTest.java @@ -21,7 +21,7 @@ import org.deeplearning4j.nn.modelimport.keras.exceptions.InvalidKerasConfigurat import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import static org.junit.Assert.assertEquals; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/text/TokenizerImportTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/text/TokenizerImportTest.java index 935be4fbe..f464384df 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/text/TokenizerImportTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/preprocessing/text/TokenizerImportTest.java @@ -19,7 +19,7 @@ package org.deeplearning4j.nn.modelimport.keras.preprocessing.text; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.nn.modelimport.keras.exceptions.InvalidKerasConfigurationException; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/weights/KerasWeightSettingTests.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/weights/KerasWeightSettingTests.java index 7204ebb82..362502ced 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/weights/KerasWeightSettingTests.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/weights/KerasWeightSettingTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/algorithm/BaseClusteringAlgorithm.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/algorithm/BaseClusteringAlgorithm.java index dfab82e58..9ff125ad9 100755 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/algorithm/BaseClusteringAlgorithm.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/algorithm/BaseClusteringAlgorithm.java @@ -21,7 +21,6 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.math3.ml.clustering.KMeansPlusPlusClusterer; import org.deeplearning4j.clustering.cluster.Cluster; import org.deeplearning4j.clustering.cluster.ClusterSet; import org.deeplearning4j.clustering.cluster.ClusterUtils; @@ -33,14 +32,13 @@ import org.deeplearning4j.clustering.strategy.ClusteringStrategy; import org.deeplearning4j.clustering.strategy.ClusteringStrategyType; import org.deeplearning4j.clustering.strategy.OptimisationStrategy; import org.deeplearning4j.clustering.util.MultiThreadUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.util.Random; import java.util.concurrent.ExecutorService; /** diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/cluster/CentersHolder.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/cluster/CentersHolder.java index b414c5e96..e692f9bd0 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/cluster/CentersHolder.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/cluster/CentersHolder.java @@ -16,14 +16,13 @@ package org.deeplearning4j.clustering.cluster; -import lombok.val; import org.deeplearning4j.clustering.algorithm.Distance; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.ReduceOp; import org.nd4j.linalg.api.ops.impl.indexaccum.IMin; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; public class CentersHolder { private INDArray centers; diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/cluster/ClusterSet.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/cluster/ClusterSet.java index f39516a7b..d7241eed9 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/cluster/ClusterSet.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/cluster/ClusterSet.java @@ -18,9 +18,8 @@ package org.deeplearning4j.clustering.cluster; import lombok.Data; import org.deeplearning4j.clustering.algorithm.Distance; -import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/kdtree/HyperRect.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/kdtree/HyperRect.java index b9523f30b..013263629 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/kdtree/HyperRect.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/kdtree/HyperRect.java @@ -16,15 +16,12 @@ package org.deeplearning4j.clustering.kdtree; -import lombok.val; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.custom.KnnMinDistance; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; /** * Created by agibsonccc on 12/29/14. diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/kdtree/KDTree.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/kdtree/KDTree.java index 3e0b90119..68ccf6281 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/kdtree/KDTree.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/kdtree/KDTree.java @@ -20,7 +20,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.reduce.bool.Any; import org.nd4j.linalg.api.ops.impl.reduce3.EuclideanDistance; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/lsh/RandomProjectionLSH.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/lsh/RandomProjectionLSH.java index 992c880fa..75e342e78 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/lsh/RandomProjectionLSH.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/lsh/RandomProjectionLSH.java @@ -18,7 +18,7 @@ package org.deeplearning4j.clustering.lsh; import lombok.Getter; import lombok.val; -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.impl.broadcast.bool.BroadcastEqualTo; diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPForest.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPForest.java index 137f9c774..a5966af22 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPForest.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPForest.java @@ -18,10 +18,9 @@ package org.deeplearning4j.clustering.randomprojection; import lombok.Data; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPTree.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPTree.java index 22572717a..1360a5c92 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPTree.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPTree.java @@ -18,19 +18,15 @@ package org.deeplearning4j.clustering.randomprojection; import lombok.Builder; import lombok.Data; -import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.memory.conf.WorkspaceConfiguration; import org.nd4j.linalg.api.memory.enums.*; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; @Data public class RPTree { diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPUtils.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPUtils.java index 5c31ee78a..d9653ff10 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPUtils.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/randomprojection/RPUtils.java @@ -20,12 +20,11 @@ import org.nd4j.shade.guava.primitives.Doubles; import lombok.val; import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.ReduceFloatOp; import org.nd4j.linalg.api.ops.ReduceOp; import org.nd4j.linalg.api.ops.impl.reduce3.*; import org.nd4j.linalg.exception.ND4JIllegalArgumentException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/util/MathUtils.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/util/MathUtils.java index 792231c7e..0f657569e 100755 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/util/MathUtils.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/util/MathUtils.java @@ -22,7 +22,7 @@ import org.apache.commons.math3.linear.NonSquareMatrixException; import org.apache.commons.math3.linear.RealMatrix; import org.apache.commons.math3.random.RandomGenerator; import org.apache.commons.math3.util.FastMath; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/test/java/org/deeplearning4j/clustering/kdtree/KDTreeTest.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/test/java/org/deeplearning4j/clustering/kdtree/KDTreeTest.java index 60552486e..e938dfdfe 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/test/java/org/deeplearning4j/clustering/kdtree/KDTreeTest.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/test/java/org/deeplearning4j/clustering/kdtree/KDTreeTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.guava.base.Stopwatch; import org.nd4j.shade.guava.primitives.Doubles; import org.nd4j.shade.guava.primitives.Floats; diff --git a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/test/java/org/deeplearning4j/clustering/vptree/VpTreeNodeTest.java b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/test/java/org/deeplearning4j/clustering/vptree/VpTreeNodeTest.java index b7f254a63..439165051 100644 --- a/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/test/java/org/deeplearning4j/clustering/vptree/VpTreeNodeTest.java +++ b/deeplearning4j/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/test/java/org/deeplearning4j/clustering/vptree/VpTreeNodeTest.java @@ -27,8 +27,8 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/ChineseTokenizer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/nlp/chinese/tokenization/tokenizer/ChineseTokenizer.java similarity index 93% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/ChineseTokenizer.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/nlp/chinese/tokenization/tokenizer/ChineseTokenizer.java index 553ce2587..080734f01 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/ChineseTokenizer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/nlp/chinese/tokenization/tokenizer/ChineseTokenizer.java @@ -14,11 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizer; +package org.deeplearning4j.nlp.chinese.tokenization.tokenizer; import org.ansj.domain.Result; import org.ansj.domain.Term; import org.ansj.splitWord.analysis.NlpAnalysis; +import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; +import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; import java.util.ArrayList; import java.util.Iterator; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/text/tokenization/tokenizerFactory/ChineseTokenizerFactory.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/nlp/chinese/tokenization/tokenizerFactory/ChineseTokenizerFactory.java similarity index 92% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/text/tokenization/tokenizerFactory/ChineseTokenizerFactory.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/nlp/chinese/tokenization/tokenizerFactory/ChineseTokenizerFactory.java index e5cee4115..0f5771e91 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/text/tokenization/tokenizerFactory/ChineseTokenizerFactory.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/main/java/org/deeplearning4j/nlp/chinese/tokenization/tokenizerFactory/ChineseTokenizerFactory.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizerFactory; +package org.deeplearning4j.nlp.chinese.tokenization.tokenizerFactory; -import org.deeplearning4j.text.tokenization.tokenizer.ChineseTokenizer; +import org.deeplearning4j.nlp.chinese.tokenization.tokenizer.ChineseTokenizer; import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/AssertTestsExtendBaseClass.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/AssertTestsExtendBaseClass.java index d7c03956f..17018e410 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/AssertTestsExtendBaseClass.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/AssertTestsExtendBaseClass.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.*; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; /** * This class checks that all test classes (i.e., anything with one or more methods annotated with @Test) diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/ChineseTokenizerTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/ChineseTokenizerTest.java index aef6ed348..f1f90eb29 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/ChineseTokenizerTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-chinese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/ChineseTokenizerTest.java @@ -22,7 +22,7 @@ import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; import org.deeplearning4j.models.word2vec.Word2Vec; import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; -import org.deeplearning4j.text.tokenization.tokenizerFactory.ChineseTokenizerFactory; +import org.deeplearning4j.nlp.chinese.tokenization.tokenizerFactory.ChineseTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Ignore; import org.junit.Test; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/com/atilika/kuromoji/compile/TokenInfoDictionaryCompilerBase.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/com/atilika/kuromoji/compile/TokenInfoDictionaryCompilerBase.java index 923bc50b2..1b58dd40c 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/com/atilika/kuromoji/compile/TokenInfoDictionaryCompilerBase.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/com/atilika/kuromoji/compile/TokenInfoDictionaryCompilerBase.java @@ -23,7 +23,7 @@ import com.atilika.kuromoji.buffer.WordIdMap; import com.atilika.kuromoji.dict.DictionaryEntryBase; import com.atilika.kuromoji.dict.GenericDictionaryEntry; import com.atilika.kuromoji.dict.TokenInfoDictionary; -import org.deeplearning4j.util.DL4JFileUtils; +import org.deeplearning4j.common.util.DL4JFileUtils; import java.io.*; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/com/atilika/kuromoji/util/KuromojiBinFilesFetcher.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/com/atilika/kuromoji/util/KuromojiBinFilesFetcher.java index d2945cf3d..942ce6a21 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/com/atilika/kuromoji/util/KuromojiBinFilesFetcher.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/com/atilika/kuromoji/util/KuromojiBinFilesFetcher.java @@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.common.resources.ResourceType; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.util.ArchiveUtils; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/JapaneseTokenizer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/nlp/japanese/tokenization/tokenizer/JapaneseTokenizer.java similarity index 95% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/JapaneseTokenizer.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/nlp/japanese/tokenization/tokenizer/JapaneseTokenizer.java index 188b4b95f..3ab43c4c8 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/JapaneseTokenizer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/nlp/japanese/tokenization/tokenizer/JapaneseTokenizer.java @@ -14,10 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizer; +package org.deeplearning4j.nlp.japanese.tokenization.tokenizer; import com.atilika.kuromoji.ipadic.Token; import com.atilika.kuromoji.ipadic.Tokenizer; +import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/JapaneseTokenizerFactory.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/nlp/japanese/tokenization/tokenizerfactory/JapaneseTokenizerFactory.java similarity index 94% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/JapaneseTokenizerFactory.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/nlp/japanese/tokenization/tokenizerfactory/JapaneseTokenizerFactory.java index 23715b669..58ee50742 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/JapaneseTokenizerFactory.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/main/java/org/deeplearning4j/nlp/japanese/tokenization/tokenizerfactory/JapaneseTokenizerFactory.java @@ -14,11 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizerfactory; +package org.deeplearning4j.nlp.japanese.tokenization.tokenizerfactory; -import org.deeplearning4j.text.tokenization.tokenizer.JapaneseTokenizer; +import org.deeplearning4j.nlp.japanese.tokenization.tokenizer.JapaneseTokenizer; import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; +import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/AssertTestsExtendBaseClass.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/AssertTestsExtendBaseClass.java index c767c3e72..146e77e88 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/AssertTestsExtendBaseClass.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/AssertTestsExtendBaseClass.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.*; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; /** * This class checks that all test classes (i.e., anything with one or more methods annotated with @Test) diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/dict/UserDictionaryTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/dict/UserDictionaryTest.java index cb6b503c0..fb8980305 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/dict/UserDictionaryTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/dict/UserDictionaryTest.java @@ -34,7 +34,7 @@ package com.atilika.kuromoji.dict; import org.deeplearning4j.BaseDL4JTest; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/MultiThreadedTokenizerTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/MultiThreadedTokenizerTest.java index 05f0f9f8f..88323264d 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/MultiThreadedTokenizerTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/MultiThreadedTokenizerTest.java @@ -34,7 +34,7 @@ package com.atilika.kuromoji.ipadic; import org.deeplearning4j.BaseDL4JTest; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/SearchTokenizerTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/SearchTokenizerTest.java index 4883ba0b3..3d0727e8b 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/SearchTokenizerTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/SearchTokenizerTest.java @@ -36,7 +36,7 @@ import com.atilika.kuromoji.TokenizerBase.Mode; import org.deeplearning4j.BaseDL4JTest; import org.junit.BeforeClass; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/TokenizerTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/TokenizerTest.java index ce8bcb206..0ac090144 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/TokenizerTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/com/atilika/kuromoji/ipadic/TokenizerTest.java @@ -36,8 +36,7 @@ import com.atilika.kuromoji.CommonCornerCasesTest; import org.deeplearning4j.BaseDL4JTest; import org.junit.BeforeClass; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/JapaneseTokenizerTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/JapaneseTokenizerTest.java index 849009bdd..518807a01 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/JapaneseTokenizerTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-japanese/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/JapaneseTokenizerTest.java @@ -17,7 +17,7 @@ package org.deeplearning4j.text.tokenization.tokenizer; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.text.tokenization.tokenizerfactory.JapaneseTokenizerFactory; +import org.deeplearning4j.nlp.japanese.tokenization.tokenizerfactory.JapaneseTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Test; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/KoreanTokenizer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/nlp/korean/tokenization/tokenizer/KoreanTokenizer.java similarity index 92% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/KoreanTokenizer.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/nlp/korean/tokenization/tokenizer/KoreanTokenizer.java index 2365bd048..9c5332542 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/KoreanTokenizer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/nlp/korean/tokenization/tokenizer/KoreanTokenizer.java @@ -14,10 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizer; +package org.deeplearning4j.nlp.korean.tokenization.tokenizer; import com.twitter.penguin.korean.KoreanTokenJava; import com.twitter.penguin.korean.TwitterKoreanProcessorJava; +import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; +import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; import scala.collection.Seq; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/KoreanTokenizerFactory.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/nlp/korean/tokenization/tokenizerfactory/KoreanTokenizerFactory.java similarity index 88% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/KoreanTokenizerFactory.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/nlp/korean/tokenization/tokenizerfactory/KoreanTokenizerFactory.java index fb8876775..a381aef7b 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/KoreanTokenizerFactory.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/main/java/org/deeplearning4j/nlp/korean/tokenization/tokenizerfactory/KoreanTokenizerFactory.java @@ -14,11 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizerfactory; +package org.deeplearning4j.nlp.korean.tokenization.tokenizerfactory; -import org.deeplearning4j.text.tokenization.tokenizer.KoreanTokenizer; +import org.deeplearning4j.nlp.korean.tokenization.tokenizer.KoreanTokenizer; import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; +import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/AssertTestsExtendBaseClass.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/AssertTestsExtendBaseClass.java index ccf95a8ea..d7c6cbc15 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/AssertTestsExtendBaseClass.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/AssertTestsExtendBaseClass.java @@ -18,7 +18,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.*; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; /** * This class checks that all test classes (i.e., anything with one or more methods annotated with @Test) diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/KoreanTokenizerTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/KoreanTokenizerTest.java index 275515968..a710f8b53 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/KoreanTokenizerTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/KoreanTokenizerTest.java @@ -17,7 +17,7 @@ package org.deeplearning4j.text.tokenization.tokenizer; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.text.tokenization.tokenizerfactory.KoreanTokenizerFactory; +import org.deeplearning4j.nlp.korean.tokenization.tokenizerfactory.KoreanTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Test; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/PerformanceTests.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/PerformanceTests.java index c9fece977..f57ef45b3 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/PerformanceTests.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-korean/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/PerformanceTests.java @@ -24,7 +24,7 @@ import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.Word2Vec; import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; -import org.deeplearning4j.text.tokenization.tokenizerfactory.KoreanTokenizerFactory; +import org.deeplearning4j.nlp.korean.tokenization.tokenizerfactory.KoreanTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Ignore; import org.junit.Test; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/PoStagger.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/PoStagger.java old mode 100755 new mode 100644 similarity index 99% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/PoStagger.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/PoStagger.java index 8d2b0c625..66d5f9290 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/PoStagger.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/PoStagger.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.annotator; +package org.deeplearning4j.nlp.uima.annotator; import opennlp.tools.postag.POSModel; import opennlp.tools.postag.POSTaggerME; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/SentenceAnnotator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/SentenceAnnotator.java old mode 100755 new mode 100644 similarity index 97% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/SentenceAnnotator.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/SentenceAnnotator.java index cbd00003d..d3b67366c --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/SentenceAnnotator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/SentenceAnnotator.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.annotator; +package org.deeplearning4j.nlp.uima.annotator; import org.apache.uima.analysis_engine.AnalysisEngineDescription; import org.apache.uima.analysis_engine.AnalysisEngineProcessException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/StemmerAnnotator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/StemmerAnnotator.java old mode 100755 new mode 100644 similarity index 97% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/StemmerAnnotator.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/StemmerAnnotator.java index d4bbdce07..87a0121e8 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/StemmerAnnotator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/StemmerAnnotator.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.annotator; +package org.deeplearning4j.nlp.uima.annotator; import org.apache.uima.analysis_engine.AnalysisEngineDescription; import org.apache.uima.analysis_engine.AnalysisEngineProcessException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/TokenizerAnnotator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/TokenizerAnnotator.java old mode 100755 new mode 100644 similarity index 89% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/TokenizerAnnotator.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/TokenizerAnnotator.java index ea59b2467..4fefa2db5 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/annotator/TokenizerAnnotator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/annotator/TokenizerAnnotator.java @@ -14,17 +14,18 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.annotator; +package org.deeplearning4j.nlp.uima.annotator; import opennlp.uima.tokenize.TokenizerModelResourceImpl; import org.apache.uima.analysis_engine.AnalysisEngineDescription; +import org.apache.uima.fit.factory.AnalysisEngineFactory; import org.apache.uima.fit.factory.ExternalResourceFactory; import org.apache.uima.resource.ResourceInitializationException; import org.cleartk.opennlp.tools.Tokenizer; import org.cleartk.token.type.Sentence; import org.cleartk.token.type.Token; +import org.deeplearning4j.nlp.uima.tokenization.tokenizer.ConcurrentTokenizer; import org.deeplearning4j.text.movingwindow.Util; -import org.deeplearning4j.text.tokenization.tokenizer.ConcurrentTokenizer; import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription; @@ -41,7 +42,7 @@ public class TokenizerAnnotator extends Tokenizer { public static AnalysisEngineDescription getDescription(String languageCode) throws ResourceInitializationException { String modelPath = String.format("/models/%s-token.bin", languageCode); - return createEngineDescription(ConcurrentTokenizer.class, opennlp.uima.util.UimaUtil.MODEL_PARAMETER, + return AnalysisEngineFactory.createEngineDescription(ConcurrentTokenizer.class, opennlp.uima.util.UimaUtil.MODEL_PARAMETER, ExternalResourceFactory.createExternalResourceDescription(TokenizerModelResourceImpl.class, ConcurrentTokenizer.class.getResource(modelPath).toString()), opennlp.uima.util.UimaUtil.SENTENCE_TYPE_PARAMETER, Sentence.class.getName(), diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/sentiwordnet/SWN3.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/sentiwordnet/SWN3.java old mode 100755 new mode 100644 similarity index 97% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/sentiwordnet/SWN3.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/sentiwordnet/SWN3.java index f82838ea5..7f77373ec --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/sentiwordnet/SWN3.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/sentiwordnet/SWN3.java @@ -14,9 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.corpora.sentiwordnet; +package org.deeplearning4j.nlp.uima.corpora.sentiwordnet; import lombok.extern.slf4j.Slf4j; +import org.deeplearning4j.nlp.uima.tokenization.tokenizerfactory.UimaTokenizerFactory; import org.nd4j.shade.guava.collect.Sets; import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.cas.CAS; @@ -24,8 +25,7 @@ import org.apache.uima.cas.CASException; import org.apache.uima.fit.util.JCasUtil; import org.cleartk.token.type.Sentence; import org.cleartk.token.type.Token; -import org.nd4j.linalg.io.ClassPathResource; -import org.deeplearning4j.text.tokenization.tokenizerfactory.UimaTokenizerFactory; +import org.nd4j.common.io.ClassPathResource; import java.io.BufferedReader; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/BinarizeTreeTransformer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/BinarizeTreeTransformer.java old mode 100755 new mode 100644 similarity index 96% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/BinarizeTreeTransformer.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/BinarizeTreeTransformer.java index 658386778..ea1081d4e --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/BinarizeTreeTransformer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/BinarizeTreeTransformer.java @@ -14,12 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.corpora.treeparser; +package org.deeplearning4j.nlp.uima.corpora.treeparser; import org.apache.commons.lang3.StringUtils; +import org.deeplearning4j.nlp.uima.corpora.treeparser.transformer.TreeTransformer; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; -import org.deeplearning4j.text.corpora.treeparser.transformer.TreeTransformer; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/CollapseUnaries.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/CollapseUnaries.java old mode 100755 new mode 100644 similarity index 92% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/CollapseUnaries.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/CollapseUnaries.java index b01bd05f6..ea7b8a0aa --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/CollapseUnaries.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/CollapseUnaries.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.corpora.treeparser; +package org.deeplearning4j.nlp.uima.corpora.treeparser; +import org.deeplearning4j.nlp.uima.corpora.treeparser.transformer.TreeTransformer; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; -import org.deeplearning4j.text.corpora.treeparser.transformer.TreeTransformer; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/HeadWordFinder.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/HeadWordFinder.java old mode 100755 new mode 100644 similarity index 99% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/HeadWordFinder.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/HeadWordFinder.java index a4e5aad65..88c762aa2 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/HeadWordFinder.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/HeadWordFinder.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.corpora.treeparser; +package org.deeplearning4j.nlp.uima.corpora.treeparser; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeFactory.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeFactory.java old mode 100755 new mode 100644 similarity index 97% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeFactory.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeFactory.java index feb58ca30..acdb6884e --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeFactory.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.corpora.treeparser; +package org.deeplearning4j.nlp.uima.corpora.treeparser; import org.apache.uima.fit.util.FSCollectionFactory; @@ -24,8 +24,8 @@ import org.cleartk.syntax.constituent.type.TreebankNode; import org.cleartk.syntax.constituent.type.TreebankNodeUtil; import org.cleartk.token.type.Token; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; -import org.nd4j.linalg.collection.MultiDimensionalMap; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.collection.MultiDimensionalMap; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeIterator.java old mode 100755 new mode 100644 similarity index 98% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeIterator.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeIterator.java index 2f2989aa2..16319e76e --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeIterator.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.corpora.treeparser; +package org.deeplearning4j.nlp.uima.corpora.treeparser; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; import org.deeplearning4j.text.sentenceiterator.labelaware.LabelAwareSentenceIterator; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeParser.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeParser.java old mode 100755 new mode 100644 similarity index 96% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeParser.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeParser.java index 180df1eec..b9d6cc3ce --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeParser.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeParser.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.corpora.treeparser; +package org.deeplearning4j.nlp.uima.corpora.treeparser; import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.cas.CAS; @@ -28,17 +28,17 @@ import org.cleartk.token.type.Sentence; import org.cleartk.token.type.Token; import org.cleartk.util.ParamUtil; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; -import org.deeplearning4j.text.annotator.PoStagger; -import org.deeplearning4j.text.annotator.SentenceAnnotator; -import org.deeplearning4j.text.annotator.StemmerAnnotator; -import org.deeplearning4j.text.annotator.TokenizerAnnotator; +import org.deeplearning4j.nlp.uima.annotator.PoStagger; +import org.deeplearning4j.nlp.uima.annotator.SentenceAnnotator; +import org.deeplearning4j.nlp.uima.annotator.StemmerAnnotator; +import org.deeplearning4j.nlp.uima.annotator.TokenizerAnnotator; import org.deeplearning4j.text.movingwindow.ContextLabelRetriever; import org.deeplearning4j.text.sentenceiterator.SentencePreProcessor; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.deeplearning4j.text.tokenization.tokenizerfactory.UimaTokenizerFactory; -import org.nd4j.linalg.collection.MultiDimensionalMap; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.util.SetUtils; +import org.deeplearning4j.nlp.uima.tokenization.tokenizerfactory.UimaTokenizerFactory; +import org.nd4j.common.collection.MultiDimensionalMap; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.SetUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeVectorizer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeVectorizer.java old mode 100755 new mode 100644 similarity index 96% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeVectorizer.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeVectorizer.java index 5000a3e2a..48156d47e --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/TreeVectorizer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/TreeVectorizer.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.corpora.treeparser; +package org.deeplearning4j.nlp.uima.corpora.treeparser; +import org.deeplearning4j.nlp.uima.corpora.treeparser.transformer.TreeTransformer; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; -import org.deeplearning4j.text.corpora.treeparser.transformer.TreeTransformer; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/transformer/TreeTransformer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/transformer/TreeTransformer.java old mode 100755 new mode 100644 similarity index 94% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/transformer/TreeTransformer.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/transformer/TreeTransformer.java index b65b7d719..0e7e188a4 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/corpora/treeparser/transformer/TreeTransformer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/corpora/treeparser/transformer/TreeTransformer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.corpora.treeparser.transformer; +package org.deeplearning4j.nlp.uima.corpora.treeparser.transformer; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/sentenceiterator/UimaResultSetIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/sentenceiterator/UimaResultSetIterator.java similarity index 94% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/sentenceiterator/UimaResultSetIterator.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/sentenceiterator/UimaResultSetIterator.java index ee33a5759..e6082057b 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/sentenceiterator/UimaResultSetIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/sentenceiterator/UimaResultSetIterator.java @@ -14,16 +14,17 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.sentenceiterator; +package org.deeplearning4j.nlp.uima.sentenceiterator; import org.apache.uima.cas.CAS; import org.apache.uima.fit.factory.AnalysisEngineFactory; import org.apache.uima.fit.util.JCasUtil; import org.apache.uima.resource.ResourceInitializationException; import org.cleartk.token.type.Sentence; -import org.deeplearning4j.text.annotator.SentenceAnnotator; -import org.deeplearning4j.text.annotator.TokenizerAnnotator; -import org.deeplearning4j.text.uima.UimaResource; +import org.deeplearning4j.nlp.uima.annotator.SentenceAnnotator; +import org.deeplearning4j.nlp.uima.annotator.TokenizerAnnotator; +import org.deeplearning4j.text.sentenceiterator.BasicResultSetIterator; +import org.deeplearning4j.nlp.uima.uima.UimaResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/sentenceiterator/UimaSentenceIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/sentenceiterator/UimaSentenceIterator.java old mode 100755 new mode 100644 similarity index 93% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/sentenceiterator/UimaSentenceIterator.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/sentenceiterator/UimaSentenceIterator.java index 061d98700..5fcfaa44b --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/sentenceiterator/UimaSentenceIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/sentenceiterator/UimaSentenceIterator.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.sentenceiterator; +package org.deeplearning4j.nlp.uima.sentenceiterator; import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.cas.CAS; @@ -24,9 +24,12 @@ import org.apache.uima.fit.util.JCasUtil; import org.apache.uima.resource.ResourceInitializationException; import org.cleartk.token.type.Sentence; import org.cleartk.util.cr.FilesCollectionReader; -import org.deeplearning4j.text.annotator.SentenceAnnotator; -import org.deeplearning4j.text.annotator.TokenizerAnnotator; -import org.deeplearning4j.text.uima.UimaResource; +import org.deeplearning4j.nlp.uima.annotator.SentenceAnnotator; +import org.deeplearning4j.nlp.uima.annotator.TokenizerAnnotator; +import org.deeplearning4j.text.sentenceiterator.BaseSentenceIterator; +import org.deeplearning4j.text.sentenceiterator.SentenceIterator; +import org.deeplearning4j.text.sentenceiterator.SentencePreProcessor; +import org.deeplearning4j.nlp.uima.uima.UimaResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/sentenceiterator/labelaware/LabelAwareUimaSentenceIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/sentenceiterator/labelaware/LabelAwareUimaSentenceIterator.java old mode 100755 new mode 100644 similarity index 89% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/sentenceiterator/labelaware/LabelAwareUimaSentenceIterator.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/sentenceiterator/labelaware/LabelAwareUimaSentenceIterator.java index a9b87b04a..8750d5acd --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/sentenceiterator/labelaware/LabelAwareUimaSentenceIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/sentenceiterator/labelaware/LabelAwareUimaSentenceIterator.java @@ -14,16 +14,17 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.sentenceiterator.labelaware; +package org.deeplearning4j.nlp.uima.sentenceiterator.labelaware; import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.fit.factory.AnalysisEngineFactory; import org.apache.uima.resource.ResourceInitializationException; -import org.deeplearning4j.text.annotator.SentenceAnnotator; -import org.deeplearning4j.text.annotator.TokenizerAnnotator; +import org.deeplearning4j.nlp.uima.annotator.SentenceAnnotator; +import org.deeplearning4j.nlp.uima.annotator.TokenizerAnnotator; import org.deeplearning4j.text.sentenceiterator.SentencePreProcessor; -import org.deeplearning4j.text.sentenceiterator.UimaSentenceIterator; -import org.deeplearning4j.text.uima.UimaResource; +import org.deeplearning4j.nlp.uima.sentenceiterator.UimaSentenceIterator; +import org.deeplearning4j.text.sentenceiterator.labelaware.LabelAwareSentenceIterator; +import org.deeplearning4j.nlp.uima.uima.UimaResource; import java.io.File; import java.lang.reflect.Field; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/ConcurrentTokenizer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/ConcurrentTokenizer.java old mode 100755 new mode 100644 similarity index 98% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/ConcurrentTokenizer.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/ConcurrentTokenizer.java index 23e0f9b76..3570815e5 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/ConcurrentTokenizer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/ConcurrentTokenizer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizer; +package org.deeplearning4j.nlp.uima.tokenization.tokenizer; import opennlp.tools.tokenize.TokenizerME; import opennlp.tools.tokenize.TokenizerModel; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/PosUimaTokenizer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/PosUimaTokenizer.java old mode 100755 new mode 100644 similarity index 91% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/PosUimaTokenizer.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/PosUimaTokenizer.java index 5329d84da..36b7f1d8d --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/PosUimaTokenizer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/PosUimaTokenizer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizer; +package org.deeplearning4j.nlp.uima.tokenization.tokenizer; import lombok.NonNull; import org.apache.uima.analysis_engine.AnalysisEngine; @@ -23,10 +23,12 @@ import org.apache.uima.fit.factory.AnalysisEngineFactory; import org.apache.uima.fit.util.JCasUtil; import org.cleartk.token.type.Sentence; import org.cleartk.token.type.Token; -import org.deeplearning4j.text.annotator.PoStagger; -import org.deeplearning4j.text.annotator.SentenceAnnotator; -import org.deeplearning4j.text.annotator.StemmerAnnotator; -import org.deeplearning4j.text.annotator.TokenizerAnnotator; +import org.deeplearning4j.nlp.uima.annotator.PoStagger; +import org.deeplearning4j.nlp.uima.annotator.SentenceAnnotator; +import org.deeplearning4j.nlp.uima.annotator.StemmerAnnotator; +import org.deeplearning4j.nlp.uima.annotator.TokenizerAnnotator; +import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; +import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; import java.util.ArrayList; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/UimaTokenizer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/UimaTokenizer.java old mode 100755 new mode 100644 similarity index 92% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/UimaTokenizer.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/UimaTokenizer.java index b1068e0ab..56ac1f1ec --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/UimaTokenizer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/UimaTokenizer.java @@ -14,13 +14,15 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizer; +package org.deeplearning4j.nlp.uima.tokenization.tokenizer; import lombok.extern.slf4j.Slf4j; import org.apache.uima.cas.CAS; import org.apache.uima.fit.util.JCasUtil; import org.cleartk.token.type.Token; -import org.deeplearning4j.text.uima.UimaResource; +import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; +import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; +import org.deeplearning4j.nlp.uima.uima.UimaResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/CustomStemmingPreprocessor.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/preprocessor/CustomStemmingPreprocessor.java similarity index 91% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/CustomStemmingPreprocessor.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/preprocessor/CustomStemmingPreprocessor.java index 52f25c6cd..ac159b786 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/CustomStemmingPreprocessor.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/preprocessor/CustomStemmingPreprocessor.java @@ -14,9 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizer.preprocessor; +package org.deeplearning4j.nlp.uima.tokenization.tokenizer.preprocessor; import lombok.NonNull; +import org.deeplearning4j.text.tokenization.tokenizer.preprocessor.CommonPreprocessor; import org.tartarus.snowball.SnowballProgram; /** diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/EmbeddedStemmingPreprocessor.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/preprocessor/EmbeddedStemmingPreprocessor.java similarity index 95% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/EmbeddedStemmingPreprocessor.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/preprocessor/EmbeddedStemmingPreprocessor.java index 1a2f75dbf..c2df3112c 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/EmbeddedStemmingPreprocessor.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/preprocessor/EmbeddedStemmingPreprocessor.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizer.preprocessor; +package org.deeplearning4j.nlp.uima.tokenization.tokenizer.preprocessor; import lombok.NoArgsConstructor; import lombok.NonNull; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/StemmingPreprocessor.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/preprocessor/StemmingPreprocessor.java similarity index 89% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/StemmingPreprocessor.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/preprocessor/StemmingPreprocessor.java index cdbf200a4..a3e33cfcb 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/StemmingPreprocessor.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizer/preprocessor/StemmingPreprocessor.java @@ -14,8 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizer.preprocessor; +package org.deeplearning4j.nlp.uima.tokenization.tokenizer.preprocessor; +import org.deeplearning4j.text.tokenization.tokenizer.preprocessor.CommonPreprocessor; import org.tartarus.snowball.ext.PorterStemmer; /** diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/PosUimaTokenizerFactory.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizerfactory/PosUimaTokenizerFactory.java similarity index 87% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/PosUimaTokenizerFactory.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizerfactory/PosUimaTokenizerFactory.java index 103503edb..c85078655 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/PosUimaTokenizerFactory.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizerfactory/PosUimaTokenizerFactory.java @@ -14,17 +14,18 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizerfactory; +package org.deeplearning4j.nlp.uima.tokenization.tokenizerfactory; import org.apache.uima.analysis_engine.AnalysisEngine; -import org.deeplearning4j.text.annotator.PoStagger; -import org.deeplearning4j.text.annotator.SentenceAnnotator; -import org.deeplearning4j.text.annotator.StemmerAnnotator; -import org.deeplearning4j.text.annotator.TokenizerAnnotator; -import org.deeplearning4j.text.tokenization.tokenizer.PosUimaTokenizer; +import org.deeplearning4j.nlp.uima.annotator.StemmerAnnotator; +import org.deeplearning4j.nlp.uima.annotator.TokenizerAnnotator; +import org.deeplearning4j.nlp.uima.tokenization.tokenizer.PosUimaTokenizer; +import org.deeplearning4j.nlp.uima.annotator.PoStagger; +import org.deeplearning4j.nlp.uima.annotator.SentenceAnnotator; import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; +import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import java.io.InputStream; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/UimaTokenizerFactory.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizerfactory/UimaTokenizerFactory.java similarity index 90% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/UimaTokenizerFactory.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizerfactory/UimaTokenizerFactory.java index 2d17f78bd..37a3701fd 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/tokenization/tokenizerfactory/UimaTokenizerFactory.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/tokenization/tokenizerfactory/UimaTokenizerFactory.java @@ -14,17 +14,18 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.tokenization.tokenizerfactory; +package org.deeplearning4j.nlp.uima.tokenization.tokenizerfactory; import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.fit.factory.AnalysisEngineFactory; import org.apache.uima.resource.ResourceInitializationException; -import org.deeplearning4j.text.annotator.SentenceAnnotator; -import org.deeplearning4j.text.annotator.TokenizerAnnotator; +import org.deeplearning4j.nlp.uima.annotator.TokenizerAnnotator; +import org.deeplearning4j.nlp.uima.tokenization.tokenizer.UimaTokenizer; +import org.deeplearning4j.nlp.uima.annotator.SentenceAnnotator; import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; -import org.deeplearning4j.text.tokenization.tokenizer.UimaTokenizer; -import org.deeplearning4j.text.uima.UimaResource; +import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; +import org.deeplearning4j.nlp.uima.uima.UimaResource; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/uima/UimaResource.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/uima/UimaResource.java old mode 100755 new mode 100644 similarity index 98% rename from deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/uima/UimaResource.java rename to deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/uima/UimaResource.java index 8d5378056..3beeae72a --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/text/uima/UimaResource.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/main/java/org/deeplearning4j/nlp/uima/uima/UimaResource.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.text.uima; +package org.deeplearning4j.nlp.uima.uima; import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.analysis_engine.AnalysisEngineProcessException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java index 85b0c39a9..1d33c542b 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java @@ -18,7 +18,7 @@ package org.deeplearning4j; import lombok.extern.slf4j.Slf4j; import java.util.*; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; /** * This class checks that all test classes (i.e., anything with one or more methods annotated with @Test) diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/UITest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/UITest.java index 54dd0f1cd..452cdc642 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/UITest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/UITest.java @@ -22,15 +22,15 @@ import org.deeplearning4j.models.embeddings.wordvectors.WordVectors; import org.deeplearning4j.models.word2vec.Word2Vec; import org.deeplearning4j.plot.BarnesHutTsne; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; -import org.deeplearning4j.text.sentenceiterator.UimaSentenceIterator; +import org.deeplearning4j.nlp.uima.sentenceiterator.UimaSentenceIterator; import org.deeplearning4j.text.tokenization.tokenizer.preprocessor.CommonPreprocessor; import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.deeplearning4j.ui.UiConnectionInfo; +import org.deeplearning4j.core.ui.UiConnectionInfo; import org.deeplearning4j.ui.api.UIServer; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/WordVectorSerializerTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/WordVectorSerializerTest.java index 0154bc732..27d49d5f5 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/WordVectorSerializerTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/WordVectorSerializerTest.java @@ -36,7 +36,7 @@ import org.deeplearning4j.models.word2vec.wordstore.inmemory.AbstractCache; import org.deeplearning4j.models.word2vec.wordstore.inmemory.InMemoryLookupCache; import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; -import org.deeplearning4j.text.sentenceiterator.UimaSentenceIterator; +import org.deeplearning4j.nlp.uima.sentenceiterator.UimaSentenceIterator; import org.deeplearning4j.text.tokenization.tokenizer.preprocessor.CommonPreprocessor; import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; @@ -48,9 +48,9 @@ import org.junit.rules.TemporaryFolder; import org.junit.rules.Timeout; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import org.nd4j.shade.guava.primitives.Doubles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/embeddings/loader/VectorsConfigurationTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/embeddings/loader/VectorsConfigurationTest.java index 8f13ae3fd..a965afce1 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/embeddings/loader/VectorsConfigurationTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/embeddings/loader/VectorsConfigurationTest.java @@ -17,13 +17,12 @@ package org.deeplearning4j.models.embeddings.loader; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.linalg.io.ClassPathResource; import org.deeplearning4j.models.word2vec.Word2Vec; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; -import org.deeplearning4j.text.sentenceiterator.UimaSentenceIterator; +import org.deeplearning4j.nlp.uima.sentenceiterator.UimaSentenceIterator; import org.junit.Before; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/word2vec/Word2VecTests.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/word2vec/Word2VecTests.java index f205a0994..73c7f0010 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/word2vec/Word2VecTests.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/word2vec/Word2VecTests.java @@ -25,14 +25,12 @@ import org.junit.rules.Timeout; import org.nd4j.shade.guava.primitives.Doubles; import org.nd4j.shade.guava.primitives.Ints; import lombok.val; -import net.didion.jwnl.data.Word; import org.apache.commons.io.FileUtils; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.embeddings.loader.VectorsConfiguration; import org.deeplearning4j.models.word2vec.wordstore.inmemory.AbstractCache; -import org.deeplearning4j.nn.modelimport.keras.utils.KerasModelUtils; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.embeddings.learning.impl.elements.CBOW; import org.deeplearning4j.models.embeddings.learning.impl.elements.SkipGram; import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; @@ -41,7 +39,7 @@ import org.deeplearning4j.models.embeddings.reader.impl.FlatModelUtils; import org.deeplearning4j.models.embeddings.wordvectors.WordVectors; import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; -import org.deeplearning4j.text.sentenceiterator.UimaSentenceIterator; +import org.deeplearning4j.nlp.uima.sentenceiterator.UimaSentenceIterator; import org.deeplearning4j.text.tokenization.tokenizer.preprocessor.CommonPreprocessor; import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; @@ -51,7 +49,7 @@ import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/word2vec/iterator/Word2VecIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/word2vec/iterator/Word2VecIteratorTest.java index f4f00ff70..704ef47e5 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/word2vec/iterator/Word2VecIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/models/word2vec/iterator/Word2VecIteratorTest.java @@ -19,13 +19,13 @@ package org.deeplearning4j.models.word2vec.iterator; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.word2vec.Word2Vec; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; -import org.deeplearning4j.text.sentenceiterator.UimaSentenceIterator; +import org.deeplearning4j.nlp.uima.sentenceiterator.UimaSentenceIterator; import org.deeplearning4j.text.sentenceiterator.labelaware.LabelAwareFileSentenceIterator; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.deeplearning4j.text.tokenization.tokenizerfactory.UimaTokenizerFactory; +import org.deeplearning4j.nlp.uima.tokenization.tokenizerfactory.UimaTokenizerFactory; import org.junit.Before; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/sentenceiterator/SentenceIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/sentenceiterator/SentenceIteratorTest.java index b58788804..9f35f399f 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/sentenceiterator/SentenceIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/sentenceiterator/SentenceIteratorTest.java @@ -18,13 +18,12 @@ package org.deeplearning4j.text.sentenceiterator; import org.apache.commons.io.FileUtils; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.nlp.uima.sentenceiterator.UimaSentenceIterator; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/sentenceiterator/UimaResultSetIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/sentenceiterator/UimaResultSetIteratorTest.java index cc192061d..0858bbfd3 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/sentenceiterator/UimaResultSetIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/sentenceiterator/UimaResultSetIteratorTest.java @@ -17,6 +17,7 @@ package org.deeplearning4j.text.sentenceiterator; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.nlp.uima.sentenceiterator.UimaResultSetIterator; import org.junit.Before; import org.junit.Test; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/StemmingPreprocessorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/StemmingPreprocessorTest.java index ebb275165..36b298e98 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/StemmingPreprocessorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/StemmingPreprocessorTest.java @@ -17,6 +17,7 @@ package org.deeplearning4j.text.tokenization.tokenizer.preprocessor; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.nlp.uima.tokenization.tokenizer.preprocessor.StemmingPreprocessor; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/tokenization/tokenizerfactory/PosUimaTokenizerFactoryTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/tokenization/tokenizerfactory/PosUimaTokenizerFactoryTest.java index 289811a67..53ea149e4 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/tokenization/tokenizerfactory/PosUimaTokenizerFactoryTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/tokenization/tokenizerfactory/PosUimaTokenizerFactoryTest.java @@ -17,6 +17,7 @@ package org.deeplearning4j.text.tokenization.tokenizerfactory; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.nlp.uima.tokenization.tokenizerfactory.PosUimaTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; import org.junit.Assert; import org.junit.Before; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/treeparser/TreeParserTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/treeparser/TreeParserTest.java index d89848219..5f6fe585f 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/treeparser/TreeParserTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/treeparser/TreeParserTest.java @@ -19,11 +19,9 @@ package org.deeplearning4j.text.treeparser; import org.cleartk.syntax.constituent.type.TreebankNode; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; -import org.deeplearning4j.text.corpora.treeparser.TreeParser; +import org.deeplearning4j.nlp.uima.corpora.treeparser.TreeParser; import org.junit.Before; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/treeparser/TreeTransformerTests.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/treeparser/TreeTransformerTests.java index 241a02127..ad4b73065 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/treeparser/TreeTransformerTests.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/text/treeparser/TreeTransformerTests.java @@ -19,10 +19,10 @@ package org.deeplearning4j.text.treeparser; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.nn.layers.feedforward.autoencoder.recursive.Tree; -import org.deeplearning4j.text.corpora.treeparser.BinarizeTreeTransformer; -import org.deeplearning4j.text.corpora.treeparser.CollapseUnaries; -import org.deeplearning4j.text.corpora.treeparser.TreeParser; -import org.deeplearning4j.text.corpora.treeparser.transformer.TreeTransformer; +import org.deeplearning4j.nlp.uima.corpora.treeparser.BinarizeTreeTransformer; +import org.deeplearning4j.nlp.uima.corpora.treeparser.CollapseUnaries; +import org.deeplearning4j.nlp.uima.corpora.treeparser.TreeParser; +import org.deeplearning4j.nlp.uima.corpora.treeparser.transformer.TreeTransformer; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/util/ContextLabelTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/util/ContextLabelTest.java index 639c2b583..bcbd7a97e 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/util/ContextLabelTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp-uima/src/test/java/org/deeplearning4j/util/ContextLabelTest.java @@ -19,10 +19,11 @@ package org.deeplearning4j.util; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.text.movingwindow.ContextLabelRetriever; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.deeplearning4j.text.tokenization.tokenizerfactory.UimaTokenizerFactory; +import org.deeplearning4j.nlp.uima.tokenization.tokenizerfactory.UimaTokenizerFactory; import org.junit.Before; import org.junit.Test; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.collection.MultiDimensionalMap; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +49,7 @@ public class ContextLabelTest extends BaseDL4JTest { @Test public void testBasicLabel() { String labeledSentence = " This sucks really bad ."; - Pair> ret = + Pair> ret = ContextLabelRetriever.stringWithLabels(labeledSentence, tokenizerFactory); //positive and none assertEquals(2, ret.getSecond().size()); diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/bagofwords/vectorizer/TextVectorizer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/bagofwords/vectorizer/TextVectorizer.java index b984e4292..6d67e47ce 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/bagofwords/vectorizer/TextVectorizer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/bagofwords/vectorizer/TextVectorizer.java @@ -16,7 +16,7 @@ package org.deeplearning4j.bagofwords.vectorizer; -import org.deeplearning4j.datasets.vectorizer.Vectorizer; +import org.deeplearning4j.core.datasets.vectorizer.Vectorizer; import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.text.invertedindex.InvertedIndex; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/bagofwords/vectorizer/TfidfVectorizer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/bagofwords/vectorizer/TfidfVectorizer.java index 92fb83755..a78366fca 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/bagofwords/vectorizer/TfidfVectorizer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/bagofwords/vectorizer/TfidfVectorizer.java @@ -31,7 +31,7 @@ import org.deeplearning4j.text.sentenceiterator.SentenceIterator; import org.deeplearning4j.text.sentenceiterator.interoperability.SentenceIteratorConverter; import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.util.MathUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/BertIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/BertIterator.java index 40c43113c..e7fbdafe7 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/BertIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/BertIterator.java @@ -25,7 +25,7 @@ import org.deeplearning4j.iterator.bert.BertSequenceMasker; import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; import org.deeplearning4j.text.tokenization.tokenizerfactory.BertWordPieceTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -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.dataset.api.MultiDataSet; @@ -33,8 +33,8 @@ import org.nd4j.linalg.dataset.api.MultiDataSetPreProcessor; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; import java.util.ArrayList; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/CnnSentenceDataSetIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/CnnSentenceDataSetIterator.java index bc520ee5b..0905370cf 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/CnnSentenceDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/CnnSentenceDataSetIterator.java @@ -35,7 +35,7 @@ import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/LabeledPairSentenceProvider.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/LabeledPairSentenceProvider.java index ee68477ee..9517c5f6c 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/LabeledPairSentenceProvider.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/LabeledPairSentenceProvider.java @@ -16,7 +16,7 @@ package org.deeplearning4j.iterator; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/LabeledSentenceProvider.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/LabeledSentenceProvider.java index 879a3a484..b16619c2f 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/LabeledSentenceProvider.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/LabeledSentenceProvider.java @@ -16,7 +16,7 @@ package org.deeplearning4j.iterator; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/bert/BertMaskedLMMasker.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/bert/BertMaskedLMMasker.java index 5314325ae..682039253 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/bert/BertMaskedLMMasker.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/bert/BertMaskedLMMasker.java @@ -16,8 +16,8 @@ package org.deeplearning4j.iterator.bert; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/bert/BertSequenceMasker.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/bert/BertSequenceMasker.java index efb652b1b..b3c7bf65f 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/bert/BertSequenceMasker.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/bert/BertSequenceMasker.java @@ -16,7 +16,7 @@ package org.deeplearning4j.iterator.bert; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/CollectionLabeledPairSentenceProvider.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/CollectionLabeledPairSentenceProvider.java index c3c752bed..c70ebeab5 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/CollectionLabeledPairSentenceProvider.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/CollectionLabeledPairSentenceProvider.java @@ -18,9 +18,9 @@ package org.deeplearning4j.iterator.provider; import lombok.NonNull; import org.deeplearning4j.iterator.LabeledPairSentenceProvider; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.primitives.Triple; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.primitives.Triple; +import org.nd4j.common.util.MathUtils; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/CollectionLabeledSentenceProvider.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/CollectionLabeledSentenceProvider.java index e6d65b48b..216f521a9 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/CollectionLabeledSentenceProvider.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/CollectionLabeledSentenceProvider.java @@ -18,9 +18,9 @@ package org.deeplearning4j.iterator.provider; import lombok.NonNull; import org.deeplearning4j.iterator.LabeledSentenceProvider; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.MathUtils; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/FileLabeledSentenceProvider.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/FileLabeledSentenceProvider.java index 62c6eb1f4..000ba7a57 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/FileLabeledSentenceProvider.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/FileLabeledSentenceProvider.java @@ -19,9 +19,9 @@ package org.deeplearning4j.iterator.provider; import lombok.NonNull; import org.apache.commons.io.FileUtils; import org.deeplearning4j.iterator.LabeledSentenceProvider; -import org.nd4j.linalg.collection.CompactHeapStringList; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.collection.CompactHeapStringList; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.MathUtils; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/LabelAwareConverter.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/LabelAwareConverter.java index 9cd863afc..689a88f46 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/LabelAwareConverter.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/iterator/provider/LabelAwareConverter.java @@ -20,7 +20,7 @@ import lombok.NonNull; import org.deeplearning4j.iterator.LabeledSentenceProvider; import org.deeplearning4j.text.documentiterator.LabelAwareIterator; import org.deeplearning4j.text.documentiterator.LabelledDocument; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/WeightLookupTable.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/WeightLookupTable.java index fa26099e8..880a80f00 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/WeightLookupTable.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/WeightLookupTable.java @@ -19,7 +19,7 @@ package org.deeplearning4j.models.embeddings; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.plot.BarnesHutTsne; -import org.deeplearning4j.ui.UiConnectionInfo; +import org.deeplearning4j.core.ui.UiConnectionInfo; import org.nd4j.linalg.api.ndarray.INDArray; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java index 086540090..0ca08ad98 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java @@ -26,16 +26,15 @@ import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.deeplearning4j.models.word2vec.Word2Vec; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.plot.BarnesHutTsne; -import org.deeplearning4j.ui.UiConnectionInfo; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.api.buffer.DataBuffer; +import org.deeplearning4j.core.ui.UiConnectionInfo; +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.rng.Random; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.legacy.AdaGrad; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/learning/impl/elements/GloVe.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/learning/impl/elements/GloVe.java index 01bf7affd..a655cfbde 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/learning/impl/elements/GloVe.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/learning/impl/elements/GloVe.java @@ -29,9 +29,8 @@ import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.legacy.AdaGrad; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/loader/WordVectorSerializer.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/loader/WordVectorSerializer.java index 80ce0bf34..8f0003728 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/loader/WordVectorSerializer.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/loader/WordVectorSerializer.java @@ -50,19 +50,19 @@ import org.deeplearning4j.text.documentiterator.LabelsSource; import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.deeplearning4j.util.DL4JFileUtils; +import org.deeplearning4j.common.util.DL4JFileUtils; import org.nd4j.compression.impl.NoOp; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.databind.DeserializationFeature; import org.nd4j.shade.jackson.databind.MapperFeature; import org.nd4j.shade.jackson.databind.ObjectMapper; import org.nd4j.shade.jackson.databind.SerializationFeature; import org.nd4j.storage.CompressedRamStorage; -import org.nd4j.util.OneTimeLogger; +import org.nd4j.common.util.OneTimeLogger; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/BasicModelUtils.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/BasicModelUtils.java index bc404ac14..08801319a 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/BasicModelUtils.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/BasicModelUtils.java @@ -21,18 +21,17 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import lombok.val; import org.deeplearning4j.models.embeddings.WeightLookupTable; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.embeddings.reader.ModelUtils; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.util.MathUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.util.SetUtils; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.util.SetUtils; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/FlatModelUtils.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/FlatModelUtils.java index bed701d73..83c1e823b 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/FlatModelUtils.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/FlatModelUtils.java @@ -16,11 +16,10 @@ package org.deeplearning4j.models.embeddings.reader.impl; -import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/TreeModelUtils.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/TreeModelUtils.java index 8b0be242d..efdd4b385 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/TreeModelUtils.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/reader/impl/TreeModelUtils.java @@ -23,7 +23,7 @@ import org.deeplearning4j.models.embeddings.WeightLookupTable; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.util.SetUtils; +import org.nd4j.common.util.SetUtils; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/wordvectors/WordVectorsImpl.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/wordvectors/WordVectorsImpl.java index f71c56717..14d625020 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/wordvectors/WordVectorsImpl.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/wordvectors/WordVectorsImpl.java @@ -20,7 +20,6 @@ import org.nd4j.shade.guava.util.concurrent.AtomicDouble; import lombok.Getter; import lombok.NonNull; import lombok.Setter; -import lombok.val; import org.apache.commons.lang.ArrayUtils; import org.deeplearning4j.models.embeddings.WeightLookupTable; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; @@ -28,7 +27,6 @@ import org.deeplearning4j.models.embeddings.reader.ModelUtils; import org.deeplearning4j.models.embeddings.reader.impl.BasicModelUtils; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; -import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.heartbeat.Heartbeat; @@ -36,7 +34,6 @@ import org.nd4j.linalg.heartbeat.reports.Environment; import org.nd4j.linalg.heartbeat.reports.Event; import org.nd4j.linalg.heartbeat.reports.Task; import org.nd4j.linalg.heartbeat.utils.EnvironmentUtils; -import org.nd4j.linalg.io.CollectionUtils; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/fasttext/FastText.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/fasttext/FastText.java index 60459a839..71f4809eb 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/fasttext/FastText.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/fasttext/FastText.java @@ -6,10 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.StringUtils; import org.deeplearning4j.models.embeddings.WeightLookupTable; -import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; import org.deeplearning4j.models.embeddings.reader.ModelUtils; -import org.deeplearning4j.models.embeddings.reader.impl.BasicModelUtils; import org.deeplearning4j.models.embeddings.wordvectors.WordVectors; import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.Word2Vec; @@ -18,7 +16,7 @@ import org.deeplearning4j.models.word2vec.wordstore.inmemory.AbstractCache; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.*; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/AbstractCoOccurrences.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/AbstractCoOccurrences.java index 934152bb3..7c9134e2c 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/AbstractCoOccurrences.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/AbstractCoOccurrences.java @@ -28,10 +28,10 @@ import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.sentenceiterator.PrefetchingSentenceIterator; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; import org.deeplearning4j.text.sentenceiterator.SynchronizedSentenceIterator; -import org.deeplearning4j.util.DL4JFileUtils; -import org.deeplearning4j.util.ThreadUtils; +import org.deeplearning4j.common.util.DL4JFileUtils; +import org.deeplearning4j.core.util.ThreadUtils; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/GloveWeightLookupTable.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/GloveWeightLookupTable.java index 1cda50100..bc52a1422 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/GloveWeightLookupTable.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/GloveWeightLookupTable.java @@ -27,7 +27,6 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.rng.Random; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.legacy.AdaGrad; -import org.nd4j.linalg.util.ArrayUtil; import java.io.IOException; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/count/CountMap.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/count/CountMap.java index 8680a809c..274551ebf 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/count/CountMap.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/glove/count/CountMap.java @@ -18,7 +18,7 @@ package org.deeplearning4j.models.glove.count; import org.nd4j.shade.guava.util.concurrent.AtomicDouble; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Iterator; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectors.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectors.java index 64ee79dd4..1f1dce5f7 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectors.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectors.java @@ -43,18 +43,17 @@ import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.models.word2vec.wordstore.inmemory.AbstractCache; import org.deeplearning4j.text.documentiterator.*; import org.deeplearning4j.text.documentiterator.interoperability.DocumentIteratorConverter; -import org.deeplearning4j.text.invertedindex.InvertedIndex; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; import org.deeplearning4j.text.sentenceiterator.interoperability.SentenceIteratorConverter; import org.deeplearning4j.text.sentenceiterator.labelaware.LabelAwareSentenceIterator; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.deeplearning4j.util.ThreadUtils; +import org.deeplearning4j.core.util.ThreadUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.databind.DeserializationFeature; import org.nd4j.shade.jackson.databind.ObjectMapper; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/SequenceVectors.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/SequenceVectors.java index 87dd0880a..3f2d5f216 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/SequenceVectors.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/SequenceVectors.java @@ -47,7 +47,7 @@ import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.models.word2vec.wordstore.VocabConstructor; import org.deeplearning4j.models.word2vec.wordstore.inmemory.AbstractCache; -import org.deeplearning4j.util.ThreadUtils; +import org.deeplearning4j.core.util.ThreadUtils; import org.nd4j.linalg.api.memory.conf.WorkspaceConfiguration; import org.nd4j.linalg.api.memory.enums.LearningPolicy; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/graph/walkers/impl/NearestVertexWalker.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/graph/walkers/impl/NearestVertexWalker.java index fe7f117af..ef771a560 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/graph/walkers/impl/NearestVertexWalker.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/graph/walkers/impl/NearestVertexWalker.java @@ -26,7 +26,7 @@ import org.deeplearning4j.models.sequencevectors.graph.walkers.GraphWalker; import org.deeplearning4j.models.sequencevectors.sequence.Sequence; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/listeners/SerializingListener.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/listeners/SerializingListener.java index 2afbde2b7..c02129bcb 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/listeners/SerializingListener.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/sequencevectors/listeners/SerializingListener.java @@ -22,7 +22,7 @@ import org.deeplearning4j.models.sequencevectors.SequenceVectors; import org.deeplearning4j.models.sequencevectors.enums.ListenerEvent; import org.deeplearning4j.models.sequencevectors.interfaces.VectorsListener; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.util.SerializationUtils; import java.io.File; import java.text.SimpleDateFormat; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/Word2Vec.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/Word2Vec.java index 5313edd22..f2b1111b8 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/Word2Vec.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/Word2Vec.java @@ -16,14 +16,11 @@ package org.deeplearning4j.models.word2vec; -import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import lombok.Getter; import lombok.NonNull; -import org.apache.commons.compress.compressors.gzip.GzipUtils; import org.deeplearning4j.models.embeddings.WeightLookupTable; -import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.embeddings.learning.ElementsLearningAlgorithm; import org.deeplearning4j.models.embeddings.loader.VectorsConfiguration; import org.deeplearning4j.models.embeddings.reader.ModelUtils; @@ -32,35 +29,23 @@ import org.deeplearning4j.models.sequencevectors.SequenceVectors; import org.deeplearning4j.models.sequencevectors.interfaces.SequenceIterator; import org.deeplearning4j.models.sequencevectors.interfaces.VectorsListener; import org.deeplearning4j.models.sequencevectors.iterators.AbstractSequenceIterator; -import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.deeplearning4j.models.sequencevectors.transformers.impl.SentenceTransformer; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.models.word2vec.wordstore.inmemory.AbstractCache; -import org.deeplearning4j.models.word2vec.wordstore.inmemory.InMemoryLookupCache; import org.deeplearning4j.text.documentiterator.DocumentIterator; import org.deeplearning4j.text.documentiterator.LabelAwareIterator; -import org.deeplearning4j.text.invertedindex.InvertedIndex; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; import org.deeplearning4j.text.sentenceiterator.StreamLineIterator; import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.factory.Nd4j; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.databind.DeserializationFeature; import org.nd4j.shade.jackson.databind.ObjectMapper; import org.nd4j.shade.jackson.databind.SerializationFeature; import org.nd4j.shade.jackson.databind.type.CollectionType; -import java.io.BufferedReader; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStreamReader; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.zip.GZIPInputStream; /** * This is Word2Vec implementation based on SequenceVectors diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/wordstore/VocabConstructor.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/wordstore/VocabConstructor.java index 83c8e5f52..10f2a4811 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/wordstore/VocabConstructor.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/wordstore/VocabConstructor.java @@ -27,7 +27,7 @@ import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.deeplearning4j.models.word2vec.Huffman; import org.deeplearning4j.models.word2vec.wordstore.inmemory.AbstractCache; import org.deeplearning4j.text.invertedindex.InvertedIndex; -import org.deeplearning4j.util.ThreadUtils; +import org.deeplearning4j.core.util.ThreadUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.threadly.concurrent.PriorityScheduler; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/wordstore/inmemory/InMemoryLookupCache.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/wordstore/inmemory/InMemoryLookupCache.java index c950003cd..d5c4b35fa 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/wordstore/inmemory/InMemoryLookupCache.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/word2vec/wordstore/inmemory/InMemoryLookupCache.java @@ -19,9 +19,9 @@ package org.deeplearning4j.models.word2vec.wordstore.inmemory; import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.text.movingwindow.Util; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.util.SerializationUtils; -import org.nd4j.util.Index; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.util.SerializationUtils; +import org.nd4j.common.util.Index; import java.io.File; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/documentiterator/AsyncLabelAwareIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/documentiterator/AsyncLabelAwareIterator.java index dd87f9b1f..19068ff5f 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/documentiterator/AsyncLabelAwareIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/documentiterator/AsyncLabelAwareIterator.java @@ -18,7 +18,7 @@ package org.deeplearning4j.text.documentiterator; import lombok.Getter; import lombok.NonNull; -import org.deeplearning4j.parallelism.AsyncIterator; +import org.deeplearning4j.core.parallelism.AsyncIterator; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/documentiterator/FileDocumentIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/documentiterator/FileDocumentIterator.java index 88c127f84..0eff0731a 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/documentiterator/FileDocumentIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/documentiterator/FileDocumentIterator.java @@ -19,7 +19,7 @@ package org.deeplearning4j.text.documentiterator; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.LineIterator; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/invertedindex/InvertedIndex.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/invertedindex/InvertedIndex.java index 5e51cef20..3b5b9d796 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/invertedindex/InvertedIndex.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/invertedindex/InvertedIndex.java @@ -18,7 +18,7 @@ package org.deeplearning4j.text.invertedindex; import org.nd4j.shade.guava.base.Function; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/ContextLabelRetriever.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/ContextLabelRetriever.java index 5ceb933e7..a5d716fd6 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/ContextLabelRetriever.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/ContextLabelRetriever.java @@ -19,9 +19,9 @@ package org.deeplearning4j.text.movingwindow; import org.apache.commons.lang3.StringUtils; import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.collection.MultiDimensionalMap; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.collection.MultiDimensionalMap; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/Util.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/Util.java index 2ed29fc34..29d617f2d 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/Util.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/Util.java @@ -16,8 +16,8 @@ package org.deeplearning4j.text.movingwindow; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.CounterMap; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.CounterMap; import java.util.List; import java.util.logging.Level; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/WindowConverter.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/WindowConverter.java index 4507d42b9..c6341bcd1 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/WindowConverter.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/WindowConverter.java @@ -18,7 +18,7 @@ package org.deeplearning4j.text.movingwindow; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.models.word2vec.Word2Vec; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/sentenceiterator/PrefetchingSentenceIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/sentenceiterator/PrefetchingSentenceIterator.java index 5cb0711d9..8490a1f99 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/sentenceiterator/PrefetchingSentenceIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/sentenceiterator/PrefetchingSentenceIterator.java @@ -18,7 +18,7 @@ package org.deeplearning4j.text.sentenceiterator; import lombok.NonNull; -import org.deeplearning4j.util.ThreadUtils; +import org.deeplearning4j.core.util.ThreadUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/stopwords/StopWords.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/stopwords/StopWords.java index 5b5377ddf..5fa2772b5 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/stopwords/StopWords.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/stopwords/StopWords.java @@ -17,7 +17,7 @@ package org.deeplearning4j.text.stopwords; import org.apache.commons.io.IOUtils; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/CompositePreProcessor.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/CompositePreProcessor.java index 70dbd78fb..df7a51b8f 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/CompositePreProcessor.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/tokenization/tokenizer/preprocessor/CompositePreProcessor.java @@ -2,7 +2,7 @@ package org.deeplearning4j.text.tokenization.tokenizer.preprocessor; import lombok.NonNull; import org.deeplearning4j.text.tokenization.tokenizer.TokenPreProcess; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.ArrayList; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java index 6fb3b0316..38073ffbe 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/AssertTestsExtendBaseClass.java @@ -17,7 +17,7 @@ package org.deeplearning4j; import lombok.extern.slf4j.Slf4j; import java.util.*; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; /** * This class checks that all test classes (i.e., anything with one or more methods annotated with @Test) diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/TsneTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/TsneTest.java index cf0e7c7a3..69fcd236c 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/TsneTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/TsneTest.java @@ -17,7 +17,6 @@ package org.deeplearning4j; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.time.StopWatch; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; @@ -28,16 +27,13 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.primitives.Pair; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/bagofwords/vectorizer/BagOfWordsVectorizerTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/bagofwords/vectorizer/BagOfWordsVectorizerTest.java index 2dd630171..368b48ee9 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/bagofwords/vectorizer/BagOfWordsVectorizerTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/bagofwords/vectorizer/BagOfWordsVectorizerTest.java @@ -22,7 +22,7 @@ import lombok.val; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.text.sentenceiterator.labelaware.LabelAwareFileSentenceIterator; @@ -31,13 +31,10 @@ import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFac import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.IndexAccumulation; import org.nd4j.linalg.api.ops.impl.indexaccum.IMax; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.SerializationUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.nd4j.common.util.SerializationUtils; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/bagofwords/vectorizer/TfidfVectorizerTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/bagofwords/vectorizer/TfidfVectorizerTest.java index 23a14b305..37be879f1 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/bagofwords/vectorizer/TfidfVectorizerTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/bagofwords/vectorizer/TfidfVectorizerTest.java @@ -21,7 +21,7 @@ import lombok.val; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.text.documentiterator.LabelAwareIterator; @@ -39,7 +39,7 @@ import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.util.SerializationUtils; import java.io.File; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/iterator/TestBertIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/iterator/TestBertIterator.java index 52644c360..b9b20b510 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/iterator/TestBertIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/iterator/TestBertIterator.java @@ -29,9 +29,9 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; -import org.nd4j.resources.Resources; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.IOException; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/iterator/TestCnnSentenceDataSetIterator.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/iterator/TestCnnSentenceDataSetIterator.java index 53dae71ed..df5126049 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/iterator/TestCnnSentenceDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/iterator/TestCnnSentenceDataSetIterator.java @@ -19,7 +19,7 @@ package org.deeplearning4j.iterator; import org.deeplearning4j.BaseDL4JTest; import org.junit.Before; import org.nd4j.linalg.api.buffer.DataType; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.iterator.provider.CollectionLabeledSentenceProvider; import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; import org.deeplearning4j.models.embeddings.wordvectors.WordVectors; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTableTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTableTest.java index 97a8821c6..d56440287 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTableTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTableTest.java @@ -20,7 +20,7 @@ import lombok.val; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.sequencevectors.iterators.AbstractSequenceIterator; import org.deeplearning4j.models.sequencevectors.transformers.impl.SentenceTransformer; import org.deeplearning4j.models.word2vec.VocabWord; @@ -33,7 +33,7 @@ import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFac import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Before; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/fasttext/FastTextTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/fasttext/FastTextTest.java index 2e3ec06c2..4f0548ef5 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/fasttext/FastTextTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/fasttext/FastTextTest.java @@ -1,24 +1,20 @@ package org.deeplearning4j.models.fasttext; -import com.github.jfasttext.JFastText; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; -import org.deeplearning4j.models.embeddings.reader.impl.BasicModelUtils; import org.deeplearning4j.models.word2vec.Word2Vec; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.rules.Timeout; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.resources.Resources; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.IOException; -import java.util.Arrays; import static org.junit.Assert.assertArrayEquals; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/glove/AbstractCoOccurrencesTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/glove/AbstractCoOccurrencesTest.java index b5f6be9a1..8d59b2a5a 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/glove/AbstractCoOccurrencesTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/glove/AbstractCoOccurrencesTest.java @@ -17,7 +17,7 @@ package org.deeplearning4j.models.glove; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.sequencevectors.iterators.AbstractSequenceIterator; import org.deeplearning4j.models.sequencevectors.transformers.impl.SentenceTransformer; import org.deeplearning4j.models.word2vec.VocabWord; @@ -29,7 +29,7 @@ import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFac import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Before; import org.junit.Test; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/glove/GloveTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/glove/GloveTest.java index 70aa916dc..39aa40d10 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/glove/GloveTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/glove/GloveTest.java @@ -17,7 +17,7 @@ package org.deeplearning4j.models.glove; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; import org.deeplearning4j.models.embeddings.wordvectors.WordVectors; import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectorsTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectorsTest.java index a7423984c..afaf625a1 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectorsTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/paragraphvectors/ParagraphVectorsTest.java @@ -23,17 +23,14 @@ import lombok.val; import org.apache.commons.io.IOUtils; import org.apache.commons.io.LineIterator; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.models.embeddings.learning.impl.elements.CBOW; -import org.deeplearning4j.models.embeddings.reader.impl.FlatModelUtils; import org.deeplearning4j.models.sequencevectors.sequence.Sequence; import org.deeplearning4j.models.sequencevectors.transformers.impl.SentenceTransformer; import org.deeplearning4j.models.sequencevectors.transformers.impl.iterables.BasicTransformerIterator; -import org.deeplearning4j.models.sequencevectors.transformers.impl.iterables.ParallelTransformerIterator; import org.deeplearning4j.text.sentenceiterator.*; import org.junit.Rule; import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.buffer.DataType; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.embeddings.learning.impl.elements.SkipGram; import org.deeplearning4j.models.embeddings.learning.impl.sequence.DBOW; @@ -54,22 +51,18 @@ import org.deeplearning4j.text.sentenceiterator.interoperability.SentenceIterato import org.deeplearning4j.text.tokenization.tokenizer.preprocessor.CommonPreprocessor; import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.CollectionUtils; +import org.nd4j.common.io.CollectionUtils; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.util.SerializationUtils; -import org.nd4j.resources.Resources; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.nd4j.common.util.SerializationUtils; +import org.nd4j.common.resources.Resources; import java.io.*; import java.nio.charset.StandardCharsets; import java.util.*; -import java.util.concurrent.atomic.AtomicLong; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/sequencevectors/SequenceVectorsTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/sequencevectors/SequenceVectorsTest.java index 06b66d812..b3ba6e198 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/sequencevectors/SequenceVectorsTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/sequencevectors/SequenceVectorsTest.java @@ -19,11 +19,10 @@ package org.deeplearning4j.models.sequencevectors; import lombok.Data; import lombok.Getter; import lombok.Setter; -import lombok.val; import org.datavec.api.records.reader.impl.csv.CSVRecordReader; import org.datavec.api.split.FileSplit; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.datavec.api.writable.Writable; import org.deeplearning4j.models.embeddings.WeightLookupTable; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/sequencevectors/transformers/impl/iterables/ParallelTransformerIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/sequencevectors/transformers/impl/iterables/ParallelTransformerIteratorTest.java index c031d99ea..eb5db6af0 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/sequencevectors/transformers/impl/iterables/ParallelTransformerIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/sequencevectors/transformers/impl/iterables/ParallelTransformerIteratorTest.java @@ -19,8 +19,6 @@ package org.deeplearning4j.models.sequencevectors.transformers.impl.iterables; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.deeplearning4j.BaseDL4JTest; -import org.junit.Ignore; -import org.nd4j.linalg.io.ClassPathResource; import org.deeplearning4j.models.sequencevectors.sequence.Sequence; import org.deeplearning4j.models.sequencevectors.transformers.impl.SentenceTransformer; import org.deeplearning4j.models.word2vec.VocabWord; @@ -33,10 +31,9 @@ import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFac import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Before; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.InputStream; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/Word2VecTestsSmall.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/Word2VecTestsSmall.java index 596ec1ccd..c9cc8f072 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/Word2VecTestsSmall.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/Word2VecTestsSmall.java @@ -28,22 +28,20 @@ import org.deeplearning4j.nn.conf.layers.OutputLayer; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.text.documentiterator.FileLabelAwareIterator; import org.deeplearning4j.text.documentiterator.LabelAwareIterator; -import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.tokenization.tokenizer.preprocessor.CommonPreprocessor; import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFactory; -import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.deeplearning4j.util.ModelSerializer; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; import org.deeplearning4j.models.embeddings.wordvectors.WordVectors; import org.junit.Before; import org.junit.Test; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/iterator/Word2VecDataSetIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/iterator/Word2VecDataSetIteratorTest.java index 69c8bc362..56d88b46f 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/iterator/Word2VecDataSetIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/iterator/Word2VecDataSetIteratorTest.java @@ -18,12 +18,10 @@ package org.deeplearning4j.models.word2vec.iterator; import org.deeplearning4j.BaseDL4JTest; import org.deeplearning4j.models.paragraphvectors.ParagraphVectorsTest; -import org.nd4j.linalg.io.ClassPathResource; import org.deeplearning4j.models.embeddings.learning.impl.elements.CBOW; import org.deeplearning4j.models.embeddings.reader.impl.BasicModelUtils; import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.Word2Vec; -import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; import org.deeplearning4j.text.sentenceiterator.SentencePreProcessor; import org.deeplearning4j.text.sentenceiterator.labelaware.LabelAwareSentenceIterator; @@ -33,7 +31,7 @@ import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/wordstore/VocabConstructorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/wordstore/VocabConstructorTest.java index 430c21492..62640ab16 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/wordstore/VocabConstructorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/models/word2vec/wordstore/VocabConstructorTest.java @@ -16,14 +16,12 @@ package org.deeplearning4j.models.word2vec.wordstore; -import lombok.Getter; -import lombok.Setter; import lombok.val; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.TemporaryFolder; import org.junit.rules.Timeout; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.sequencevectors.interfaces.SequenceIterator; import org.deeplearning4j.models.sequencevectors.iterators.AbstractSequenceIterator; import org.deeplearning4j.models.sequencevectors.sequence.Sequence; @@ -39,12 +37,11 @@ import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFac import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Before; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.sql.Time; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/AsyncLabelAwareIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/AsyncLabelAwareIteratorTest.java index dbf6c7aa4..f4eeb09ee 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/AsyncLabelAwareIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/AsyncLabelAwareIteratorTest.java @@ -17,11 +17,10 @@ package org.deeplearning4j.text.documentiterator; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.linalg.io.ClassPathResource; import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import static org.junit.Assert.assertEquals; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/BasicLabelAwareIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/BasicLabelAwareIteratorTest.java index 984a098cc..119eb867b 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/BasicLabelAwareIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/BasicLabelAwareIteratorTest.java @@ -19,12 +19,11 @@ package org.deeplearning4j.text.documentiterator; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.Timeout; -import org.nd4j.linalg.io.ClassPathResource; import org.deeplearning4j.text.sentenceiterator.BasicLineIterator; import org.deeplearning4j.text.sentenceiterator.SentenceIterator; import org.junit.Before; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/DefaultDocumentIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/DefaultDocumentIteratorTest.java index 13070b790..918efd443 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/DefaultDocumentIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/DefaultDocumentIteratorTest.java @@ -21,7 +21,7 @@ import org.deeplearning4j.text.tokenization.tokenizer.Tokenizer; import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FileDocumentIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FileDocumentIteratorTest.java index ae7bd1271..af4c6a20e 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FileDocumentIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FileDocumentIteratorTest.java @@ -23,12 +23,10 @@ import org.apache.commons.io.IOUtils; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FileLabelAwareIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FileLabelAwareIteratorTest.java index 228a5eaaf..b18e9e52c 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FileLabelAwareIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FileLabelAwareIteratorTest.java @@ -20,12 +20,10 @@ import lombok.val; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.junit.Before; import org.junit.Test; -import java.io.File; - import static org.junit.Assert.*; /** diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FilenamesLabelAwareIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FilenamesLabelAwareIteratorTest.java index c0a962c8f..2ded626cf 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FilenamesLabelAwareIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/documentiterator/FilenamesLabelAwareIteratorTest.java @@ -20,12 +20,10 @@ import lombok.val; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; import org.junit.Before; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; -import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/AggregatingSentenceIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/AggregatingSentenceIteratorTest.java index 775e18d3f..4291f7555 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/AggregatingSentenceIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/AggregatingSentenceIteratorTest.java @@ -17,9 +17,8 @@ package org.deeplearning4j.text.sentenceiterator; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.linalg.io.ClassPathResource; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/BasicLineIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/BasicLineIteratorTest.java index 0f01937ed..3df45cafd 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/BasicLineIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/BasicLineIteratorTest.java @@ -19,10 +19,9 @@ package org.deeplearning4j.text.sentenceiterator; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.Timeout; -import org.nd4j.linalg.io.ClassPathResource; import org.junit.Before; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.io.FileInputStream; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/MutipleEpochsSentenceIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/MutipleEpochsSentenceIteratorTest.java index 1a3c215aa..001f9fc05 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/MutipleEpochsSentenceIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/MutipleEpochsSentenceIteratorTest.java @@ -17,9 +17,8 @@ package org.deeplearning4j.text.sentenceiterator; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.linalg.io.ClassPathResource; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import static org.junit.Assert.assertEquals; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/PrefetchingSentenceIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/PrefetchingSentenceIteratorTest.java index f0f6f1c54..4f4864396 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/PrefetchingSentenceIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/PrefetchingSentenceIteratorTest.java @@ -19,9 +19,8 @@ package org.deeplearning4j.text.sentenceiterator; import org.deeplearning4j.BaseDL4JTest; import org.junit.Rule; import org.junit.rules.Timeout; -import org.nd4j.linalg.io.ClassPathResource; import org.junit.Test; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/StreamLineIteratorTest.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/StreamLineIteratorTest.java index 954519ce6..4a50d2ca4 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/StreamLineIteratorTest.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/sentenceiterator/StreamLineIteratorTest.java @@ -17,7 +17,7 @@ package org.deeplearning4j.text.sentenceiterator; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/BertWordPieceTokenizerTests.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/BertWordPieceTokenizerTests.java index a225230af..c9896571b 100644 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/BertWordPieceTokenizerTests.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/BertWordPieceTokenizerTests.java @@ -24,8 +24,8 @@ import org.deeplearning4j.text.tokenization.tokenizerfactory.BertWordPieceTokeni import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.resources.Resources; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.resources.Resources; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/DefaulTokenizerTests.java b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/DefaulTokenizerTests.java index ecd64df36..dd1fbd0a6 100755 --- a/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/DefaulTokenizerTests.java +++ b/deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/test/java/org/deeplearning4j/text/tokenization/tokenizer/DefaulTokenizerTests.java @@ -18,7 +18,7 @@ package org.deeplearning4j.text.tokenization.tokenizer; import org.apache.commons.io.FileUtils; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFactory; import org.deeplearning4j.text.tokenization.tokenizerfactory.TokenizerFactory; import org.junit.Test; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/impl/MultiDataSetIteratorAdapter.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/impl/MultiDataSetIteratorAdapter.java deleted file mode 100644 index 42ca0dd40..000000000 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/impl/MultiDataSetIteratorAdapter.java +++ /dev/null @@ -1,89 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015-2018 Skymind, Inc. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ******************************************************************************/ - -package org.deeplearning4j.datasets.iterator.impl; - -import org.deeplearning4j.nn.graph.util.ComputationGraphUtil; -import org.nd4j.linalg.dataset.api.MultiDataSet; -import org.nd4j.linalg.dataset.api.MultiDataSetPreProcessor; -import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; - -/** - * Iterator that adapts a DataSetIterator to a MultiDataSetIterator - * - * @author Alex Black - */ -public class MultiDataSetIteratorAdapter implements MultiDataSetIterator { - - private org.nd4j.linalg.dataset.api.iterator.DataSetIterator iter; - private MultiDataSetPreProcessor preProcessor; - - public MultiDataSetIteratorAdapter(org.nd4j.linalg.dataset.api.iterator.DataSetIterator iter) { - this.iter = iter; - } - - @Override - public MultiDataSet next(int i) { - MultiDataSet mds = ComputationGraphUtil.toMultiDataSet(iter.next(i)); - if (preProcessor != null) - preProcessor.preProcess(mds); - return mds; - } - - @Override - public void setPreProcessor(MultiDataSetPreProcessor multiDataSetPreProcessor) { - this.preProcessor = multiDataSetPreProcessor; - } - - @Override - public MultiDataSetPreProcessor getPreProcessor() { - return preProcessor; - } - - @Override - public boolean resetSupported() { - return iter.resetSupported(); - } - - @Override - public boolean asyncSupported() { - return iter.asyncSupported(); - } - - @Override - public void reset() { - iter.reset(); - } - - @Override - public boolean hasNext() { - return iter.hasNext(); - } - - @Override - public MultiDataSet next() { - MultiDataSet mds = ComputationGraphUtil.toMultiDataSet(iter.next()); - if (preProcessor != null) - preProcessor.preProcess(mds); - return mds; - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - -} \ No newline at end of file diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/EarlyStoppingConfiguration.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/EarlyStoppingConfiguration.java index 468b969a4..817d022e2 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/EarlyStoppingConfiguration.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/EarlyStoppingConfiguration.java @@ -16,7 +16,6 @@ package org.deeplearning4j.earlystopping; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.deeplearning4j.earlystopping.saver.InMemoryModelSaver; @@ -25,7 +24,7 @@ import org.deeplearning4j.earlystopping.termination.EpochTerminationCondition; import org.deeplearning4j.earlystopping.termination.IterationTerminationCondition; import org.deeplearning4j.exception.DL4JInvalidConfigException; import org.deeplearning4j.nn.api.Model; -import org.nd4j.linalg.function.Supplier; +import org.nd4j.common.function.Supplier; import java.io.Serializable; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/scorecalc/base/BaseIEvaluationScoreCalculator.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/scorecalc/base/BaseIEvaluationScoreCalculator.java index 301540fc5..7f6b7dbe5 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/scorecalc/base/BaseIEvaluationScoreCalculator.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/scorecalc/base/BaseIEvaluationScoreCalculator.java @@ -17,12 +17,12 @@ package org.deeplearning4j.earlystopping.scorecalc.base; import org.deeplearning4j.datasets.iterator.MultiDataSetWrapperIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.earlystopping.scorecalc.ScoreCalculator; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.nd4j.evaluation.IEvaluation; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/trainer/BaseEarlyStoppingTrainer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/trainer/BaseEarlyStoppingTrainer.java index e4b38c7f7..f038645ec 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/trainer/BaseEarlyStoppingTrainer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/earlystopping/trainer/BaseEarlyStoppingTrainer.java @@ -26,7 +26,7 @@ import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.optimize.api.TrainingListener; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.dataset.AsyncDataSetIterator; import org.nd4j.linalg.dataset.AsyncMultiDataSetIterator; import org.nd4j.linalg.dataset.DataSet; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/BaseEvaluation.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/BaseEvaluation.java index a38f289b6..8ca1763f6 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/BaseEvaluation.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/BaseEvaluation.java @@ -18,14 +18,12 @@ package org.deeplearning4j.eval; import lombok.EqualsAndHashCode; import lombok.Getter; -import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.AtomicDouble; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.serde.JsonDeserializerAtomicBoolean; -import org.nd4j.linalg.primitives.serde.JsonDeserializerAtomicDouble; -import org.nd4j.linalg.primitives.serde.JsonSerializerAtomicBoolean; -import org.nd4j.linalg.primitives.serde.JsonSerializerAtomicDouble; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.primitives.AtomicDouble; +import org.nd4j.common.primitives.serde.JsonDeserializerAtomicBoolean; +import org.nd4j.common.primitives.serde.JsonDeserializerAtomicDouble; +import org.nd4j.common.primitives.serde.JsonSerializerAtomicBoolean; +import org.nd4j.common.primitives.serde.JsonSerializerAtomicDouble; import org.nd4j.shade.jackson.annotation.JsonAutoDetect; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.databind.DeserializationFeature; @@ -35,10 +33,6 @@ import org.nd4j.shade.jackson.databind.SerializationFeature; import org.nd4j.shade.jackson.databind.module.SimpleModule; import org.nd4j.shade.jackson.dataformat.yaml.YAMLFactory; -import java.io.IOException; -import java.io.Serializable; -import java.util.List; - /** * @deprecated Use {@link org.nd4j.evaluation.BaseEvaluation} */ diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/EvaluationUtils.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/EvaluationUtils.java index 3ec28b30d..61570257d 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/EvaluationUtils.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/EvaluationUtils.java @@ -16,17 +16,8 @@ package org.deeplearning4j.eval; -import lombok.val; -import org.deeplearning4j.util.TimeSeriesUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; -import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; -import org.deeplearning4j.nn.workspace.ArrayType; -import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; - -import java.util.Arrays; /** * @deprecated Use {@link org.nd4j.evaluation.EvaluationUtils} diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/gradientcheck/GradientCheckUtil.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/gradientcheck/GradientCheckUtil.java index 3cd169c59..25f53cef6 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/gradientcheck/GradientCheckUtil.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/gradientcheck/GradientCheckUtil.java @@ -19,12 +19,11 @@ package org.deeplearning4j.gradientcheck; import lombok.*; import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.nn.api.Model; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.exception.ND4JArraySizeException; -import org.nd4j.linalg.function.Consumer; +import org.nd4j.common.function.Consumer; import org.nd4j.linalg.lossfunctions.impl.LossBinaryXENT; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.Updater; import org.deeplearning4j.nn.api.layers.IOutputLayer; @@ -42,7 +41,6 @@ import org.deeplearning4j.nn.updater.graph.ComputationGraphUpdater; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.activations.impl.ActivationSoftmax; -import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.util.DataTypeUtil; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/adapters/ArgmaxAdapter.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/adapters/ArgmaxAdapter.java index 74ffd3fe8..8830a1304 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/adapters/ArgmaxAdapter.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/adapters/ArgmaxAdapter.java @@ -18,7 +18,7 @@ package org.deeplearning4j.nn.adapters; import lombok.val; import org.nd4j.adapters.OutputAdapter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/adapters/Regression2dAdapter.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/adapters/Regression2dAdapter.java index f0c83669b..bc8cc8c95 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/adapters/Regression2dAdapter.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/adapters/Regression2dAdapter.java @@ -19,7 +19,7 @@ package org.deeplearning4j.nn.adapters; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.adapters.OutputAdapter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; /** diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/Layer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/Layer.java index bcc1a67ac..be96113c9 100755 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/Layer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/Layer.java @@ -23,7 +23,7 @@ import org.deeplearning4j.nn.layers.LayerHelper; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.optimize.api.TrainingListener; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/Model.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/Model.java index f2cdc7e5f..2d5314569 100755 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/Model.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/Model.java @@ -22,7 +22,7 @@ import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.optimize.api.ConvexOptimizer; import org.deeplearning4j.optimize.api.TrainingListener; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collection; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/layers/RecurrentLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/layers/RecurrentLayer.java index 0fe2a8689..dc7d9de55 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/layers/RecurrentLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/api/layers/RecurrentLayer.java @@ -17,10 +17,9 @@ package org.deeplearning4j.nn.api.layers; import org.deeplearning4j.nn.api.Layer; -import org.deeplearning4j.nn.conf.RNNFormat; import org.deeplearning4j.nn.gradient.Gradient; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/ComputationGraphConfiguration.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/ComputationGraphConfiguration.java index 6a4bc01aa..a1ae823da 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/ComputationGraphConfiguration.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/ComputationGraphConfiguration.java @@ -35,7 +35,7 @@ import org.deeplearning4j.nn.conf.serde.JsonMappers; import org.deeplearning4j.nn.weights.IWeightInit; import org.deeplearning4j.nn.weights.WeightInit; import org.deeplearning4j.util.OutputLayerUtil; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.buffer.DataType; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/InputPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/InputPreProcessor.java index 4f02e3d66..92b98eff5 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/InputPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/InputPreProcessor.java @@ -20,7 +20,7 @@ package org.deeplearning4j.nn.conf; import org.deeplearning4j.nn.api.MaskState; import org.deeplearning4j.nn.conf.inputs.InputType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.nd4j.shade.jackson.annotation.JsonTypeInfo; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetConfiguration.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetConfiguration.java index 0da5bea13..462bc9f17 100755 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetConfiguration.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetConfiguration.java @@ -41,7 +41,7 @@ import org.deeplearning4j.nn.weights.WeightInit; import org.deeplearning4j.nn.weights.WeightInitDistribution; import org.deeplearning4j.nn.weights.WeightInitXavier; import org.deeplearning4j.util.NetworkUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.activations.impl.ActivationSigmoid; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/AlphaDropout.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/AlphaDropout.java index 6382bb808..aa2ed3478 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/AlphaDropout.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/AlphaDropout.java @@ -22,10 +22,9 @@ import lombok.NonNull; import lombok.ToString; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -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.transforms.pairwise.arithmetic.MulOp; -import org.nd4j.linalg.api.ops.random.impl.AlphaDropOut; import org.nd4j.linalg.api.ops.random.impl.BernoulliDistribution; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.schedule.ISchedule; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/Dropout.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/Dropout.java index ee8bbdc64..46a872fd8 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/Dropout.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/Dropout.java @@ -23,7 +23,7 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -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.impl.transforms.pairwise.arithmetic.MulOp; @@ -134,7 +134,7 @@ public class Dropout implements IDropout { String backend = Nd4j.getExecutioner().getEnvironmentInformation().getProperty("backend"); if("CUDA".equalsIgnoreCase(backend)) { try { - helper = Class.forName("org.deeplearning4j.nn.layers.dropout.CudnnDropoutHelper") + helper = Class.forName("org.deeplearning4j.cuda.dropout.CudnnDropoutHelper") .asSubclass(DropoutHelper.class).getConstructor(DataType.class).newInstance(dataType); log.debug("CudnnDropoutHelper successfully initialized"); if (!helper.checkSupported()) { diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/GaussianDropout.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/GaussianDropout.java index d42b79d29..cd25718bc 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/GaussianDropout.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/GaussianDropout.java @@ -20,7 +20,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -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.transforms.pairwise.arithmetic.MulOp; import org.nd4j.linalg.api.ops.random.impl.GaussianDistribution; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/SpatialDropout.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/SpatialDropout.java index aee73dbfa..4d83e7fe8 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/SpatialDropout.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/dropout/SpatialDropout.java @@ -18,11 +18,10 @@ package org.deeplearning4j.nn.conf.dropout; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NonNull; import lombok.val; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.random.impl.DropOutInverted; import org.nd4j.linalg.factory.Broadcast; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/AttentionVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/AttentionVertex.java index eb2a78b11..77efbf84e 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/AttentionVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/AttentionVertex.java @@ -29,7 +29,7 @@ import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/ReshapeVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/ReshapeVertex.java index 76eeef8af..006024eea 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/ReshapeVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/ReshapeVertex.java @@ -22,7 +22,7 @@ import org.deeplearning4j.nn.conf.inputs.InvalidInputTypeException; import org.deeplearning4j.nn.conf.memory.LayerMemoryReport; import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.nn.graph.ComputationGraph; -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.shade.jackson.annotation.JsonProperty; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/StackVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/StackVertex.java index d5e914938..65515153d 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/StackVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/graph/StackVertex.java @@ -22,7 +22,7 @@ import org.deeplearning4j.nn.conf.inputs.InvalidInputTypeException; import org.deeplearning4j.nn.conf.memory.LayerMemoryReport; import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.nn.graph.ComputationGraph; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/CapsuleLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/CapsuleLayer.java index 98bda1f3a..5769f2a83 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/CapsuleLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/CapsuleLayer.java @@ -31,7 +31,6 @@ import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ConvolutionLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ConvolutionLayer.java index ebe1b8568..3b2d4c0be 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ConvolutionLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ConvolutionLayer.java @@ -27,7 +27,7 @@ import org.deeplearning4j.nn.params.ConvolutionParamInitializer; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ConvolutionUtils; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/DepthwiseConvolution2D.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/DepthwiseConvolution2D.java index e5e7b5436..7edf65618 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/DepthwiseConvolution2D.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/DepthwiseConvolution2D.java @@ -27,7 +27,7 @@ import org.deeplearning4j.nn.params.DepthwiseConvolutionParamInitializer; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ConvolutionUtils; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LearnedSelfAttentionLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LearnedSelfAttentionLayer.java index a0fa4d680..8ddd20b45 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LearnedSelfAttentionLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LearnedSelfAttentionLayer.java @@ -27,11 +27,11 @@ import org.deeplearning4j.nn.weights.WeightInitUtil; import org.nd4j.autodiff.samediff.SDIndex; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocalResponseNormalization.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocalResponseNormalization.java index f4f49b79a..ebfc56a7b 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocalResponseNormalization.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocalResponseNormalization.java @@ -27,7 +27,7 @@ import org.deeplearning4j.nn.conf.memory.LayerMemoryReport; import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.nn.params.EmptyParamInitializer; import org.deeplearning4j.optimize.api.TrainingListener; -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.learning.regularization.Regularization; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected1D.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected1D.java index d43423bf4..a5028f08a 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected1D.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected1D.java @@ -31,7 +31,7 @@ import org.deeplearning4j.util.Convolution1DUtils; import org.nd4j.autodiff.samediff.SDIndex; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.PadMode; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.memory.MemoryWorkspace; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected2D.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected2D.java index 9b8fb10aa..b65d2fe77 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected2D.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected2D.java @@ -32,7 +32,6 @@ import org.deeplearning4j.util.ValidationUtils; import org.nd4j.autodiff.samediff.SDIndex; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; import org.nd4j.enums.PadMode; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.memory.MemoryWorkspace; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PReLULayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PReLULayer.java index 428a4c7a6..b9b8bca4d 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PReLULayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PReLULayer.java @@ -27,7 +27,6 @@ import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.nn.params.PReLUParamInitializer; import org.deeplearning4j.nn.weights.WeightInitConstant; import org.deeplearning4j.optimize.api.TrainingListener; -import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/RecurrentAttentionLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/RecurrentAttentionLayer.java index bc746f8ab..10659f326 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/RecurrentAttentionLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/RecurrentAttentionLayer.java @@ -28,7 +28,7 @@ import org.deeplearning4j.nn.params.SimpleRnnParamInitializer; import org.deeplearning4j.nn.weights.WeightInitUtil; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SelfAttentionLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SelfAttentionLayer.java index 8daa4a2c2..79fa765a4 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SelfAttentionLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SelfAttentionLayer.java @@ -25,7 +25,7 @@ import org.deeplearning4j.nn.conf.layers.samediff.SameDiffLayer; import org.deeplearning4j.nn.weights.WeightInitUtil; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SpaceToBatchLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SpaceToBatchLayer.java index cd7db60ab..042f09121 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SpaceToBatchLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SpaceToBatchLayer.java @@ -27,7 +27,7 @@ import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.nn.params.EmptyParamInitializer; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Subsampling3DLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Subsampling3DLayer.java index b5d73bceb..67a2e804c 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Subsampling3DLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Subsampling3DLayer.java @@ -29,7 +29,7 @@ import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.Convolution3DUtils; import org.deeplearning4j.util.ConvolutionUtils; import org.deeplearning4j.util.ValidationUtils; -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.exception.ND4JArraySizeException; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java index 8b09aedf1..a434d05bc 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java @@ -29,7 +29,7 @@ import org.deeplearning4j.nn.params.EmptyParamInitializer; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ConvolutionUtils; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Upsampling1D.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Upsampling1D.java index 1e1fcfab1..4b39fa34d 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Upsampling1D.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Upsampling1D.java @@ -28,7 +28,7 @@ import org.deeplearning4j.nn.conf.memory.LayerMemoryReport; import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Upsampling3D.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Upsampling3D.java index 24db83bd3..695212d89 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Upsampling3D.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Upsampling3D.java @@ -24,7 +24,7 @@ import org.deeplearning4j.nn.conf.memory.LayerMemoryReport; import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ZeroPaddingLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ZeroPaddingLayer.java index 30e46edab..ef92d2f85 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ZeroPaddingLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ZeroPaddingLayer.java @@ -26,7 +26,7 @@ import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ConvolutionUtils; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping1D.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping1D.java index 6ae0bae8f..b10b0e716 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping1D.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping1D.java @@ -27,7 +27,7 @@ import org.deeplearning4j.nn.conf.memory.LayerMemoryReport; import org.deeplearning4j.nn.layers.convolution.Cropping1DLayer; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping2D.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping2D.java index 7b8852dc0..3a13e2fc0 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping2D.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping2D.java @@ -24,13 +24,12 @@ import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.conf.layers.InputTypeUtil; import org.deeplearning4j.nn.conf.layers.Layer; import org.deeplearning4j.nn.conf.layers.NoParamLayer; -import org.deeplearning4j.nn.conf.layers.ZeroPaddingLayer; import org.deeplearning4j.nn.conf.memory.LayerMemoryReport; import org.deeplearning4j.nn.layers.convolution.Cropping2DLayer; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ConvolutionUtils; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping3D.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping3D.java index e06b4b4e7..74710a469 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping3D.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping3D.java @@ -27,7 +27,7 @@ import org.deeplearning4j.nn.conf.memory.LayerMemoryReport; import org.deeplearning4j.nn.layers.convolution.Cropping3DLayer; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ValidationUtils; -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; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SDLayerParams.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SDLayerParams.java index 49f209729..d4bf4c32c 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SDLayerParams.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SDLayerParams.java @@ -19,8 +19,7 @@ package org.deeplearning4j.nn.conf.layers.samediff; import lombok.Data; import lombok.NoArgsConstructor; import lombok.NonNull; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.api.ndarray.INDArray; +import org.nd4j.common.base.Preconditions; import org.nd4j.shade.jackson.annotation.JsonIgnore; import org.nd4j.shade.jackson.annotation.JsonIgnoreProperties; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SDVertexParams.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SDVertexParams.java index a73a5c27d..f86396b3a 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SDVertexParams.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SDVertexParams.java @@ -17,7 +17,7 @@ package org.deeplearning4j.nn.conf.layers.samediff; import lombok.Data; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.Arrays; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffLambdaVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffLambdaVertex.java index d8fc9fd48..cfbcfcbc4 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffLambdaVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffLambdaVertex.java @@ -19,10 +19,9 @@ package org.deeplearning4j.nn.conf.layers.samediff; import org.deeplearning4j.nn.conf.graph.GraphVertex; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; -import java.lang.reflect.InvocationTargetException; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffLayer.java index e17535acc..f290a09f3 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffLayer.java @@ -27,7 +27,7 @@ import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collection; import java.util.HashMap; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffVertex.java index f0066dac7..795365cd3 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/SameDiffVertex.java @@ -24,7 +24,6 @@ import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.graph.GraphVertex; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.conf.inputs.InvalidInputTypeException; -import org.deeplearning4j.nn.conf.layers.Layer; import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.layers.samediff.SameDiffGraphVertex; @@ -34,10 +33,9 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.learning.config.IUpdater; import org.nd4j.linalg.learning.regularization.Regularization; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; -import java.lang.reflect.Field; import java.util.List; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/variational/VariationalAutoencoder.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/variational/VariationalAutoencoder.java index 9e545defc..ac42afa55 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/variational/VariationalAutoencoder.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/variational/VariationalAutoencoder.java @@ -34,7 +34,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Collection; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/BaseInputPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/BaseInputPreProcessor.java index ad403e6af..83f1097b7 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/BaseInputPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/BaseInputPreProcessor.java @@ -19,7 +19,7 @@ package org.deeplearning4j.nn.conf.preprocessor; import org.deeplearning4j.nn.api.MaskState; import org.deeplearning4j.nn.conf.InputPreProcessor; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * @author Adam Gibson diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/Cnn3DToFeedForwardPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/Cnn3DToFeedForwardPreProcessor.java index 185fd18d3..f6ba7af7b 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/Cnn3DToFeedForwardPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/Cnn3DToFeedForwardPreProcessor.java @@ -25,8 +25,7 @@ import org.deeplearning4j.nn.conf.layers.Convolution3D; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.annotation.JsonCreator; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/CnnToFeedForwardPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/CnnToFeedForwardPreProcessor.java index a9f82ba32..1a7e3928b 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/CnnToFeedForwardPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/CnnToFeedForwardPreProcessor.java @@ -24,7 +24,7 @@ import org.deeplearning4j.nn.conf.InputPreProcessor; import org.deeplearning4j.nn.conf.inputs.InputType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; import org.nd4j.shade.jackson.annotation.JsonCreator; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/CnnToRnnPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/CnnToRnnPreProcessor.java index 43b1b1e7c..6f18e70e4 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/CnnToRnnPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/CnnToRnnPreProcessor.java @@ -22,11 +22,10 @@ import org.deeplearning4j.nn.conf.InputPreProcessor; import org.deeplearning4j.nn.conf.RNNFormat; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.util.TimeSeriesUtils; -import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; import org.nd4j.shade.jackson.annotation.JsonCreator; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/ComposableInputPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/ComposableInputPreProcessor.java index f41d3368d..55f0e6b12 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/ComposableInputPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/ComposableInputPreProcessor.java @@ -23,7 +23,7 @@ import org.deeplearning4j.nn.conf.InputPreProcessor; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.workspace.ArrayType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.nd4j.shade.jackson.annotation.JsonCreator; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToCnn3DPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToCnn3DPreProcessor.java index 1ca056eab..305ace530 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToCnn3DPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToCnn3DPreProcessor.java @@ -23,9 +23,8 @@ import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.shade.jackson.annotation.JsonCreator; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToCnnPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToCnnPreProcessor.java index 8d44d9e3f..817d53848 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToCnnPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToCnnPreProcessor.java @@ -22,8 +22,8 @@ import org.deeplearning4j.nn.conf.InputPreProcessor; import org.deeplearning4j.nn.conf.inputs.InputType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; import org.nd4j.shade.jackson.annotation.JsonCreator; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToRnnPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToRnnPreProcessor.java index d0b01698e..e6bca1bed 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToRnnPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/FeedForwardToRnnPreProcessor.java @@ -26,7 +26,7 @@ import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.util.TimeSeriesUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/RnnToCnnPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/RnnToCnnPreProcessor.java index bcfc92170..57487aae7 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/RnnToCnnPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/RnnToCnnPreProcessor.java @@ -22,11 +22,10 @@ import org.deeplearning4j.nn.conf.InputPreProcessor; import org.deeplearning4j.nn.conf.RNNFormat; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.util.TimeSeriesUtils; -import org.nd4j.enums.RnnDataFormat; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/RnnToFeedForwardPreProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/RnnToFeedForwardPreProcessor.java index f3e9323a5..d4355e38b 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/RnnToFeedForwardPreProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/preprocessor/RnnToFeedForwardPreProcessor.java @@ -16,7 +16,6 @@ package org.deeplearning4j.nn.conf.preprocessor; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -28,7 +27,7 @@ import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.util.TimeSeriesUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/serde/JsonMappers.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/serde/JsonMappers.java index 1cdd85d4b..124cc4ffc 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/serde/JsonMappers.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/serde/JsonMappers.java @@ -16,22 +16,10 @@ package org.deeplearning4j.nn.conf.serde; -import lombok.AllArgsConstructor; -import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.config.DL4JSystemProperties; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; -import org.deeplearning4j.nn.conf.InputPreProcessor; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; -import org.deeplearning4j.nn.conf.NeuralNetConfiguration; -import org.deeplearning4j.nn.conf.graph.GraphVertex; -import org.deeplearning4j.nn.conf.layers.Layer; -import org.deeplearning4j.nn.conf.layers.variational.ReconstructionDistribution; import org.deeplearning4j.nn.conf.serde.legacy.LegacyJsonFormat; -import org.nd4j.linalg.activations.IActivation; -import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.serde.json.LegacyIActivationDeserializer; -import org.nd4j.serde.json.LegacyILossFunctionDeserializer; import org.nd4j.shade.jackson.annotation.JsonTypeInfo; import org.nd4j.shade.jackson.databind.*; import org.nd4j.shade.jackson.databind.cfg.MapperConfig; @@ -43,13 +31,6 @@ import org.nd4j.shade.jackson.databind.introspect.JacksonAnnotationIntrospector; import org.nd4j.shade.jackson.databind.jsontype.TypeResolverBuilder; import org.nd4j.shade.jackson.databind.module.SimpleModule; import org.nd4j.shade.jackson.dataformat.yaml.YAMLFactory; -import org.nd4j.util.OneTimeLogger; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; /** * JSON mappers for deserializing neural net configurations, etc. diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java index 582b20a15..c648efe7b 100755 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java @@ -26,7 +26,6 @@ import org.apache.commons.lang3.StringUtils; import org.bytedeco.javacpp.Pointer; import org.nd4j.adapters.OutputAdapter; import org.nd4j.linalg.dataset.AsyncMultiDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.exception.DL4JException; import org.deeplearning4j.nn.api.*; import org.deeplearning4j.nn.api.Updater; @@ -60,7 +59,7 @@ import org.deeplearning4j.util.CrashReportingUtil; import org.deeplearning4j.util.ModelSerializer; import org.deeplearning4j.util.NetworkUtils; import org.deeplearning4j.util.OutputLayerUtil; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.classification.Evaluation; import org.nd4j.evaluation.classification.ROC; @@ -74,6 +73,7 @@ import org.nd4j.linalg.api.memory.enums.LearningPolicy; import org.nd4j.linalg.api.memory.enums.ResetPolicy; import org.nd4j.linalg.api.memory.enums.SpillPolicy; import org.nd4j.linalg.api.ndarray.INDArray; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.DataSetUtil; import org.nd4j.linalg.dataset.api.MultiDataSet; @@ -89,12 +89,12 @@ import org.nd4j.linalg.heartbeat.utils.EnvironmentUtils; import org.nd4j.linalg.heartbeat.utils.TaskUtils; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.api.memory.abstracts.DummyWorkspace; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; import org.nd4j.linalg.schedule.ISchedule; import org.nd4j.linalg.workspace.ND4JWorkspaceException; import org.nd4j.linalg.workspace.WorkspaceUtils; -import org.nd4j.util.OneTimeLogger; +import org.nd4j.common.util.OneTimeLogger; import java.io.*; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/util/ComputationGraphUtil.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/util/ComputationGraphUtil.java index 4b9918203..54f3835e9 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/util/ComputationGraphUtil.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/util/ComputationGraphUtil.java @@ -16,8 +16,8 @@ package org.deeplearning4j.nn.graph.util; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.nd4j.linalg.api.ndarray.INDArray; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/BaseWrapperVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/BaseWrapperVertex.java index 7a1af2343..de6b18428 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/BaseWrapperVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/BaseWrapperVertex.java @@ -22,7 +22,7 @@ import org.deeplearning4j.nn.api.TrainingConfig; import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/GraphVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/GraphVertex.java index 2d28ca1f3..a2477f940 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/GraphVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/GraphVertex.java @@ -21,7 +21,7 @@ import org.deeplearning4j.nn.api.MaskState; import org.deeplearning4j.nn.api.Trainable; import org.deeplearning4j.nn.gradient.Gradient; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ElementWiseVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ElementWiseVertex.java index b22aae451..5018dbe71 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ElementWiseVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ElementWiseVertex.java @@ -35,7 +35,7 @@ import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/InputVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/InputVertex.java index 07216b14a..32e671345 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/InputVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/InputVertex.java @@ -24,7 +24,7 @@ import org.deeplearning4j.nn.graph.vertex.BaseGraphVertex; import org.deeplearning4j.nn.graph.vertex.VertexIndices; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; /** An InputVertex simply defines the location (and connection structure) of inputs to the ComputationGraph. diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/L2NormalizeVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/L2NormalizeVertex.java index 4ec17dc95..894c026ed 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/L2NormalizeVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/L2NormalizeVertex.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.api.ops.impl.broadcast.BroadcastDivOp; import org.nd4j.linalg.api.ops.impl.broadcast.BroadcastMulOp; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/L2Vertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/L2Vertex.java index b9931eb77..20394880c 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/L2Vertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/L2Vertex.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.api.ops.impl.broadcast.BroadcastMulOp; import org.nd4j.linalg.api.ops.impl.reduce3.EuclideanDistance; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/LayerVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/LayerVertex.java index 886c719f9..d803808df 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/LayerVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/LayerVertex.java @@ -33,7 +33,7 @@ import org.deeplearning4j.nn.layers.FrozenLayer; import org.deeplearning4j.nn.layers.FrozenLayerWithBackprop; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/MergeVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/MergeVertex.java index 4f864d0cc..702767e8a 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/MergeVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/MergeVertex.java @@ -30,7 +30,7 @@ import org.nd4j.linalg.api.ops.impl.transforms.pairwise.bool.Or; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/PoolHelperVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/PoolHelperVertex.java index d13368969..962b02081 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/PoolHelperVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/PoolHelperVertex.java @@ -27,7 +27,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.pairwise.bool.Or; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/PreprocessorVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/PreprocessorVertex.java index 906a3a352..d8fe85617 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/PreprocessorVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/PreprocessorVertex.java @@ -25,7 +25,7 @@ import org.deeplearning4j.nn.graph.vertex.BaseGraphVertex; import org.deeplearning4j.nn.graph.vertex.VertexIndices; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; /** PreprocessorVertex is a simple adaptor class that allows a {@link InputPreProcessor} to be used in a ComputationGraph diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ReshapeVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ReshapeVertex.java index 828d19018..39fcac462 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ReshapeVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ReshapeVertex.java @@ -18,7 +18,6 @@ package org.deeplearning4j.nn.graph.vertex.impl; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.MaskState; -import org.deeplearning4j.nn.api.TrainingConfig; import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.graph.vertex.BaseGraphVertex; @@ -27,9 +26,7 @@ import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; - -import java.util.Map; +import org.nd4j.common.primitives.Pair; /** * Adds the ability to reshape and flatten the tensor in the computation graph. This is the equivalent diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ScaleVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ScaleVertex.java index 0bea6c3ec..c4fa89239 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ScaleVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ScaleVertex.java @@ -25,7 +25,7 @@ import org.deeplearning4j.nn.graph.vertex.VertexIndices; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ShiftVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ShiftVertex.java index b4f171894..d9f5c78de 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ShiftVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/ShiftVertex.java @@ -25,7 +25,7 @@ import org.deeplearning4j.nn.graph.vertex.VertexIndices; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/StackVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/StackVertex.java index 37e091e44..3be9d6895 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/StackVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/StackVertex.java @@ -17,7 +17,6 @@ package org.deeplearning4j.nn.graph.vertex.impl; import lombok.val; -import org.apache.commons.lang3.ArrayUtils; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.MaskState; import org.deeplearning4j.nn.gradient.Gradient; @@ -30,7 +29,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/SubsetVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/SubsetVertex.java index 0e148185d..db4449293 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/SubsetVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/SubsetVertex.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/UnstackVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/UnstackVertex.java index 009505057..9eb4151c8 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/UnstackVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/UnstackVertex.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/DuplicateToTimeSeriesVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/DuplicateToTimeSeriesVertex.java index 293ce4af2..8b3f2fba0 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/DuplicateToTimeSeriesVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/DuplicateToTimeSeriesVertex.java @@ -27,7 +27,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/LastTimeStepVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/LastTimeStepVertex.java index 797676441..75ce3be3b 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/LastTimeStepVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/LastTimeStepVertex.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/ReverseTimeSeriesVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/ReverseTimeSeriesVertex.java index d4f5a4bb8..0d75119de 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/ReverseTimeSeriesVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/rnn/ReverseTimeSeriesVertex.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/AbstractLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/AbstractLayer.java index ebf8d7092..da03b19c5 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/AbstractLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/AbstractLayer.java @@ -33,7 +33,7 @@ import org.deeplearning4j.optimize.api.ConvexOptimizer; import org.deeplearning4j.optimize.api.TrainingListener; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/ActivationLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/ActivationLayer.java index 2d9e350b3..c1c92d3a7 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/ActivationLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/ActivationLayer.java @@ -17,13 +17,12 @@ package org.deeplearning4j.nn.layers; -import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BaseLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BaseLayer.java index 9cc6a639c..1b7d045a8 100755 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BaseLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BaseLayer.java @@ -35,7 +35,7 @@ import org.nd4j.linalg.api.ops.impl.transforms.custom.LayerNormBp; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.learning.regularization.Regularization; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.lang.reflect.Constructor; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BaseOutputLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BaseOutputLayer.java index e9fca709e..b5c68c884 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BaseOutputLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BaseOutputLayer.java @@ -32,7 +32,7 @@ import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BasePretrainNetwork.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BasePretrainNetwork.java index e36e307cb..f135b0400 100755 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BasePretrainNetwork.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/BasePretrainNetwork.java @@ -28,9 +28,8 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.regularization.Regularization; import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; -import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/DropoutLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/DropoutLayer.java index 6af402554..ff5af8426 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/DropoutLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/DropoutLayer.java @@ -16,13 +16,12 @@ package org.deeplearning4j.nn.layers; -import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/FrozenLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/FrozenLayer.java index 9034ff107..3c28cc59a 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/FrozenLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/FrozenLayer.java @@ -18,23 +18,16 @@ package org.deeplearning4j.nn.layers; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.nn.api.Layer; -import org.deeplearning4j.nn.api.MaskState; import org.deeplearning4j.nn.api.TrainingConfig; import org.deeplearning4j.nn.conf.CacheMode; -import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.misc.DummyConfig; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.layers.wrapper.BaseWrapperLayer; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -import org.deeplearning4j.optimize.api.ConvexOptimizer; -import org.deeplearning4j.optimize.api.TrainingListener; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.util.OneTimeLogger; - -import java.util.Collection; -import java.util.Map; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.OneTimeLogger; /** * For purposes of transfer learning diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/FrozenLayerWithBackprop.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/FrozenLayerWithBackprop.java index 58d137d3f..7fe55dd0b 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/FrozenLayerWithBackprop.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/FrozenLayerWithBackprop.java @@ -18,29 +18,13 @@ package org.deeplearning4j.nn.layers; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.nn.api.Layer; -import org.deeplearning4j.nn.api.MaskState; -import org.deeplearning4j.nn.api.TrainingConfig; -import org.deeplearning4j.nn.conf.CacheMode; -import org.deeplearning4j.nn.conf.NeuralNetConfiguration; -import org.deeplearning4j.nn.conf.layers.BaseLayer; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.layers.wrapper.BaseWrapperLayer; -import org.deeplearning4j.nn.params.DefaultParamInitializer; -import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -import org.deeplearning4j.optimize.api.ConvexOptimizer; -import org.deeplearning4j.optimize.api.TrainingListener; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.learning.config.Sgd; -import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.util.OneTimeLogger; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.OneTimeLogger; /** * Frozen layer freezes parameters of the layer it wraps, but allows the backpropagation to continue. diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/LossLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/LossLayer.java index ab9d23f28..43d59256e 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/LossLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/LossLayer.java @@ -18,7 +18,6 @@ package org.deeplearning4j.nn.layers; import org.deeplearning4j.eval.Evaluation; -import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.layers.IOutputLayer; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.gradient.DefaultGradient; @@ -30,7 +29,7 @@ import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.util.FeatureUtil; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/RepeatVector.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/RepeatVector.java index 4786bf2af..fd9187cef 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/RepeatVector.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/RepeatVector.java @@ -18,22 +18,17 @@ package org.deeplearning4j.nn.layers; import org.deeplearning4j.exception.DL4JInvalidInputException; -import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.conf.CacheMode; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.RNNFormat; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; -import org.deeplearning4j.nn.layers.convolution.upsampling.Upsampling2D; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.CustomOp; -import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Cnn3DLossLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Cnn3DLossLayer.java index f9d2abfca..212161a9e 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Cnn3DLossLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Cnn3DLossLayer.java @@ -33,10 +33,9 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; -import org.nd4j.linalg.util.ArrayUtil; import java.util.Arrays; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/CnnLossLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/CnnLossLayer.java index ff60dc322..06c3b2375 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/CnnLossLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/CnnLossLayer.java @@ -28,16 +28,15 @@ import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.layers.BaseLayer; import org.deeplearning4j.util.ConvolutionUtils; -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.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; -import org.nd4j.linalg.util.ArrayUtil; import java.util.Arrays; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Convolution1DLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Convolution1DLayer.java index ee3981e78..95409936b 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Convolution1DLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Convolution1DLayer.java @@ -25,9 +25,8 @@ import org.deeplearning4j.nn.conf.layers.Convolution1D; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.params.ConvolutionParamInitializer; -import org.deeplearning4j.util.Convolution1DUtils; import org.deeplearning4j.util.ConvolutionUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; @@ -38,7 +37,7 @@ import org.nd4j.linalg.api.ops.impl.layers.convolution.config.PaddingMode; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.factory.Broadcast; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Convolution3DLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Convolution3DLayer.java index 143f011ec..a3726ba36 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Convolution3DLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Convolution3DLayer.java @@ -32,7 +32,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.CustomOp; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionHelper.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionHelper.java index c54812fbc..7d26f0c06 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionHelper.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionHelper.java @@ -26,7 +26,7 @@ import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.layers.LayerHelper; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; /** diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayer.java index 2b8a5148b..b8b0c13a9 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayer.java @@ -40,10 +40,10 @@ import org.nd4j.linalg.convolution.Convolution; import org.nd4j.linalg.exception.ND4JArraySizeException; import org.nd4j.linalg.exception.ND4JOpProfilerException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; -import org.nd4j.util.OneTimeLogger; +import org.nd4j.common.util.OneTimeLogger; import java.util.Arrays; @@ -74,7 +74,7 @@ public class ConvolutionLayer extends BaseLayer diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/DL4JSameDiffMemoryMgr.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/DL4JSameDiffMemoryMgr.java index c727f73c4..1e9b0d9b4 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/DL4JSameDiffMemoryMgr.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/DL4JSameDiffMemoryMgr.java @@ -1,7 +1,7 @@ package org.deeplearning4j.nn.layers.samediff; import org.nd4j.autodiff.samediff.internal.memory.AbstractMemoryMgr; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.memory.conf.WorkspaceConfiguration; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffGraphVertex.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffGraphVertex.java index bcca695df..7fc7af03f 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffGraphVertex.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffGraphVertex.java @@ -35,14 +35,14 @@ import org.nd4j.autodiff.samediff.array.SingleThreadArrayHolder; import org.nd4j.autodiff.samediff.internal.InferenceSession; import org.nd4j.autodiff.samediff.internal.SessionMemMgr; import org.nd4j.autodiff.util.SameDiffUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.memory.conf.WorkspaceConfiguration; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.layers.ExternalErrorsFunction; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffLayer.java index ed355fdaf..948837166 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffLayer.java @@ -30,17 +30,17 @@ import org.nd4j.autodiff.samediff.array.SingleThreadArrayHolder; import org.nd4j.autodiff.samediff.internal.InferenceSession; import org.nd4j.autodiff.samediff.internal.SessionMemMgr; import org.nd4j.autodiff.util.SameDiffUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.memory.conf.WorkspaceConfiguration; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.layers.ExternalErrorsFunction; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffOutputLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffOutputLayer.java index 184c0ea16..2b28fe952 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffOutputLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/samediff/SameDiffOutputLayer.java @@ -32,16 +32,15 @@ import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.array.SingleThreadArrayHolder; import org.nd4j.autodiff.samediff.internal.InferenceSession; import org.nd4j.autodiff.samediff.internal.SessionMemMgr; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.memory.conf.WorkspaceConfiguration; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.impl.layers.ExternalErrorsFunction; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/training/CenterLossOutputLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/training/CenterLossOutputLayer.java index df6977981..b251217bd 100755 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/training/CenterLossOutputLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/training/CenterLossOutputLayer.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/util/MaskLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/util/MaskLayer.java index 5436bc2b1..98130a04f 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/util/MaskLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/util/MaskLayer.java @@ -24,7 +24,7 @@ import org.deeplearning4j.nn.layers.AbstractLayer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Broadcast; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.nn.workspace.ArrayType; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/variational/VariationalAutoencoder.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/variational/VariationalAutoencoder.java index 407619f66..aed077522 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/variational/VariationalAutoencoder.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/variational/VariationalAutoencoder.java @@ -46,7 +46,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.regularization.Regularization; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/wrapper/BaseWrapperLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/wrapper/BaseWrapperLayer.java index edb30eb33..35d888818 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/wrapper/BaseWrapperLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/wrapper/BaseWrapperLayer.java @@ -29,7 +29,7 @@ import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.optimize.api.ConvexOptimizer; import org.deeplearning4j.optimize.api.TrainingListener; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collection; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java index 5cc536810..b1ff4974c 100755 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java @@ -56,7 +56,7 @@ import org.deeplearning4j.util.ModelSerializer; import org.deeplearning4j.util.NetworkUtils; import org.deeplearning4j.util.OutputLayerUtil; import org.nd4j.adapters.OutputAdapter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.classification.Evaluation; import org.nd4j.evaluation.classification.ROC; @@ -85,13 +85,13 @@ import org.nd4j.linalg.heartbeat.reports.Task; import org.nd4j.linalg.heartbeat.utils.EnvironmentUtils; import org.nd4j.linalg.heartbeat.utils.TaskUtils; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; import org.nd4j.linalg.schedule.ISchedule; import org.nd4j.linalg.util.FeatureUtil; import org.nd4j.linalg.workspace.ND4JWorkspaceException; import org.nd4j.linalg.workspace.WorkspaceUtils; -import org.nd4j.util.OneTimeLogger; +import org.nd4j.common.util.OneTimeLogger; import java.io.*; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/params/SameDiffParamInitializer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/params/SameDiffParamInitializer.java index ca9c10c80..9c96b8f87 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/params/SameDiffParamInitializer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/params/SameDiffParamInitializer.java @@ -23,10 +23,8 @@ import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.layers.Layer; import org.deeplearning4j.nn.conf.layers.samediff.AbstractSameDiffLayer; import org.deeplearning4j.nn.conf.layers.samediff.SameDiffVertex; -import org.deeplearning4j.nn.layers.samediff.SameDiffGraphVertex; -import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Arrays; import java.util.LinkedHashMap; @@ -34,7 +32,6 @@ import java.util.List; import java.util.Map; import static org.nd4j.linalg.indexing.NDArrayIndex.interval; -import static org.nd4j.linalg.indexing.NDArrayIndex.point; @Slf4j public class SameDiffParamInitializer implements ParamInitializer { diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.java index a5d8ef22a..78a844ba5 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.java @@ -40,7 +40,7 @@ import org.nd4j.linalg.learning.regularization.L1Regularization; import org.nd4j.linalg.learning.regularization.L2Regularization; import org.nd4j.linalg.learning.regularization.Regularization; import org.nd4j.linalg.learning.regularization.WeightDecay; -import org.nd4j.linalg.primitives.Optional; +import org.nd4j.common.primitives.Optional; import org.nd4j.shade.jackson.annotation.JsonInclude; import org.nd4j.shade.jackson.annotation.JsonTypeInfo; import org.nd4j.shade.jackson.core.JsonProcessingException; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/TransferLearning.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/TransferLearning.java index 673010af2..6b3050db2 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/TransferLearning.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/TransferLearning.java @@ -34,12 +34,12 @@ import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.IWeightInit; import org.deeplearning4j.nn.weights.WeightInit; import org.deeplearning4j.nn.weights.WeightInitDistribution; -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.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/updater/BaseMultiLayerUpdater.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/updater/BaseMultiLayerUpdater.java index c991f41c9..6fc0378a2 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/updater/BaseMultiLayerUpdater.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/updater/BaseMultiLayerUpdater.java @@ -23,7 +23,7 @@ import org.deeplearning4j.nn.api.Updater; import org.deeplearning4j.nn.conf.GradientNormalization; import org.deeplearning4j.nn.gradient.DefaultGradient; import org.deeplearning4j.nn.gradient.Gradient; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.CustomOp; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/WeightInitUtil.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/WeightInitUtil.java index 17034d408..ab2692656 100755 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/WeightInitUtil.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/WeightInitUtil.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ops.random.impl.TruncatedNormalDistribution; import org.nd4j.linalg.api.rng.distribution.Distribution; import org.nd4j.linalg.api.rng.distribution.impl.OrthogonalDistribution; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/embeddings/ArrayEmbeddingInitializer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/embeddings/ArrayEmbeddingInitializer.java index b0f241275..6b32adb8d 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/embeddings/ArrayEmbeddingInitializer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/embeddings/ArrayEmbeddingInitializer.java @@ -18,7 +18,7 @@ package org.deeplearning4j.nn.weights.embeddings; import lombok.EqualsAndHashCode; import lombok.NonNull; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; /** diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/embeddings/WeightInitEmbedding.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/embeddings/WeightInitEmbedding.java index c758ead16..fbca5a8fa 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/embeddings/WeightInitEmbedding.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/weights/embeddings/WeightInitEmbedding.java @@ -19,7 +19,7 @@ package org.deeplearning4j.nn.weights.embeddings; import lombok.EqualsAndHashCode; import lombok.NonNull; import org.deeplearning4j.nn.weights.IWeightInit; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.shade.jackson.annotation.JsonIgnoreProperties; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/api/ConvexOptimizer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/api/ConvexOptimizer.java index ba19839a4..3eb28c939 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/api/ConvexOptimizer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/api/ConvexOptimizer.java @@ -24,7 +24,7 @@ import org.deeplearning4j.nn.updater.graph.ComputationGraphUpdater; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; import org.deeplearning4j.optimize.solvers.accumulation.GradientsAccumulator; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/CheckpointListener.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/CheckpointListener.java index b67961985..a61f37e14 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/CheckpointListener.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/CheckpointListener.java @@ -24,10 +24,8 @@ import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.optimize.api.BaseTrainingListener; -import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.util.ModelSerializer; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.api.ndarray.INDArray; +import org.nd4j.common.base.Preconditions; import java.io.*; import java.nio.charset.Charset; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/CollectScoresIterationListener.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/CollectScoresIterationListener.java index f6c2e269c..97ac32d8b 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/CollectScoresIterationListener.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/CollectScoresIterationListener.java @@ -18,7 +18,6 @@ package org.deeplearning4j.optimize.listeners; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.optimize.api.BaseTrainingListener; -import org.nd4j.linalg.primitives.Pair; import java.io.File; import java.io.FileOutputStream; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/BaseOptimizer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/BaseOptimizer.java index 0e2490dd7..8c8954dfa 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/BaseOptimizer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/BaseOptimizer.java @@ -39,7 +39,7 @@ import org.deeplearning4j.optimize.stepfunctions.NegativeGradientStepFunction; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/LBFGS.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/LBFGS.java index 53fb5c10d..a5cfd2a5e 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/LBFGS.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/LBFGS.java @@ -23,7 +23,7 @@ import org.deeplearning4j.optimize.api.StepFunction; import org.deeplearning4j.optimize.api.TrainingListener; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collection; import java.util.Iterator; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/StochasticGradientDescent.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/StochasticGradientDescent.java index 8522e5cc1..4fd50c78b 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/StochasticGradientDescent.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/StochasticGradientDescent.java @@ -28,7 +28,7 @@ import org.deeplearning4j.optimize.api.TrainingListener; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/EncodedGradientsAccumulator.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/EncodedGradientsAccumulator.java index 7448581c5..f63af7759 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/EncodedGradientsAccumulator.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/EncodedGradientsAccumulator.java @@ -28,8 +28,7 @@ import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgori import org.deeplearning4j.optimize.solvers.accumulation.encoding.residual.ResidualClippingPostProcessor; import org.deeplearning4j.optimize.solvers.accumulation.encoding.threshold.AdaptiveThresholdAlgorithm; import org.deeplearning4j.util.ThreadUtils; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.api.buffer.DataBuffer; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.memory.conf.WorkspaceConfiguration; import org.nd4j.linalg.api.memory.enums.*; @@ -41,8 +40,6 @@ import org.nd4j.linalg.util.AtomicThrowable; import java.util.ArrayList; import java.util.List; -import java.util.NoSuchElementException; -import java.util.Queue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/IndexedTail.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/IndexedTail.java index c04440cd9..63fcd293f 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/IndexedTail.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/IndexedTail.java @@ -21,14 +21,13 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; import lombok.var; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.api.buffer.DataBuffer; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.compression.ThresholdCompression; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.AtomicBoolean; +import org.nd4j.common.primitives.AtomicBoolean; import java.util.ArrayList; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/SmartFancyBlockingQueue.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/SmartFancyBlockingQueue.java index c279b43ed..813d1c2f4 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/SmartFancyBlockingQueue.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/SmartFancyBlockingQueue.java @@ -21,17 +21,15 @@ import EDU.oswego.cs.dl.util.concurrent.ReaderPreferenceReadWriteLock; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.compression.ThresholdCompression; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.AtomicBoolean; +import org.nd4j.common.primitives.AtomicBoolean; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.locks.ReentrantReadWriteLock; /** * This class provides additional functionality to FancyBlockingQueue: it tracks memory use of stored compressed INDArrays, and if their size becomes too big, it: diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/residual/ResidualClippingPostProcessor.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/residual/ResidualClippingPostProcessor.java index 13e2e9da9..24387e12f 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/residual/ResidualClippingPostProcessor.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/residual/ResidualClippingPostProcessor.java @@ -18,7 +18,7 @@ package org.deeplearning4j.optimize.solvers.accumulation.encoding.residual; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ResidualPostProcessor; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.indexing.BooleanIndexing; import org.nd4j.linalg.indexing.conditions.Conditions; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/AdaptiveThresholdAlgorithm.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/AdaptiveThresholdAlgorithm.java index 7dd56815c..6cdacee11 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/AdaptiveThresholdAlgorithm.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/AdaptiveThresholdAlgorithm.java @@ -21,7 +21,7 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithm; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithmReducer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; /** diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/FixedThresholdAlgorithm.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/FixedThresholdAlgorithm.java index bae5a71cd..96e3f7b6f 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/FixedThresholdAlgorithm.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/FixedThresholdAlgorithm.java @@ -20,7 +20,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithm; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithmReducer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; /** diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/TargetSparsityThresholdAlgorithm.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/TargetSparsityThresholdAlgorithm.java index e4ef8c255..a539cc831 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/TargetSparsityThresholdAlgorithm.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/solvers/accumulation/encoding/threshold/TargetSparsityThresholdAlgorithm.java @@ -21,7 +21,7 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithm; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithmReducer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; /** diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/CapsuleUtils.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/CapsuleUtils.java index 66d732907..b0d86d393 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/CapsuleUtils.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/CapsuleUtils.java @@ -18,7 +18,6 @@ package org.deeplearning4j.util; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.linalg.util.ArrayUtil; /** * Utilities for CapsNet Layers diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Convolution1DUtils.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Convolution1DUtils.java index 165483e1c..8eccb7129 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Convolution1DUtils.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Convolution1DUtils.java @@ -17,20 +17,12 @@ package org.deeplearning4j.util; -import lombok.val; import org.deeplearning4j.exception.DL4JInvalidConfigException; import org.deeplearning4j.exception.DL4JInvalidInputException; import org.deeplearning4j.nn.conf.ConvolutionMode; -import org.deeplearning4j.nn.conf.NeuralNetConfiguration; -import org.deeplearning4j.nn.conf.inputs.InputType; -import org.deeplearning4j.nn.workspace.ArrayType; -import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -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.broadcast.BroadcastCopyOp; -import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.exception.ND4JArraySizeException; -import org.nd4j.linalg.factory.Nd4j; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Convolution3DUtils.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Convolution3DUtils.java index 7d844db27..82c59dff4 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Convolution3DUtils.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Convolution3DUtils.java @@ -21,13 +21,8 @@ import lombok.val; import org.deeplearning4j.exception.DL4JInvalidConfigException; import org.deeplearning4j.exception.DL4JInvalidInputException; import org.deeplearning4j.nn.conf.ConvolutionMode; -import org.deeplearning4j.nn.conf.NeuralNetConfiguration; -import org.deeplearning4j.nn.conf.inputs.InputType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.impl.broadcast.BroadcastCopyOp; -import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ConvolutionUtils.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ConvolutionUtils.java index 359b1913b..11252bf19 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ConvolutionUtils.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ConvolutionUtils.java @@ -17,7 +17,6 @@ package org.deeplearning4j.util; -import it.unimi.dsi.fastutil.ints.IntArrayList; import lombok.NonNull; import lombok.val; import org.deeplearning4j.exception.DL4JInvalidConfigException; @@ -29,17 +28,15 @@ import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.conf.layers.Convolution3D; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.api.ops.Op; import org.nd4j.linalg.api.ops.impl.broadcast.BroadcastCopyOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.MaxPooling2D; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Pooling2DConfig; import org.nd4j.linalg.api.ops.impl.transforms.custom.Assign; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.exception.ND4JArraySizeException; -import org.nd4j.linalg.factory.NDArrayFactory; import org.nd4j.linalg.factory.Nd4j; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/CrashReportingUtil.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/CrashReportingUtil.java index 135dbefaf..dc7bad9dc 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/CrashReportingUtil.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/CrashReportingUtil.java @@ -40,7 +40,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.bytedeco.javacpp.Pointer; -import org.deeplearning4j.config.DL4JSystemProperties; +import org.deeplearning4j.common.config.DL4JSystemProperties; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.conf.BackpropType; @@ -58,8 +58,8 @@ import org.deeplearning4j.optimize.solvers.BaseOptimizer; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.nativeblas.NativeOps; import org.nd4j.nativeblas.NativeOpsHolder; import oshi.SystemInfo; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/DL4JModelValidator.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/DL4JModelValidator.java index 8567dc379..5a36bd4a2 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/DL4JModelValidator.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/DL4JModelValidator.java @@ -7,8 +7,8 @@ import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.nd4j.validation.Nd4jCommonValidator; -import org.nd4j.validation.ValidationResult; +import org.nd4j.common.validation.Nd4jCommonValidator; +import org.nd4j.common.validation.ValidationResult; import java.io.BufferedReader; import java.io.File; 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 30dbe7b4b..8fa2225e9 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 @@ -17,12 +17,12 @@ package org.deeplearning4j.util; import org.apache.commons.io.input.CloseShieldInputStream; +import org.deeplearning4j.common.util.DL4JFileUtils; import org.nd4j.shade.guava.io.Files; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.CloseShieldOutputStream; -import org.deeplearning4j.config.DL4JSystemProperties; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.api.Updater; @@ -30,8 +30,7 @@ import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.deeplearning4j.nn.updater.graph.ComputationGraphUpdater; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization; @@ -39,7 +38,7 @@ import org.nd4j.linalg.dataset.api.preprocessor.Normalizer; import org.nd4j.linalg.dataset.api.preprocessor.serializer.NormalizerSerializer; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.heartbeat.reports.Task; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.*; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/NetworkUtils.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/NetworkUtils.java index 7c24a264b..0010cb017 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/NetworkUtils.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/NetworkUtils.java @@ -31,13 +31,11 @@ import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.updater.MultiLayerUpdater; import org.deeplearning4j.nn.updater.UpdaterBlock; import org.deeplearning4j.nn.updater.graph.ComputationGraphUpdater; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.activations.IActivation; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.learning.config.IUpdater; -import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.schedule.ISchedule; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/TimeSeriesUtils.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/TimeSeriesUtils.java index 2a58387fe..0a1df4019 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/TimeSeriesUtils.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/TimeSeriesUtils.java @@ -24,7 +24,7 @@ import org.deeplearning4j.nn.conf.layers.recurrent.Bidirectional; import org.deeplearning4j.nn.conf.layers.recurrent.LastTimeStep; import org.deeplearning4j.nn.conf.layers.recurrent.TimeDistributed; import org.deeplearning4j.nn.conf.layers.util.MaskZeroLayer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.exception.ND4JArraySizeException; @@ -33,7 +33,7 @@ import org.nd4j.linalg.indexing.BooleanIndexing; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.indexing.conditions.Conditions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.deeplearning4j.nn.workspace.ArrayType; import org.deeplearning4j.nn.workspace.LayerWorkspaceMgr; diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ValidationUtils.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ValidationUtils.java index fef26290c..416593654 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ValidationUtils.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ValidationUtils.java @@ -16,8 +16,7 @@ package org.deeplearning4j.util; -import java.util.Arrays; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; /** * Validation methods for array sizes/shapes and value non-negativeness diff --git a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/main/java/org/deeplearning4j/remote/DL4jServlet.java b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/main/java/org/deeplearning4j/remote/DL4jServlet.java index c93edf210..66eaedb4c 100644 --- a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/main/java/org/deeplearning4j/remote/DL4jServlet.java +++ b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/main/java/org/deeplearning4j/remote/DL4jServlet.java @@ -23,7 +23,7 @@ import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.parallelism.ParallelInference; import org.nd4j.adapters.InferenceAdapter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.dataset.MultiDataSet; import org.nd4j.remote.clients.serde.BinaryDeserializer; import org.nd4j.remote.clients.serde.BinarySerializer; diff --git a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/main/java/org/deeplearning4j/remote/JsonModelServer.java b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/main/java/org/deeplearning4j/remote/JsonModelServer.java index f85e36f74..1f0b93508 100644 --- a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/main/java/org/deeplearning4j/remote/JsonModelServer.java +++ b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/main/java/org/deeplearning4j/remote/JsonModelServer.java @@ -29,7 +29,7 @@ import org.nd4j.adapters.InferenceAdapter; import org.nd4j.adapters.InputAdapter; import org.nd4j.adapters.OutputAdapter; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.MultiDataSet; import org.nd4j.linalg.factory.Nd4j; diff --git a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/test/java/org/deeplearning4j/remote/AssertTestsExtendBaseClass.java b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/test/java/org/deeplearning4j/remote/AssertTestsExtendBaseClass.java index 1d8c3d578..6786a8249 100644 --- a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/test/java/org/deeplearning4j/remote/AssertTestsExtendBaseClass.java +++ b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/test/java/org/deeplearning4j/remote/AssertTestsExtendBaseClass.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.*; import org.deeplearning4j.BaseDL4JTest; -import org.nd4j.AbstractAssertTestsClass; +import org.nd4j.common.tests.AbstractAssertTestsClass; /** * This class checks that all test classes (i.e., anything with one or more methods annotated with @Test) diff --git a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/test/java/org/deeplearning4j/remote/BinaryModelServerTest.java b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/test/java/org/deeplearning4j/remote/BinaryModelServerTest.java index c0652d4e6..eae2ca4f1 100644 --- a/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/test/java/org/deeplearning4j/remote/BinaryModelServerTest.java +++ b/deeplearning4j/deeplearning4j-remote/deeplearning4j-json-server/src/test/java/org/deeplearning4j/remote/BinaryModelServerTest.java @@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.datavec.image.loader.Java2DNativeImageLoader; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.remote.helpers.ImageConversionUtils; import org.deeplearning4j.util.ModelSerializer; @@ -13,20 +12,17 @@ import org.junit.Test; import org.nd4j.adapters.InferenceAdapter; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.MultiDataSet; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.remote.clients.JsonRemoteInference; import org.nd4j.remote.clients.serde.BinaryDeserializer; import org.nd4j.remote.clients.serde.BinarySerializer; -import org.nd4j.remote.clients.serde.JsonDeserializer; -import org.nd4j.remote.clients.serde.JsonSerializer; import org.nd4j.remote.clients.serde.impl.IntegerSerde; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import org.nd4j.shade.jackson.databind.ObjectMapper; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.*; -import java.nio.Buffer; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/ParallelInference.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/ParallelInference.java index d5afd549b..9f5af35f0 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/ParallelInference.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/ParallelInference.java @@ -19,7 +19,6 @@ package org.deeplearning4j.parallelism; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.api.ModelAdapter; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; @@ -36,7 +35,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; @@ -44,7 +43,6 @@ import java.util.Observer; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/ParallelWrapper.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/ParallelWrapper.java index 0b4f29de2..50bd6f34e 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/ParallelWrapper.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/ParallelWrapper.java @@ -18,8 +18,8 @@ package org.deeplearning4j.parallelism; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.listener.RoutingIterationListener; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.listener.RoutingIterationListener; import org.nd4j.linalg.dataset.AsyncDataSetIterator;; import org.nd4j.linalg.dataset.AsyncMultiDataSetIterator; import org.deeplearning4j.datasets.iterator.DummyBlockDataSetIterator; @@ -43,15 +43,13 @@ import org.deeplearning4j.parallelism.factory.DefaultTrainerContext; import org.deeplearning4j.parallelism.factory.SymmetricTrainerContext; import org.deeplearning4j.parallelism.factory.TrainerContext; import org.deeplearning4j.parallelism.trainer.Trainer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.dataset.api.DataSet; -import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.Supplier; +import org.nd4j.common.function.Supplier; import java.util.*; import java.util.concurrent.Executors; diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/InferenceObservable.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/InferenceObservable.java index 466ffd00c..02095b8ee 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/InferenceObservable.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/InferenceObservable.java @@ -17,7 +17,7 @@ package org.deeplearning4j.parallelism.inference; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.List; import java.util.Observer; diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/observers/BasicInferenceObservable.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/observers/BasicInferenceObservable.java index 432e22695..5223d4528 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/observers/BasicInferenceObservable.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/observers/BasicInferenceObservable.java @@ -22,7 +22,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.parallelism.inference.InferenceObservable; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collections; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/observers/BatchedInferenceObservable.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/observers/BatchedInferenceObservable.java index 2ede58bff..29512bbbb 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/observers/BatchedInferenceObservable.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/inference/observers/BatchedInferenceObservable.java @@ -21,11 +21,9 @@ import lombok.val; import org.deeplearning4j.parallelism.inference.InferenceObservable; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSetUtil; -import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/main/ParallelWrapperMain.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/main/ParallelWrapperMain.java index dbb6182d1..360cf44c8 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/main/ParallelWrapperMain.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/main/ParallelWrapperMain.java @@ -21,12 +21,12 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.impl.RemoteUIStatsStorageRouter; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.impl.RemoteUIStatsStorageRouter; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.parallelism.ParallelWrapper; -import org.deeplearning4j.util.ModelGuesser; +import org.deeplearning4j.core.util.ModelGuesser; import org.deeplearning4j.util.ModelSerializer; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; @@ -135,7 +135,7 @@ public class ParallelWrapperMain { StatsStorageRouter remoteUIRouter = new RemoteUIStatsStorageRouter("http://" + uiUrl); TrainingListener l; try { - l = (TrainingListener) Class.forName("org.deeplearning4j.ui.stats.StatsListener").getConstructor(StatsStorageRouter.class) + l = (TrainingListener) Class.forName("org.deeplearning4j.ui.model.stats.StatsListener").getConstructor(StatsStorageRouter.class) .newInstance(new Object[]{null}); } catch (ClassNotFoundException e){ throw new IllegalStateException("deeplearning4j-ui module must be on the classpath to use ParallelWrapperMain with the UI", e); @@ -157,7 +157,7 @@ public class ParallelWrapperMain { remoteUIRouter = new RemoteUIStatsStorageRouter("http://" + uiUrl); TrainingListener l; try { - l = (TrainingListener) Class.forName("org.deeplearning4j.ui.stats.StatsListener").getConstructor(StatsStorageRouter.class) + l = (TrainingListener) Class.forName("org.deeplearning4j.ui.model.stats.StatsListener").getConstructor(StatsStorageRouter.class) .newInstance(new Object[]{null}); } catch (ClassNotFoundException e){ throw new IllegalStateException("deeplearning4j-ui module must be on the classpath to use ParallelWrapperMain with the UI", e); diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/trainer/DefaultTrainer.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/trainer/DefaultTrainer.java index 62a894030..e51ec26e4 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/trainer/DefaultTrainer.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/main/java/org/deeplearning4j/parallelism/trainer/DefaultTrainer.java @@ -18,8 +18,8 @@ package org.deeplearning4j.parallelism.trainer; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.listener.RoutingIterationListener; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.listener.RoutingIterationListener; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.api.Updater; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/ParallelInferenceTest.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/ParallelInferenceTest.java index b149c102f..33f89ac1e 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/ParallelInferenceTest.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/ParallelInferenceTest.java @@ -31,7 +31,6 @@ import org.deeplearning4j.nn.graph.ComputationGraph; import org.junit.*; import org.junit.rules.Timeout; import org.nd4j.linalg.activations.Activation; -import org.nd4j.linalg.io.ClassPathResource; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; import org.deeplearning4j.eval.Evaluation; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; @@ -44,9 +43,9 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; -import org.nd4j.resources.Resources; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; +import org.nd4j.common.resources.Resources; import java.io.File; import java.lang.reflect.Field; diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/TestListeners.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/TestListeners.java index 9593a0799..12b3d45b7 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/TestListeners.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/TestListeners.java @@ -17,9 +17,9 @@ package org.deeplearning4j.parallelism; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.listener.RoutingIterationListener; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.listener.RoutingIterationListener; import org.deeplearning4j.datasets.iterator.ExistingDataSetIterator; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; @@ -30,8 +30,8 @@ import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.optimize.api.BaseTrainingListener; import org.deeplearning4j.optimize.api.TrainingListener; -import org.deeplearning4j.ui.stats.StatsListener; -import org.deeplearning4j.ui.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; import org.junit.Test; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/TestParallelEarlyStoppingUI.java b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/TestParallelEarlyStoppingUI.java index 160d4df58..e26da4213 100644 --- a/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/TestParallelEarlyStoppingUI.java +++ b/deeplearning4j/deeplearning4j-scaleout/deeplearning4j-scaleout-parallelwrapper/src/test/java/org/deeplearning4j/parallelism/TestParallelEarlyStoppingUI.java @@ -17,7 +17,7 @@ package org.deeplearning4j.parallelism; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.api.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorage; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.earlystopping.EarlyStoppingConfiguration; import org.deeplearning4j.earlystopping.EarlyStoppingModelSaver; @@ -34,8 +34,8 @@ import org.deeplearning4j.nn.conf.layers.OutputLayer; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; import org.deeplearning4j.ui.api.UIServer; -import org.deeplearning4j.ui.stats.StatsListener; -import org.deeplearning4j.ui.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; import org.junit.Ignore; import org.junit.Test; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/SparkSequenceVectors.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/SparkSequenceVectors.java index b70c9f733..633698597 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/SparkSequenceVectors.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/SparkSequenceVectors.java @@ -40,8 +40,8 @@ import org.deeplearning4j.spark.models.sequencevectors.functions.*; import org.deeplearning4j.spark.models.sequencevectors.learning.SparkElementsLearningAlgorithm; import org.deeplearning4j.spark.models.sequencevectors.learning.SparkSequenceLearningAlgorithm; import org.deeplearning4j.spark.models.sequencevectors.primitives.ExtraCounter; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.Pair; import org.nd4j.parameterserver.distributed.VoidParameterServer; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.enums.FaultToleranceStrategy; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/export/impl/VocabCacheExporter.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/export/impl/VocabCacheExporter.java index a8073f267..0d649f9af 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/export/impl/VocabCacheExporter.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/export/impl/VocabCacheExporter.java @@ -29,7 +29,7 @@ import org.deeplearning4j.spark.models.sequencevectors.export.ExportContainer; import org.deeplearning4j.spark.models.sequencevectors.export.SparkModelExporter; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/CountFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/CountFunction.java index 2b0452f66..15eaa7162 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/CountFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/CountFunction.java @@ -25,8 +25,8 @@ import org.deeplearning4j.models.embeddings.loader.VectorsConfiguration; import org.deeplearning4j.models.sequencevectors.sequence.Sequence; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.deeplearning4j.spark.models.sequencevectors.learning.SparkElementsLearningAlgorithm; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.Pair; import org.nd4j.parameterserver.distributed.VoidParameterServer; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.messages.TrainingMessage; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/ElementsFrequenciesAccumulator.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/ElementsFrequenciesAccumulator.java index ed14a0068..ec68345f5 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/ElementsFrequenciesAccumulator.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/ElementsFrequenciesAccumulator.java @@ -17,7 +17,7 @@ package org.deeplearning4j.spark.models.sequencevectors.functions; import org.apache.spark.AccumulatorParam; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; /** * Accumulator for elements count diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/ExtraCountFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/ExtraCountFunction.java index 8fbadbb0c..28e8e9da9 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/ExtraCountFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/functions/ExtraCountFunction.java @@ -22,7 +22,7 @@ import org.apache.spark.api.java.function.Function; import org.deeplearning4j.models.sequencevectors.sequence.Sequence; import org.deeplearning4j.models.sequencevectors.sequence.SequenceElement; import org.deeplearning4j.spark.models.sequencevectors.primitives.ExtraCounter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * This accumulator function does count individual elements, using provided Accumulator diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/primitives/ExtraCounter.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/primitives/ExtraCounter.java index 0aa6104bf..4b238b95f 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/primitives/ExtraCounter.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/main/java/org/deeplearning4j/spark/models/sequencevectors/primitives/ExtraCounter.java @@ -18,7 +18,7 @@ package org.deeplearning4j.spark.models.sequencevectors.primitives; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import org.nd4j.parameterserver.distributed.util.NetworkInformation; import java.net.InterfaceAddress; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/test/java/org/deeplearning4j/spark/models/sequencevectors/SparkSequenceVectorsTest.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/test/java/org/deeplearning4j/spark/models/sequencevectors/SparkSequenceVectorsTest.java index 15e449e94..0a6e5bd73 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/test/java/org/deeplearning4j/spark/models/sequencevectors/SparkSequenceVectorsTest.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp-java8/src/test/java/org/deeplearning4j/spark/models/sequencevectors/SparkSequenceVectorsTest.java @@ -31,7 +31,7 @@ import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFac import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/Glove.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/Glove.java index 3dde1ae9b..81de8effb 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/Glove.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/Glove.java @@ -34,10 +34,9 @@ import org.deeplearning4j.text.tokenization.tokenizerfactory.DefaultTokenizerFac import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.legacy.AdaGrad; -import org.nd4j.linalg.primitives.CounterMap; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.CounterMap; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.Tuple2; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/GloveParam.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/GloveParam.java index f97f3612c..d66593322 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/GloveParam.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/GloveParam.java @@ -18,7 +18,7 @@ package org.deeplearning4j.spark.models.embeddings.glove; import org.apache.spark.broadcast.Broadcast; import org.nd4j.linalg.api.rng.Random; -import org.nd4j.linalg.primitives.CounterMap; +import org.nd4j.common.primitives.CounterMap; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/GlovePerformer.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/GlovePerformer.java index 8e6b1d63e..bed7643c0 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/GlovePerformer.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/GlovePerformer.java @@ -19,7 +19,7 @@ package org.deeplearning4j.spark.models.embeddings.glove; import org.apache.spark.api.java.function.Function; import org.deeplearning4j.models.glove.GloveWeightLookupTable; import org.deeplearning4j.models.word2vec.VocabWord; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; /** diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/VocabWordPairs.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/VocabWordPairs.java index cd76c8930..7d6e09edb 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/VocabWordPairs.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/VocabWordPairs.java @@ -20,7 +20,7 @@ import org.apache.spark.api.java.function.Function; import org.apache.spark.broadcast.Broadcast; import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; /** * Convert string to vocab words diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/cooccurrences/CoOccurrenceCalculator.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/cooccurrences/CoOccurrenceCalculator.java index fdcfe3e57..077a9c3b0 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/cooccurrences/CoOccurrenceCalculator.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/cooccurrences/CoOccurrenceCalculator.java @@ -21,8 +21,8 @@ import org.apache.spark.broadcast.Broadcast; import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.CounterMap; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.CounterMap; +import org.nd4j.common.primitives.Pair; import java.util.List; import java.util.concurrent.atomic.AtomicLong; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/cooccurrences/CoOccurrenceCounts.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/cooccurrences/CoOccurrenceCounts.java index 218684827..d79706ea5 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/cooccurrences/CoOccurrenceCounts.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/glove/cooccurrences/CoOccurrenceCounts.java @@ -17,7 +17,7 @@ package org.deeplearning4j.spark.models.embeddings.glove.cooccurrences; import org.apache.spark.api.java.function.Function2; -import org.nd4j.linalg.primitives.CounterMap; +import org.nd4j.common.primitives.CounterMap; /** diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/FirstIterationFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/FirstIterationFunction.java index 20035688b..e13223749 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/FirstIterationFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/FirstIterationFunction.java @@ -22,7 +22,7 @@ import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import scala.Tuple2; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/MapToPairFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/MapToPairFunction.java index af8091e9c..8b3b679f0 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/MapToPairFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/MapToPairFunction.java @@ -19,7 +19,7 @@ package org.deeplearning4j.spark.models.embeddings.word2vec; import org.apache.spark.api.java.function.Function; import org.deeplearning4j.models.word2vec.VocabWord; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/SecondIterationFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/SecondIterationFunction.java index e540c23f0..4b3a7ee8a 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/SecondIterationFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/SecondIterationFunction.java @@ -22,7 +22,7 @@ import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import scala.Tuple2; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/SentenceBatch.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/SentenceBatch.java index 78799b22b..f9ecbfc98 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/SentenceBatch.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/SentenceBatch.java @@ -21,7 +21,7 @@ import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.word2vec.VocabWord; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2Vec.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2Vec.java index d7ca516b2..627877eca 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2Vec.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2Vec.java @@ -38,7 +38,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.heartbeat.reports.Environment; import org.nd4j.linalg.heartbeat.reports.Event; import org.nd4j.linalg.heartbeat.utils.EnvironmentUtils; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecChange.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecChange.java index 16e41c21d..c197159b1 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecChange.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecChange.java @@ -19,7 +19,7 @@ package org.deeplearning4j.spark.models.embeddings.word2vec; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import java.io.Serializable; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecPerformer.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecPerformer.java index 10e2a3050..79fc7aba0 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecPerformer.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecPerformer.java @@ -22,17 +22,15 @@ import org.apache.spark.api.java.function.VoidFunction; import org.apache.spark.broadcast.Broadcast; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.word2vec.VocabWord; -import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.ByteArrayInputStream; import java.io.DataInputStream; -import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicLong; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecPerformerVoid.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecPerformerVoid.java index 0e346b622..47fc41722 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecPerformerVoid.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecPerformerVoid.java @@ -22,17 +22,15 @@ import org.apache.spark.api.java.function.VoidFunction; import org.apache.spark.broadcast.Broadcast; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.word2vec.VocabWord; -import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.ByteArrayInputStream; import java.io.DataInputStream; -import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicLong; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/accumulators/MaxPerPartitionAccumulator.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/accumulators/MaxPerPartitionAccumulator.java index 3593079e5..b090cc0b3 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/accumulators/MaxPerPartitionAccumulator.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/accumulators/MaxPerPartitionAccumulator.java @@ -17,7 +17,7 @@ package org.deeplearning4j.spark.text.accumulators; import org.apache.spark.AccumulatorParam; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; /** * @author jeffreytang diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/accumulators/WordFreqAccumulator.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/accumulators/WordFreqAccumulator.java index afb977d8a..70fd4c545 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/accumulators/WordFreqAccumulator.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/accumulators/WordFreqAccumulator.java @@ -17,7 +17,7 @@ package org.deeplearning4j.spark.text.accumulators; import org.apache.spark.AccumulatorParam; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; /** * @author jeffreytang diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/CountCumSum.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/CountCumSum.java index f09295503..8a04afc2d 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/CountCumSum.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/CountCumSum.java @@ -21,7 +21,7 @@ import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.broadcast.Broadcast; import org.deeplearning4j.spark.text.accumulators.MaxPerPartitionAccumulator; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import java.util.concurrent.atomic.AtomicLong; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/FoldBetweenPartitionFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/FoldBetweenPartitionFunction.java index 955502e95..14a10f443 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/FoldBetweenPartitionFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/FoldBetweenPartitionFunction.java @@ -18,7 +18,7 @@ package org.deeplearning4j.spark.text.functions; import org.apache.spark.api.java.function.Function2; import org.apache.spark.broadcast.Broadcast; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import java.util.ArrayList; import java.util.Iterator; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/FoldWithinPartitionFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/FoldWithinPartitionFunction.java index d8b02ad03..c2638ebd0 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/FoldWithinPartitionFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/FoldWithinPartitionFunction.java @@ -18,7 +18,7 @@ package org.deeplearning4j.spark.text.functions; import org.apache.spark.Accumulator; import org.apache.spark.api.java.function.Function2; -import org.nd4j.linalg.primitives.Counter; +import org.nd4j.common.primitives.Counter; import java.util.ArrayList; import java.util.Iterator; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/GetSentenceCountFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/GetSentenceCountFunction.java index d24bc884c..69f1f84e6 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/GetSentenceCountFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/GetSentenceCountFunction.java @@ -17,7 +17,7 @@ package org.deeplearning4j.spark.text.functions; import org.apache.spark.api.java.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.List; import java.util.concurrent.atomic.AtomicLong; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/TextPipeline.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/TextPipeline.java index ff6111dc5..534c65353 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/TextPipeline.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/TextPipeline.java @@ -26,9 +26,9 @@ import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.models.word2vec.wordstore.inmemory.AbstractCache; import org.deeplearning4j.spark.text.accumulators.WordFreqAccumulator; -import org.nd4j.linalg.primitives.AtomicDouble; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.AtomicDouble; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/UpdateWordFreqAccumulatorFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/UpdateWordFreqAccumulatorFunction.java index b8ef571ec..30decf5a0 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/UpdateWordFreqAccumulatorFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/UpdateWordFreqAccumulatorFunction.java @@ -19,8 +19,8 @@ package org.deeplearning4j.spark.text.functions; import org.apache.spark.Accumulator; import org.apache.spark.api.java.function.Function; import org.apache.spark.broadcast.Broadcast; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.Pair; import java.util.List; import java.util.concurrent.atomic.AtomicLong; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/WordsListToVocabWordsFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/WordsListToVocabWordsFunction.java index 8e9cb7f10..2fa3bd65d 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/WordsListToVocabWordsFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/main/java/org/deeplearning4j/spark/text/functions/WordsListToVocabWordsFunction.java @@ -20,7 +20,7 @@ import org.apache.spark.api.java.function.Function; import org.apache.spark.broadcast.Broadcast; import org.deeplearning4j.models.word2vec.VocabWord; import org.deeplearning4j.models.word2vec.wordstore.VocabCache; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/models/embeddings/glove/GloveTest.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/models/embeddings/glove/GloveTest.java index a171e0914..61ab27b54 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/models/embeddings/glove/GloveTest.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/models/embeddings/glove/GloveTest.java @@ -18,7 +18,7 @@ package org.deeplearning4j.spark.models.embeddings.glove; import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.function.Function; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; import org.deeplearning4j.models.embeddings.wordvectors.WordVectors; @@ -28,7 +28,7 @@ import org.deeplearning4j.models.word2vec.wordstore.VocabCache; import org.deeplearning4j.spark.text.BaseSparkTest; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecTest.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecTest.java index 21de27048..b66d79956 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecTest.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/models/embeddings/word2vec/Word2VecTest.java @@ -21,7 +21,7 @@ import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.JavaSparkContext; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.deeplearning4j.models.embeddings.inmemory.InMemoryLookupTable; import org.deeplearning4j.models.embeddings.loader.WordVectorSerializer; import org.deeplearning4j.models.embeddings.reader.impl.FlatModelUtils; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/text/TextPipelineTest.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/text/TextPipelineTest.java index de141c061..c2e334761 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/text/TextPipelineTest.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-nlp/src/test/java/org/deeplearning4j/spark/text/TextPipelineTest.java @@ -34,8 +34,8 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.Tuple2; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAccumulationFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAccumulationFunction.java index 92107e209..2606eeed8 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAccumulationFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAccumulationFunction.java @@ -17,8 +17,8 @@ package org.deeplearning4j.spark.parameterserver.accumulation; import org.apache.spark.api.java.function.Function2; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StorageMetaData; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StorageMetaData; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithmReducer; import org.deeplearning4j.spark.api.stats.SparkTrainingStats; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAccumulationTuple.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAccumulationTuple.java index 1053fbbd3..385ef9a65 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAccumulationTuple.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAccumulationTuple.java @@ -20,8 +20,8 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StorageMetaData; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StorageMetaData; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithmReducer; import org.deeplearning4j.spark.api.stats.SparkTrainingStats; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAggregateFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAggregateFunction.java index 13f14ebad..9d9dd77f6 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAggregateFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/accumulation/SharedTrainingAggregateFunction.java @@ -17,8 +17,8 @@ package org.deeplearning4j.spark.parameterserver.accumulation; import org.apache.spark.api.java.function.Function2; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StorageMetaData; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StorageMetaData; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithmReducer; import org.deeplearning4j.spark.api.stats.SparkTrainingStats; import org.deeplearning4j.spark.parameterserver.training.SharedTrainingResult; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/functions/SharedFlatMapPaths.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/functions/SharedFlatMapPaths.java index 4c8192ae7..70f1cf1c1 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/functions/SharedFlatMapPaths.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/functions/SharedFlatMapPaths.java @@ -21,7 +21,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.spark.api.java.function.FlatMapFunction; import org.apache.spark.broadcast.Broadcast; import org.datavec.spark.util.SerializableHadoopConfig; -import org.deeplearning4j.api.loader.DataSetLoader; +import org.deeplearning4j.core.loader.DataSetLoader; import org.deeplearning4j.spark.api.TrainingResult; import org.deeplearning4j.spark.api.TrainingWorker; import org.deeplearning4j.spark.iterator.PathSparkDataSetIterator; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/functions/SharedFlatMapPathsMDS.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/functions/SharedFlatMapPathsMDS.java index 3a8b1c213..881b5e08f 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/functions/SharedFlatMapPathsMDS.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/functions/SharedFlatMapPathsMDS.java @@ -20,7 +20,7 @@ import org.apache.commons.io.LineIterator; import org.apache.spark.api.java.function.FlatMapFunction; import org.apache.spark.broadcast.Broadcast; import org.datavec.spark.util.SerializableHadoopConfig; -import org.deeplearning4j.api.loader.MultiDataSetLoader; +import org.deeplearning4j.core.loader.MultiDataSetLoader; import org.deeplearning4j.spark.api.TrainingResult; import org.deeplearning4j.spark.api.TrainingWorker; import org.deeplearning4j.spark.iterator.PathSparkMultiDataSetIterator; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/networking/v2/ModelParamsConsumer.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/networking/v2/ModelParamsConsumer.java index 832a6c531..f633bf0ad 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/networking/v2/ModelParamsConsumer.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/networking/v2/ModelParamsConsumer.java @@ -19,9 +19,8 @@ package org.deeplearning4j.spark.parameterserver.networking.v2; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.function.Consumer; -import org.nd4j.linalg.function.Supplier; -import org.nd4j.linalg.primitives.Atomic; +import org.nd4j.common.function.Supplier; +import org.nd4j.common.primitives.Atomic; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/networking/v2/UpdaterParamsConsumer.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/networking/v2/UpdaterParamsConsumer.java index eea08273a..d812b7b05 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/networking/v2/UpdaterParamsConsumer.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/networking/v2/UpdaterParamsConsumer.java @@ -18,8 +18,8 @@ package org.deeplearning4j.spark.parameterserver.networking.v2; import lombok.extern.slf4j.Slf4j; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.function.Supplier; -import org.nd4j.linalg.primitives.Atomic; +import org.nd4j.common.function.Supplier; +import org.nd4j.common.primitives.Atomic; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/pw/SharedTrainingWrapper.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/pw/SharedTrainingWrapper.java index b6a8bb81c..0b92ffe56 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/pw/SharedTrainingWrapper.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/pw/SharedTrainingWrapper.java @@ -19,9 +19,9 @@ package org.deeplearning4j.spark.parameterserver.pw; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.bytedeco.javacpp.Loader; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.listener.RoutingIterationListener; -import org.deeplearning4j.config.DL4JEnvironmentVars; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.listener.RoutingIterationListener; +import org.deeplearning4j.common.config.DL4JEnvironmentVars; import org.deeplearning4j.exception.DL4JInvalidConfigException; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.api.Updater; @@ -32,9 +32,6 @@ import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.optimize.listeners.SleepyTrainingListener; import org.deeplearning4j.optimize.solvers.accumulation.EncodedGradientsAccumulator; import org.deeplearning4j.optimize.solvers.accumulation.EncodingHandler; -import org.deeplearning4j.optimize.solvers.accumulation.MessageHandler; -import org.deeplearning4j.optimize.solvers.accumulation.encoding.ThresholdAlgorithm; -import org.deeplearning4j.optimize.solvers.accumulation.SmartFancyBlockingQueue; import org.deeplearning4j.parallelism.ParallelWrapper; import org.deeplearning4j.spark.parameterserver.conf.SharedTrainingConfiguration; import org.deeplearning4j.spark.parameterserver.iterators.VirtualDataSetIterator; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/training/SharedTrainingMaster.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/training/SharedTrainingMaster.java index a21b5ba9c..f90bbdcf6 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/training/SharedTrainingMaster.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark-parameterserver/src/main/java/org/deeplearning4j/spark/parameterserver/training/SharedTrainingMaster.java @@ -28,15 +28,14 @@ import org.apache.spark.api.java.function.FlatMapFunction; import org.apache.spark.broadcast.Broadcast; import org.apache.spark.storage.StorageLevel; import org.datavec.spark.util.BroadcastHadoopConfigHolder; -import org.datavec.spark.util.SerializableHadoopConfig; -import org.deeplearning4j.api.loader.DataSetLoader; -import org.deeplearning4j.api.loader.MultiDataSetLoader; -import org.deeplearning4j.api.loader.impl.SerializedDataSetLoader; -import org.deeplearning4j.api.loader.impl.SerializedMultiDataSetLoader; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.config.DL4JEnvironmentVars; +import org.deeplearning4j.core.loader.DataSetLoader; +import org.deeplearning4j.core.loader.MultiDataSetLoader; +import org.deeplearning4j.core.loader.impl.SerializedDataSetLoader; +import org.deeplearning4j.core.loader.impl.SerializedMultiDataSetLoader; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.common.config.DL4JEnvironmentVars; import org.deeplearning4j.exception.DL4JInvalidConfigException; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.optimize.solvers.accumulation.encoding.ResidualPostProcessor; @@ -62,8 +61,9 @@ import org.deeplearning4j.spark.parameterserver.functions.SharedFlatMapPathsMDS; import org.deeplearning4j.spark.parameterserver.networking.v1.SilentTrainingDriver; import org.deeplearning4j.spark.parameterserver.networking.v2.UpdatesConsumer; import org.deeplearning4j.spark.util.SparkUtils; -import org.deeplearning4j.util.UIDProvider; -import org.nd4j.base.Preconditions; +import org.deeplearning4j.core.util.UIDProvider; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.config.ND4JEnvironmentVars; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.factory.Nd4j; @@ -1143,7 +1143,7 @@ public class SharedTrainingMaster extends BaseTrainingMaster implements PairFunction, T,Tuple2> { diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/BaseTrainingMaster.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/BaseTrainingMaster.java index f7b85c668..7dcc14b4b 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/BaseTrainingMaster.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/BaseTrainingMaster.java @@ -28,7 +28,7 @@ import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.broadcast.Broadcast; import org.apache.spark.storage.StorageLevel; import org.datavec.spark.util.SerializableHadoopConfig; -import org.deeplearning4j.api.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StatsStorageRouter; import org.deeplearning4j.optimize.api.TrainingListener; import org.deeplearning4j.spark.api.*; import org.deeplearning4j.spark.data.BatchAndExportDataSetsFunction; @@ -53,7 +53,6 @@ import org.nd4j.shade.jackson.dataformat.yaml.YAMLFactory; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.util.Collection; import java.util.List; import java.util.Random; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingMaster.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingMaster.java index b6d5654ec..cb9e36340 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingMaster.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingMaster.java @@ -28,15 +28,14 @@ import org.apache.spark.broadcast.Broadcast; import org.apache.spark.input.PortableDataStream; import org.apache.spark.storage.StorageLevel; import org.datavec.spark.util.BroadcastHadoopConfigHolder; -import org.datavec.spark.util.SerializableHadoopConfig; -import org.deeplearning4j.api.loader.DataSetLoader; -import org.deeplearning4j.api.loader.MultiDataSetLoader; -import org.deeplearning4j.api.loader.impl.SerializedDataSetLoader; -import org.deeplearning4j.api.loader.impl.SerializedMultiDataSetLoader; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.StatsStorageRouterProvider; -import org.deeplearning4j.api.storage.StorageMetaData; +import org.deeplearning4j.core.loader.DataSetLoader; +import org.deeplearning4j.core.loader.MultiDataSetLoader; +import org.deeplearning4j.core.loader.impl.SerializedDataSetLoader; +import org.deeplearning4j.core.loader.impl.SerializedMultiDataSetLoader; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StatsStorageRouterProvider; +import org.deeplearning4j.core.storage.StorageMetaData; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.graph.ComputationGraph; @@ -54,7 +53,7 @@ import org.deeplearning4j.spark.impl.paramavg.aggregator.ParameterAveragingEleme import org.deeplearning4j.spark.impl.paramavg.aggregator.ParameterAveragingElementCombineFunction; import org.deeplearning4j.spark.impl.paramavg.stats.ParameterAveragingTrainingMasterStats; import org.deeplearning4j.spark.util.SparkUtils; -import org.deeplearning4j.util.UIDProvider; +import org.deeplearning4j.core.util.UIDProvider; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.MultiDataSet; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingResult.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingResult.java index a73703471..8cd3330a9 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingResult.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingResult.java @@ -17,8 +17,8 @@ package org.deeplearning4j.spark.impl.paramavg; import lombok.Data; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StorageMetaData; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StorageMetaData; import org.deeplearning4j.spark.api.TrainingResult; import org.deeplearning4j.spark.api.stats.SparkTrainingStats; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingWorker.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingWorker.java index 71fcd1680..1f5c54824 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingWorker.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/ParameterAveragingTrainingWorker.java @@ -18,11 +18,11 @@ package org.deeplearning4j.spark.impl.paramavg; import lombok.val; import org.apache.spark.broadcast.Broadcast; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.StatsStorageRouterProvider; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.api.storage.listener.RoutingIterationListener; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StatsStorageRouterProvider; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.core.storage.listener.RoutingIterationListener; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.api.Updater; import org.deeplearning4j.nn.graph.ComputationGraph; @@ -37,12 +37,12 @@ import org.deeplearning4j.spark.api.stats.SparkTrainingStats; import org.deeplearning4j.spark.api.worker.NetBroadcastTuple; import org.deeplearning4j.spark.impl.listeners.VanillaStatsStorageRouter; import org.deeplearning4j.spark.impl.paramavg.stats.ParameterAveragingTrainingWorkerStats; -import org.deeplearning4j.util.UIDProvider; +import org.deeplearning4j.core.util.UIDProvider; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingAggregationTuple.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingAggregationTuple.java index d60c841e8..f6b1e74bf 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingAggregationTuple.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingAggregationTuple.java @@ -19,8 +19,8 @@ package org.deeplearning4j.spark.impl.paramavg.aggregator; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StorageMetaData; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StorageMetaData; import org.deeplearning4j.spark.api.stats.SparkTrainingStats; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingElementAddFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingElementAddFunction.java index da98d34de..419bcee35 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingElementAddFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingElementAddFunction.java @@ -17,8 +17,8 @@ package org.deeplearning4j.spark.impl.paramavg.aggregator; import org.apache.spark.api.java.function.Function2; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StorageMetaData; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StorageMetaData; import org.deeplearning4j.spark.api.stats.SparkTrainingStats; import org.deeplearning4j.spark.impl.paramavg.ParameterAveragingTrainingResult; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingElementCombineFunction.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingElementCombineFunction.java index da50843ac..545830dd7 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingElementCombineFunction.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/paramavg/aggregator/ParameterAveragingElementCombineFunction.java @@ -17,8 +17,8 @@ package org.deeplearning4j.spark.impl.paramavg.aggregator; import org.apache.spark.api.java.function.Function2; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StorageMetaData; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StorageMetaData; import org.deeplearning4j.spark.api.stats.SparkTrainingStats; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/repartitioner/EqualRepartitioner.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/repartitioner/EqualRepartitioner.java index 612fec9c5..2f16796c8 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/repartitioner/EqualRepartitioner.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/impl/repartitioner/EqualRepartitioner.java @@ -23,7 +23,7 @@ import org.deeplearning4j.spark.api.Repartitioner; import org.deeplearning4j.spark.impl.common.CountPartitionsFunction; import org.deeplearning4j.spark.impl.common.repartition.EqualPartitioner; import org.deeplearning4j.spark.util.SparkUtils; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.util.MathUtils; import scala.Tuple2; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/iterator/PathSparkDataSetIterator.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/iterator/PathSparkDataSetIterator.java index 992b13c38..b9d1064d7 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/iterator/PathSparkDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/iterator/PathSparkDataSetIterator.java @@ -21,7 +21,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.spark.broadcast.Broadcast; import org.datavec.spark.util.DefaultHadoopConfig; import org.datavec.spark.util.SerializableHadoopConfig; -import org.deeplearning4j.api.loader.DataSetLoader; +import org.deeplearning4j.core.loader.DataSetLoader; import org.deeplearning4j.spark.data.loader.RemoteFileSource; import org.nd4j.linalg.dataset.DataSet; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/iterator/PathSparkMultiDataSetIterator.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/iterator/PathSparkMultiDataSetIterator.java index 105d8d469..d2d2945c7 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/iterator/PathSparkMultiDataSetIterator.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/iterator/PathSparkMultiDataSetIterator.java @@ -17,20 +17,17 @@ package org.deeplearning4j.spark.iterator; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; import org.apache.spark.broadcast.Broadcast; import org.datavec.spark.util.DefaultHadoopConfig; import org.datavec.spark.util.SerializableHadoopConfig; -import org.deeplearning4j.api.loader.MultiDataSetLoader; +import org.deeplearning4j.core.loader.MultiDataSetLoader; import org.deeplearning4j.spark.data.loader.RemoteFileSource; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.MultiDataSetPreProcessor; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.net.URI; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/stats/BaseEventStats.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/stats/BaseEventStats.java index 19fc07ff6..35a70460c 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/stats/BaseEventStats.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/stats/BaseEventStats.java @@ -16,7 +16,7 @@ package org.deeplearning4j.spark.stats; -import org.deeplearning4j.util.UIDProvider; +import org.deeplearning4j.core.util.UIDProvider; /** * Created by Alex on 26/06/2016. diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/time/NTPTimeSource.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/time/NTPTimeSource.java index b6dc51491..4657a6aeb 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/time/NTPTimeSource.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/time/NTPTimeSource.java @@ -18,7 +18,7 @@ package org.deeplearning4j.spark.time; import org.apache.commons.net.ntp.NTPUDPClient; import org.apache.commons.net.ntp.TimeInfo; -import org.deeplearning4j.config.DL4JSystemProperties; +import org.deeplearning4j.common.config.DL4JSystemProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/time/TimeSourceProvider.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/time/TimeSourceProvider.java index cbdc5f5dd..880c6d7fa 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/time/TimeSourceProvider.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/time/TimeSourceProvider.java @@ -16,7 +16,7 @@ package org.deeplearning4j.spark.time; -import org.deeplearning4j.config.DL4JSystemProperties; +import org.deeplearning4j.common.config.DL4JSystemProperties; import java.lang.reflect.Method; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/util/SparkDataUtils.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/util/SparkDataUtils.java index 0c62b4e7e..697477e6e 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/util/SparkDataUtils.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/util/SparkDataUtils.java @@ -26,8 +26,8 @@ import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.api.java.function.VoidFunction; import org.datavec.spark.util.SerializableHadoopConfig; -import org.deeplearning4j.api.loader.impl.RecordReaderFileBatchLoader; -import org.nd4j.api.loader.FileBatch; +import org.deeplearning4j.core.loader.impl.RecordReaderFileBatchLoader; +import org.nd4j.common.loader.FileBatch; import java.io.*; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/util/SparkUtils.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/util/SparkUtils.java index dd11d7164..d28f0fa59 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/util/SparkUtils.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/util/SparkUtils.java @@ -18,7 +18,6 @@ package org.deeplearning4j.spark.util; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; @@ -44,15 +43,13 @@ import org.deeplearning4j.spark.impl.common.CountPartitionsFunction; import org.deeplearning4j.spark.impl.common.SplitPartitionsFunction; import org.deeplearning4j.spark.impl.common.SplitPartitionsFunction2; import org.deeplearning4j.spark.impl.common.repartition.BalancedPartitioner; -import org.deeplearning4j.spark.impl.common.repartition.EqualPartitioner; import org.deeplearning4j.spark.impl.common.repartition.HashingBalancedPartitioner; import org.deeplearning4j.spark.impl.common.repartition.MapTupleToPairFlatMap; import org.deeplearning4j.spark.impl.repartitioner.EqualRepartitioner; -import org.deeplearning4j.util.UIDProvider; +import org.deeplearning4j.core.util.UIDProvider; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.MathUtils; import org.slf4j.Logger; import scala.Tuple2; @@ -73,7 +70,7 @@ public class SparkUtils { private static final String KRYO_EXCEPTION_MSG = "Kryo serialization detected without an appropriate registrator " + "for ND4J INDArrays.\nWhen using Kryo, An appropriate Kryo registrator must be used to avoid" + " serialization issues (NullPointerException) with off-heap data in INDArrays.\n" - + "Use nd4j-kryo_2.10 or _2.11 artifact, with sparkConf.set(\"spark.kryo.registrator\", \"org.nd4j.Nd4jRegistrator\");\n" + + "Use nd4j-kryo_2.10 or _2.11 artifact, with sparkConf.set(\"spark.kryo.registrator\", \"org.nd4j.kryo.Nd4jRegistrator\");\n" + "See https://deeplearning4j.org/docs/latest/deeplearning4j-scaleout-howto#kryo for more details"; private static String sparkExecutorId; @@ -92,7 +89,7 @@ public class SparkUtils { String serializer = javaSparkContext.getConf().get("spark.serializer", null); if (serializer != null && serializer.equals("org.apache.spark.serializer.KryoSerializer")) { String kryoRegistrator = javaSparkContext.getConf().get("spark.kryo.registrator", null); - if (kryoRegistrator == null || !kryoRegistrator.equals("org.nd4j.Nd4jRegistrator")) { + if (kryoRegistrator == null || !kryoRegistrator.equals("org.nd4j.kryo.Nd4jRegistrator")) { //It's probably going to fail later due to Kryo failing on the INDArray deserialization (off-heap data) //But: the user might be using a custom Kryo registrator that can handle ND4J INDArrays, even if they diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/BaseSparkKryoTest.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/BaseSparkKryoTest.java index f7b4da172..db24914a9 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/BaseSparkKryoTest.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/BaseSparkKryoTest.java @@ -69,7 +69,7 @@ public class BaseSparkKryoTest extends BaseSparkTest { .set("spark.driver.host", "localhost"); sparkConf.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer"); - sparkConf.set("spark.kryo.registrator", "org.nd4j.Nd4jRegistrator"); + sparkConf.set("spark.kryo.registrator", "org.nd4j.kryo.Nd4jRegistrator"); sc = new JavaSparkContext(sparkConf); diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/MiniBatchTests.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/MiniBatchTests.java index 7dd3ee5dd..a4676c0a1 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/MiniBatchTests.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/MiniBatchTests.java @@ -24,7 +24,7 @@ import org.datavec.api.records.reader.impl.misc.SVMLightRecordReader; import org.deeplearning4j.spark.BaseSparkTest; import org.junit.Test; import org.nd4j.linalg.dataset.DataSet; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/TestDataVecDataSetFunctions.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/TestDataVecDataSetFunctions.java index 56d5f9dc0..996360564 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/TestDataVecDataSetFunctions.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/TestDataVecDataSetFunctions.java @@ -46,11 +46,10 @@ import org.junit.rules.TemporaryFolder; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import scala.Tuple2; import java.io.File; -import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/iterator/TestIteratorUtils.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/iterator/TestIteratorUtils.java index b7a4d6d49..f34bc453d 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/iterator/TestIteratorUtils.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/datavec/iterator/TestIteratorUtils.java @@ -27,7 +27,7 @@ import org.deeplearning4j.spark.BaseSparkTest; import org.junit.Test; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.dataset.api.MultiDataSet; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/TestKryoWarning.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/TestKryoWarning.java index c85ba82aa..941132dc5 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/TestKryoWarning.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/TestKryoWarning.java @@ -86,7 +86,7 @@ public class TestKryoWarning { SparkConf sparkConf = new SparkConf().setMaster("local[*]").setAppName("sparktest") .set("spark.driver.host", "localhost") .set("spark.serializer", "org.apache.spark.serializer.KryoSerializer") - .set("spark.kryo.registrator", "org.nd4j.Nd4jRegistrator"); + .set("spark.kryo.registrator", "org.nd4j.kryo.Nd4jRegistrator"); doTestMLN(sparkConf); } @@ -122,7 +122,7 @@ public class TestKryoWarning { SparkConf sparkConf = new SparkConf().setMaster("local[*]").setAppName("sparktest") .set("spark.driver.host", "localhost") .set("spark.serializer", "org.apache.spark.serializer.KryoSerializer") - .set("spark.kryo.registrator", "org.nd4j.Nd4jRegistrator"); + .set("spark.kryo.registrator", "org.nd4j.kryo.Nd4jRegistrator"); doTestCG(sparkConf); } diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/graph/TestSparkComputationGraph.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/graph/TestSparkComputationGraph.java index 0de7875e2..e83a8027a 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/graph/TestSparkComputationGraph.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/graph/TestSparkComputationGraph.java @@ -17,7 +17,6 @@ package org.deeplearning4j.spark.impl.graph; import lombok.val; -import org.apache.spark.SparkConf; import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.JavaSparkContext; @@ -57,7 +56,7 @@ import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.Nesterovs; import org.nd4j.linalg.learning.config.Sgd; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/paramavg/TestSparkMultiLayerParameterAveraging.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/paramavg/TestSparkMultiLayerParameterAveraging.java index 3b328e210..7357f77e7 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/paramavg/TestSparkMultiLayerParameterAveraging.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/impl/paramavg/TestSparkMultiLayerParameterAveraging.java @@ -64,7 +64,7 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.IUpdater; import org.nd4j.linalg.learning.config.Nesterovs; diff --git a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/ui/TestListeners.java b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/ui/TestListeners.java index a12b1e460..2c6d1fbc1 100644 --- a/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/ui/TestListeners.java +++ b/deeplearning4j/deeplearning4j-scaleout/spark/dl4j-spark/src/test/java/org/deeplearning4j/spark/ui/TestListeners.java @@ -18,8 +18,8 @@ package org.deeplearning4j.spark.ui; import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.JavaSparkContext; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorage; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorage; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; @@ -31,8 +31,8 @@ import org.deeplearning4j.spark.BaseSparkTest; import org.deeplearning4j.spark.api.TrainingMaster; import org.deeplearning4j.spark.impl.multilayer.SparkDl4jMultiLayer; import org.deeplearning4j.spark.impl.paramavg.ParameterAveragingTrainingMaster; -import org.deeplearning4j.ui.stats.StatsListener; -import org.deeplearning4j.ui.storage.mapdb.MapDBStatsStorage; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.storage.mapdb.MapDBStatsStorage; import org.junit.Test; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.dataset.DataSet; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-components/src/main/java/org/deeplearning4j/ui/standalone/StaticPageUtil.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-components/src/main/java/org/deeplearning4j/ui/standalone/StaticPageUtil.java index da1f5f552..80a9a959f 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-components/src/main/java/org/deeplearning4j/ui/standalone/StaticPageUtil.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-components/src/main/java/org/deeplearning4j/ui/standalone/StaticPageUtil.java @@ -23,7 +23,7 @@ import freemarker.template.Version; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.deeplearning4j.ui.api.Component; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.shade.jackson.databind.DeserializationFeature; import org.nd4j.shade.jackson.databind.MapperFeature; import org.nd4j.shade.jackson.databind.ObjectMapper; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/renders/PathUpdate.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/activation/PathUpdate.java similarity index 95% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/renders/PathUpdate.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/activation/PathUpdate.java index 9aac60b0b..07852e017 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/renders/PathUpdate.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/activation/PathUpdate.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.renders; +package org.deeplearning4j.ui.model.activation; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/nearestneighbors/word2vec/NearestNeighborsQuery.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/nearestneighbors/word2vec/NearestNeighborsQuery.java similarity index 96% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/nearestneighbors/word2vec/NearestNeighborsQuery.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/nearestneighbors/word2vec/NearestNeighborsQuery.java index 5042880a4..483dc5be9 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/nearestneighbors/word2vec/NearestNeighborsQuery.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/nearestneighbors/word2vec/NearestNeighborsQuery.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.nearestneighbors.word2vec; +package org.deeplearning4j.ui.model.nearestneighbors.word2vec; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/activation/PathUpdate.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/renders/PathUpdate.java similarity index 95% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/activation/PathUpdate.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/renders/PathUpdate.java index 977ad705c..6d3e630bd 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/activation/PathUpdate.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/renders/PathUpdate.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.activation; +package org.deeplearning4j.ui.model.renders; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/BaseStatsListener.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/BaseStatsListener.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/BaseStatsListener.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/BaseStatsListener.java index 979f811e5..34d5dbb12 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/BaseStatsListener.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/BaseStatsListener.java @@ -14,28 +14,30 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats; +package org.deeplearning4j.ui.model.stats; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.bytedeco.javacpp.Pointer; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.api.storage.listener.RoutingIterationListener; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.core.storage.listener.RoutingIterationListener; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.gradient.Gradient; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; -import org.deeplearning4j.ui.stats.api.*; -import org.deeplearning4j.ui.stats.impl.DefaultStatsInitializationConfiguration; -import org.deeplearning4j.ui.stats.impl.DefaultStatsUpdateConfiguration; -import org.deeplearning4j.util.UIDProvider; +import org.deeplearning4j.ui.model.stats.api.*; +import org.deeplearning4j.ui.model.storage.FileStatsStorage; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.stats.impl.DefaultStatsInitializationConfiguration; +import org.deeplearning4j.ui.model.stats.impl.DefaultStatsUpdateConfiguration; +import org.deeplearning4j.core.util.UIDProvider; 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.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.nativeblas.NativeOps; import org.nd4j.nativeblas.NativeOpsHolder; @@ -121,8 +123,8 @@ public abstract class BaseStatsListener implements RoutingIterationListener { /** * Create a StatsListener with network information collected at every iteration. * - * @param router Where/how to store the calculated stats. For example, {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} or - * {@link org.deeplearning4j.ui.storage.FileStatsStorage} + * @param router Where/how to store the calculated stats. For example, {@link InMemoryStatsStorage} or + * {@link FileStatsStorage} */ public BaseStatsListener(StatsStorageRouter router) { this(router, null, null, null, null); @@ -131,8 +133,8 @@ public abstract class BaseStatsListener implements RoutingIterationListener { /** * Create a StatsListener with network information collected every n >= 1 time steps * - * @param router Where/how to store the calculated stats. For example, {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} or - * {@link org.deeplearning4j.ui.storage.FileStatsStorage} + * @param router Where/how to store the calculated stats. For example, {@link InMemoryStatsStorage} or + * {@link FileStatsStorage} * @param listenerFrequency Frequency with which to collect stats information */ public BaseStatsListener(StatsStorageRouter router, int listenerFrequency) { diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/J7StatsListener.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/J7StatsListener.java similarity index 68% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/J7StatsListener.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/J7StatsListener.java index 320b5fd2b..5ec194375 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/J7StatsListener.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/J7StatsListener.java @@ -14,25 +14,27 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats; +package org.deeplearning4j.ui.model.stats; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.ui.stats.api.StatsInitializationConfiguration; -import org.deeplearning4j.ui.stats.api.StatsInitializationReport; -import org.deeplearning4j.ui.stats.api.StatsReport; -import org.deeplearning4j.ui.stats.api.StatsUpdateConfiguration; -import org.deeplearning4j.ui.stats.impl.DefaultStatsUpdateConfiguration; -import org.deeplearning4j.ui.stats.impl.java.JavaStatsInitializationReport; -import org.deeplearning4j.ui.stats.impl.java.JavaStatsReport; -import org.deeplearning4j.ui.storage.impl.JavaStorageMetaData; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.ui.model.stats.api.StatsInitializationConfiguration; +import org.deeplearning4j.ui.model.stats.api.StatsInitializationReport; +import org.deeplearning4j.ui.model.stats.api.StatsReport; +import org.deeplearning4j.ui.model.stats.api.StatsUpdateConfiguration; +import org.deeplearning4j.ui.model.storage.FileStatsStorage; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.storage.impl.JavaStorageMetaData; +import org.deeplearning4j.ui.model.stats.impl.DefaultStatsUpdateConfiguration; +import org.deeplearning4j.ui.model.stats.impl.java.JavaStatsInitializationReport; +import org.deeplearning4j.ui.model.stats.impl.java.JavaStatsReport; /** * J7StatsListener: a version of the {@link StatsListener} but with Java 7 compatibility *

* Stats are collected and passed on to a {@link StatsStorageRouter} - for example, for storage and/or displaying in the UI, - * use {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} or {@link org.deeplearning4j.ui.storage.FileStatsStorage}. + * use {@link InMemoryStatsStorage} or {@link FileStatsStorage}. * * @author Alex Black */ @@ -43,8 +45,8 @@ public class J7StatsListener extends BaseStatsListener { * Create a StatsListener with network information collected at every iteration. Equivalent to {@link #J7StatsListener(StatsStorageRouter, int)} * with {@code listenerFrequency == 1} * - * @param router Where/how to store the calculated stats. For example, {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} or - * {@link org.deeplearning4j.ui.storage.FileStatsStorage} + * @param router Where/how to store the calculated stats. For example, {@link InMemoryStatsStorage} or + * {@link FileStatsStorage} */ public J7StatsListener(StatsStorageRouter router) { this(router, null, null, null, null); @@ -53,8 +55,8 @@ public class J7StatsListener extends BaseStatsListener { /** * Create a StatsListener with network information collected every n >= 1 time steps * - * @param router Where/how to store the calculated stats. For example, {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} or - * {@link org.deeplearning4j.ui.storage.FileStatsStorage} + * @param router Where/how to store the calculated stats. For example, {@link InMemoryStatsStorage} or + * {@link FileStatsStorage} * @param listenerFrequency Frequency with which to collect stats information */ public J7StatsListener(StatsStorageRouter router, int listenerFrequency) { @@ -63,7 +65,7 @@ public class J7StatsListener extends BaseStatsListener { } public J7StatsListener(StatsStorageRouter router, StatsInitializationConfiguration initConfig, - StatsUpdateConfiguration updateConfig, String sessionID, String workerID) { + StatsUpdateConfiguration updateConfig, String sessionID, String workerID) { super(router, initConfig, updateConfig, sessionID, workerID); } @@ -79,7 +81,7 @@ public class J7StatsListener extends BaseStatsListener { @Override public StorageMetaData getNewStorageMetaData(long initTime, String sessionID, String workerID) { - return new JavaStorageMetaData(initTime, sessionID, BaseStatsListener.TYPE_ID, workerID, + return new JavaStorageMetaData(initTime, sessionID, TYPE_ID, workerID, JavaStatsInitializationReport.class, JavaStatsReport.class); } diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/StatsListener.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/StatsListener.java similarity index 71% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/StatsListener.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/StatsListener.java index 94bafa8c1..501bf3609 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/StatsListener.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/StatsListener.java @@ -14,25 +14,27 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats; +package org.deeplearning4j.ui.model.stats; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.ui.stats.api.StatsInitializationConfiguration; -import org.deeplearning4j.ui.stats.api.StatsInitializationReport; -import org.deeplearning4j.ui.stats.api.StatsReport; -import org.deeplearning4j.ui.stats.api.StatsUpdateConfiguration; -import org.deeplearning4j.ui.stats.impl.DefaultStatsUpdateConfiguration; -import org.deeplearning4j.ui.stats.impl.SbeStatsInitializationReport; -import org.deeplearning4j.ui.stats.impl.SbeStatsReport; -import org.deeplearning4j.ui.storage.impl.SbeStorageMetaData; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.ui.model.stats.api.StatsInitializationConfiguration; +import org.deeplearning4j.ui.model.stats.api.StatsInitializationReport; +import org.deeplearning4j.ui.model.stats.api.StatsReport; +import org.deeplearning4j.ui.model.stats.api.StatsUpdateConfiguration; +import org.deeplearning4j.ui.model.storage.FileStatsStorage; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.storage.impl.SbeStorageMetaData; +import org.deeplearning4j.ui.model.stats.impl.DefaultStatsUpdateConfiguration; +import org.deeplearning4j.ui.model.stats.impl.SbeStatsInitializationReport; +import org.deeplearning4j.ui.model.stats.impl.SbeStatsReport; /** * StatsListener: a general purpose listener for collecting and reporting system and model information. *

* Stats are collected and passed on to a {@link StatsStorageRouter} - for example, for storage and/or displaying in the UI, - * use {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} or {@link org.deeplearning4j.ui.storage.FileStatsStorage}. + * use {@link InMemoryStatsStorage} or {@link FileStatsStorage}. * * @author Alex Black */ @@ -43,8 +45,8 @@ public class StatsListener extends BaseStatsListener { * Create a StatsListener with network information collected at every iteration. Equivalent to {@link #StatsListener(StatsStorageRouter, int)} * with {@code listenerFrequency == 1} * - * @param router Where/how to store the calculated stats. For example, {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} or - * {@link org.deeplearning4j.ui.storage.FileStatsStorage} + * @param router Where/how to store the calculated stats. For example, {@link InMemoryStatsStorage} or + * {@link FileStatsStorage} */ public StatsListener(StatsStorageRouter router) { this(router, null, null, null, null); @@ -53,8 +55,8 @@ public class StatsListener extends BaseStatsListener { /** * Create a StatsListener with network information collected every n >= 1 time steps * - * @param router Where/how to store the calculated stats. For example, {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} or - * {@link org.deeplearning4j.ui.storage.FileStatsStorage} + * @param router Where/how to store the calculated stats. For example, {@link InMemoryStatsStorage} or + * {@link FileStatsStorage} * @param listenerFrequency Frequency with which to collect stats information */ public StatsListener(StatsStorageRouter router, int listenerFrequency) { @@ -64,8 +66,8 @@ public class StatsListener extends BaseStatsListener { /** * Create a StatsListener with network information collected every n >= 1 time steps * - * @param router Where/how to store the calculated stats. For example, {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} or - * {@link org.deeplearning4j.ui.storage.FileStatsStorage} + * @param router Where/how to store the calculated stats. For example, {@link InMemoryStatsStorage} or + * {@link FileStatsStorage} * @param listenerFrequency Frequency with which to collect stats information * @param sessionId The Session ID for storing the stats, optional (may be null) */ @@ -75,7 +77,7 @@ public class StatsListener extends BaseStatsListener { } public StatsListener(StatsStorageRouter router, StatsInitializationConfiguration initConfig, - StatsUpdateConfiguration updateConfig, String sessionID, String workerID) { + StatsUpdateConfiguration updateConfig, String sessionID, String workerID) { super(router, initConfig, updateConfig, sessionID, workerID); } diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/Histogram.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/Histogram.java similarity index 96% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/Histogram.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/Histogram.java index 7e93249ba..632067e12 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/Histogram.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/Histogram.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.api; +package org.deeplearning4j.ui.model.stats.api; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsInitializationConfiguration.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsInitializationConfiguration.java similarity index 94% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsInitializationConfiguration.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsInitializationConfiguration.java index 1332301c2..2cbd39152 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsInitializationConfiguration.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsInitializationConfiguration.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.api; +package org.deeplearning4j.ui.model.stats.api; -import org.deeplearning4j.ui.stats.StatsListener; +import org.deeplearning4j.ui.model.stats.StatsListener; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsInitializationReport.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsInitializationReport.java similarity index 96% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsInitializationReport.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsInitializationReport.java index d80987f6e..c0f55d02b 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsInitializationReport.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsInitializationReport.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.api; +package org.deeplearning4j.ui.model.stats.api; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.ui.stats.StatsListener; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.ui.model.stats.StatsListener; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsReport.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsReport.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsReport.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsReport.java index 1e3066cf7..042b40a84 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsReport.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsReport.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.api; +package org.deeplearning4j.ui.model.stats.api; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.ui.stats.StatsListener; -import org.nd4j.linalg.primitives.Pair; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsType.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsType.java similarity index 90% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsType.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsType.java index 427f8e2fc..e0761387b 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsType.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsType.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.api; +package org.deeplearning4j.ui.model.stats.api; -import org.deeplearning4j.ui.stats.StatsListener; +import org.deeplearning4j.ui.model.stats.StatsListener; /** * Stats type, for use in {@link StatsListener} diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsUpdateConfiguration.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsUpdateConfiguration.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsUpdateConfiguration.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsUpdateConfiguration.java index c9e56ff43..825bf7a13 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/StatsUpdateConfiguration.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/StatsUpdateConfiguration.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.api; +package org.deeplearning4j.ui.model.stats.api; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/SummaryType.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/SummaryType.java similarity index 89% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/SummaryType.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/SummaryType.java index 783937377..860286618 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/api/SummaryType.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/api/SummaryType.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.api; +package org.deeplearning4j.ui.model.stats.api; -import org.deeplearning4j.ui.stats.StatsListener; +import org.deeplearning4j.ui.model.stats.StatsListener; /** * Summary statistic type, for use in {@link StatsListener} diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/DefaultStatsInitializationConfiguration.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/DefaultStatsInitializationConfiguration.java similarity index 91% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/DefaultStatsInitializationConfiguration.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/DefaultStatsInitializationConfiguration.java index 868dfd53c..b7c6e816c 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/DefaultStatsInitializationConfiguration.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/DefaultStatsInitializationConfiguration.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.impl; +package org.deeplearning4j.ui.model.stats.impl; import lombok.AllArgsConstructor; -import org.deeplearning4j.ui.stats.api.StatsInitializationConfiguration; +import org.deeplearning4j.ui.model.stats.api.StatsInitializationConfiguration; /** * Created by Alex on 07/10/2016. diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/DefaultStatsUpdateConfiguration.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/DefaultStatsUpdateConfiguration.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/DefaultStatsUpdateConfiguration.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/DefaultStatsUpdateConfiguration.java index 10ead6b4a..7a8ee2c6d 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/DefaultStatsUpdateConfiguration.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/DefaultStatsUpdateConfiguration.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.impl; +package org.deeplearning4j.ui.model.stats.impl; import lombok.AllArgsConstructor; -import org.deeplearning4j.ui.stats.api.StatsType; -import org.deeplearning4j.ui.stats.api.StatsUpdateConfiguration; +import org.deeplearning4j.ui.model.stats.api.StatsType; +import org.deeplearning4j.ui.model.stats.api.StatsUpdateConfiguration; /** * Created by Alex on 07/10/2016. diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/SbeStatsInitializationReport.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/SbeStatsInitializationReport.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/SbeStatsInitializationReport.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/SbeStatsInitializationReport.java index edafe2155..e0996c28a 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/SbeStatsInitializationReport.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/SbeStatsInitializationReport.java @@ -14,16 +14,16 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.impl; +package org.deeplearning4j.ui.model.stats.impl; import lombok.Data; import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; import org.agrona.concurrent.UnsafeBuffer; import org.apache.commons.io.IOUtils; -import org.deeplearning4j.ui.stats.api.StatsInitializationReport; -import org.deeplearning4j.ui.stats.sbe.*; -import org.deeplearning4j.ui.storage.AgronaPersistable; +import org.deeplearning4j.ui.model.stats.api.StatsInitializationReport; +import org.deeplearning4j.ui.model.stats.sbe.*; +import org.deeplearning4j.ui.model.storage.AgronaPersistable; import java.io.IOException; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/SbeStatsReport.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/SbeStatsReport.java similarity index 95% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/SbeStatsReport.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/SbeStatsReport.java index 0b499e991..fc979f075 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/SbeStatsReport.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/SbeStatsReport.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.impl; +package org.deeplearning4j.ui.model.stats.impl; import lombok.AllArgsConstructor; import lombok.Data; @@ -24,13 +24,13 @@ import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; import org.agrona.concurrent.UnsafeBuffer; import org.apache.commons.io.IOUtils; -import org.deeplearning4j.ui.stats.api.Histogram; -import org.deeplearning4j.ui.stats.api.StatsReport; -import org.deeplearning4j.ui.stats.api.StatsType; -import org.deeplearning4j.ui.stats.api.SummaryType; -import org.deeplearning4j.ui.stats.sbe.*; -import org.deeplearning4j.ui.storage.AgronaPersistable; -import org.nd4j.linalg.primitives.Pair; +import org.deeplearning4j.ui.model.stats.api.Histogram; +import org.deeplearning4j.ui.model.stats.api.StatsReport; +import org.deeplearning4j.ui.model.stats.api.StatsType; +import org.deeplearning4j.ui.model.stats.api.SummaryType; +import org.deeplearning4j.ui.model.stats.sbe.*; +import org.deeplearning4j.ui.model.storage.AgronaPersistable; +import org.nd4j.common.primitives.Pair; import java.io.*; import java.nio.ByteBuffer; @@ -337,38 +337,38 @@ public class SbeStatsReport implements StatsReport, AgronaPersistable { } private static void appendOrDefault(UpdateEncoder.PerParameterStatsEncoder.SummaryStatEncoder sse, String param, - StatsType statsType, SummaryType summaryType, Map map, double defaultValue) { + StatsType statsType, SummaryType summaryType, Map map, double defaultValue) { Double d = map.get(param); if (d == null) d = defaultValue; - org.deeplearning4j.ui.stats.sbe.StatsType st; + org.deeplearning4j.ui.model.stats.sbe.StatsType st; switch (statsType) { case Parameters: - st = org.deeplearning4j.ui.stats.sbe.StatsType.Parameters; + st = org.deeplearning4j.ui.model.stats.sbe.StatsType.Parameters; break; case Gradients: - st = org.deeplearning4j.ui.stats.sbe.StatsType.Gradients; + st = org.deeplearning4j.ui.model.stats.sbe.StatsType.Gradients; break; case Updates: - st = org.deeplearning4j.ui.stats.sbe.StatsType.Updates; + st = org.deeplearning4j.ui.model.stats.sbe.StatsType.Updates; break; case Activations: - st = org.deeplearning4j.ui.stats.sbe.StatsType.Activations; + st = org.deeplearning4j.ui.model.stats.sbe.StatsType.Activations; break; default: throw new RuntimeException("Unknown stats type: " + statsType); } - org.deeplearning4j.ui.stats.sbe.SummaryType summaryT; + org.deeplearning4j.ui.model.stats.sbe.SummaryType summaryT; switch (summaryType) { case Mean: - summaryT = org.deeplearning4j.ui.stats.sbe.SummaryType.Mean; + summaryT = org.deeplearning4j.ui.model.stats.sbe.SummaryType.Mean; break; case Stdev: - summaryT = org.deeplearning4j.ui.stats.sbe.SummaryType.Stdev; + summaryT = org.deeplearning4j.ui.model.stats.sbe.SummaryType.Stdev; break; case MeanMagnitudes: - summaryT = org.deeplearning4j.ui.stats.sbe.SummaryType.MeanMagnitude; + summaryT = org.deeplearning4j.ui.model.stats.sbe.SummaryType.MeanMagnitude; break; default: throw new RuntimeException("Unknown summary type: " + summaryType); @@ -376,7 +376,7 @@ public class SbeStatsReport implements StatsReport, AgronaPersistable { sse.next().statType(st).summaryType(summaryT).value(d); } - private static StatsType translate(org.deeplearning4j.ui.stats.sbe.StatsType statsType) { + private static StatsType translate(org.deeplearning4j.ui.model.stats.sbe.StatsType statsType) { switch (statsType) { case Parameters: return StatsType.Parameters; @@ -391,22 +391,22 @@ public class SbeStatsReport implements StatsReport, AgronaPersistable { } } - private static org.deeplearning4j.ui.stats.sbe.StatsType translate(StatsType statsType) { + private static org.deeplearning4j.ui.model.stats.sbe.StatsType translate(StatsType statsType) { switch (statsType) { case Parameters: - return org.deeplearning4j.ui.stats.sbe.StatsType.Parameters; + return org.deeplearning4j.ui.model.stats.sbe.StatsType.Parameters; case Gradients: - return org.deeplearning4j.ui.stats.sbe.StatsType.Gradients; + return org.deeplearning4j.ui.model.stats.sbe.StatsType.Gradients; case Updates: - return org.deeplearning4j.ui.stats.sbe.StatsType.Updates; + return org.deeplearning4j.ui.model.stats.sbe.StatsType.Updates; case Activations: - return org.deeplearning4j.ui.stats.sbe.StatsType.Activations; + return org.deeplearning4j.ui.model.stats.sbe.StatsType.Activations; default: throw new RuntimeException("Unknown stats type: " + statsType); } } - private static SummaryType translate(org.deeplearning4j.ui.stats.sbe.SummaryType summaryType) { + private static SummaryType translate(org.deeplearning4j.ui.model.stats.sbe.SummaryType summaryType) { switch (summaryType) { case Mean: return SummaryType.Mean; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/SbeUtil.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/SbeUtil.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/SbeUtil.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/SbeUtil.java index 8c6478388..9ffe22aa8 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/SbeUtil.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/SbeUtil.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.impl; +package org.deeplearning4j.ui.model.stats.impl; import java.io.*; import java.nio.charset.Charset; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/java/JavaStatsInitializationReport.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/java/JavaStatsInitializationReport.java similarity index 96% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/java/JavaStatsInitializationReport.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/java/JavaStatsInitializationReport.java index 0fd39e5d0..709c9c9e3 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/java/JavaStatsInitializationReport.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/java/JavaStatsInitializationReport.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.impl.java; +package org.deeplearning4j.ui.model.stats.impl.java; import lombok.Data; import org.apache.commons.compress.utils.IOUtils; -import org.deeplearning4j.ui.stats.api.StatsInitializationReport; +import org.deeplearning4j.ui.model.stats.api.StatsInitializationReport; import java.io.*; import java.lang.reflect.Field; @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import java.util.Map; /** - * A 'pure java' implementation of {@link org.deeplearning4j.ui.stats.api.StatsInitializationReport}, mainly used for + * A 'pure java' implementation of {@link StatsInitializationReport}, mainly used for * Java 7 compatibility */ @Data diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/java/JavaStatsReport.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/java/JavaStatsReport.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/java/JavaStatsReport.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/java/JavaStatsReport.java index 242924748..cacad95c1 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/impl/java/JavaStatsReport.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/impl/java/JavaStatsReport.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.stats.impl.java; +package org.deeplearning4j.ui.model.stats.impl.java; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.apache.commons.compress.utils.IOUtils; -import org.deeplearning4j.ui.stats.api.Histogram; -import org.deeplearning4j.ui.stats.api.StatsReport; -import org.deeplearning4j.ui.stats.api.StatsType; -import org.deeplearning4j.ui.stats.api.SummaryType; -import org.nd4j.linalg.primitives.Pair; +import org.deeplearning4j.ui.model.stats.api.Histogram; +import org.deeplearning4j.ui.model.stats.api.StatsReport; +import org.deeplearning4j.ui.model.stats.api.StatsType; +import org.deeplearning4j.ui.model.stats.api.SummaryType; +import org.nd4j.common.primitives.Pair; import java.io.*; import java.lang.reflect.Field; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/GroupSizeEncodingDecoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/GroupSizeEncodingDecoder.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/GroupSizeEncodingDecoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/GroupSizeEncodingDecoder.java index 32df28d41..6b019548a 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/GroupSizeEncodingDecoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/GroupSizeEncodingDecoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/GroupSizeEncodingEncoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/GroupSizeEncodingEncoder.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/GroupSizeEncodingEncoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/GroupSizeEncodingEncoder.java index cae7d739f..8df79dcb1 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/GroupSizeEncodingEncoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/GroupSizeEncodingEncoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/InitFieldsPresentDecoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/InitFieldsPresentDecoder.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/InitFieldsPresentDecoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/InitFieldsPresentDecoder.java index 9bfdb972b..6d1ab499d 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/InitFieldsPresentDecoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/InitFieldsPresentDecoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/InitFieldsPresentEncoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/InitFieldsPresentEncoder.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/InitFieldsPresentEncoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/InitFieldsPresentEncoder.java index 14dda39bf..be61eed8a 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/InitFieldsPresentEncoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/InitFieldsPresentEncoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MemoryType.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MemoryType.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MemoryType.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MemoryType.java index 7f58c839d..0e326c9a7 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MemoryType.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MemoryType.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; @javax.annotation.Generated(value = {"org.deeplearning4j.ui.stats.sbe.MemoryType"}) public enum MemoryType { diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MessageHeaderDecoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MessageHeaderDecoder.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MessageHeaderDecoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MessageHeaderDecoder.java index 5e4770f7d..0dd8e1025 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MessageHeaderDecoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MessageHeaderDecoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MessageHeaderEncoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MessageHeaderEncoder.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MessageHeaderEncoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MessageHeaderEncoder.java index d34a4915e..e451771a1 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MessageHeaderEncoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MessageHeaderEncoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MetaAttribute.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MetaAttribute.java similarity index 95% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MetaAttribute.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MetaAttribute.java index 508c640bd..c18fdc990 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/MetaAttribute.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/MetaAttribute.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; @javax.annotation.Generated(value = {"org.deeplearning4j.ui.stats.sbe.MetaAttribute"}) public enum MetaAttribute { diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StatSource.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StatSource.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StatSource.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StatSource.java index 63a75a55f..eb0b99683 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StatSource.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StatSource.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; @javax.annotation.Generated(value = {"StatSource"}) public enum StatSource { diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StatType.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StatType.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StatType.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StatType.java index 6be10ebd3..fe078418b 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StatType.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StatType.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; @javax.annotation.Generated(value = {"StatType"}) public enum StatType { diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StaticInfoDecoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StaticInfoDecoder.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StaticInfoDecoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StaticInfoDecoder.java index 66c085028..d5d14bbbb 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StaticInfoDecoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StaticInfoDecoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StaticInfoEncoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StaticInfoEncoder.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StaticInfoEncoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StaticInfoEncoder.java index 1eef23343..59ea3d548 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StaticInfoEncoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StaticInfoEncoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StatsType.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StatsType.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StatsType.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StatsType.java index bb859a536..b1d5fd2ab 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StatsType.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StatsType.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; @javax.annotation.Generated(value = {"org.deeplearning4j.ui.stats.sbe.StatsType"}) public enum StatsType { diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StorageMetaDataDecoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StorageMetaDataDecoder.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StorageMetaDataDecoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StorageMetaDataDecoder.java index f300dc910..04526fa0e 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StorageMetaDataDecoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StorageMetaDataDecoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StorageMetaDataEncoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StorageMetaDataEncoder.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StorageMetaDataEncoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StorageMetaDataEncoder.java index b54a8601a..da0963c56 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/StorageMetaDataEncoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/StorageMetaDataEncoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/SummaryType.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/SummaryType.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/SummaryType.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/SummaryType.java index 4e437c4e6..7589a053d 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/SummaryType.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/SummaryType.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; @javax.annotation.Generated(value = {"org.deeplearning4j.ui.stats.sbe.SummaryType"}) public enum SummaryType { diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateDecoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateDecoder.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateDecoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateDecoder.java index b47863666..c197ca804 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateDecoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateDecoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateEncoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateEncoder.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateEncoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateEncoder.java index 01f82eb54..2fa4ea3e5 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateEncoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateEncoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateFieldsPresentDecoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateFieldsPresentDecoder.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateFieldsPresentDecoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateFieldsPresentDecoder.java index c6bfe2b4d..312d2a22a 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateFieldsPresentDecoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateFieldsPresentDecoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateFieldsPresentEncoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateFieldsPresentEncoder.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateFieldsPresentEncoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateFieldsPresentEncoder.java index 22dc21d13..6a23981de 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/UpdateFieldsPresentEncoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/UpdateFieldsPresentEncoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/VarDataUTF8Decoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/VarDataUTF8Decoder.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/VarDataUTF8Decoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/VarDataUTF8Decoder.java index 9d24f9bfc..37bf222fe 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/VarDataUTF8Decoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/VarDataUTF8Decoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.DirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/VarDataUTF8Encoder.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/VarDataUTF8Encoder.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/VarDataUTF8Encoder.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/VarDataUTF8Encoder.java index fde98d889..83cd8b65f 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/stats/sbe/VarDataUTF8Encoder.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/stats/sbe/VarDataUTF8Encoder.java @@ -15,7 +15,7 @@ ******************************************************************************/ /*- Generated SBE (Simple Binary Encoding) message codec */ -package org.deeplearning4j.ui.stats.sbe; +package org.deeplearning4j.ui.model.stats.sbe; import org.agrona.MutableDirectBuffer; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/AgronaPersistable.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/AgronaPersistable.java similarity index 91% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/AgronaPersistable.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/AgronaPersistable.java index 0866e4371..ddeef0792 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/AgronaPersistable.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/AgronaPersistable.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage; +package org.deeplearning4j.ui.model.storage; import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; -import org.deeplearning4j.api.storage.Persistable; +import org.deeplearning4j.core.storage.Persistable; /** * Created by Alex on 07/10/2016. diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/BaseCollectionStatsStorage.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/BaseCollectionStatsStorage.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/BaseCollectionStatsStorage.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/BaseCollectionStatsStorage.java index 2496e7069..ae45a30cc 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/BaseCollectionStatsStorage.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/BaseCollectionStatsStorage.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage; +package org.deeplearning4j.ui.model.storage; import lombok.AllArgsConstructor; import lombok.Data; -import org.deeplearning4j.api.storage.*; +import org.deeplearning4j.core.storage.*; import java.io.Serializable; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/FileStatsStorage.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/FileStatsStorage.java similarity index 92% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/FileStatsStorage.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/FileStatsStorage.java index 69af90999..129341bed 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/FileStatsStorage.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/FileStatsStorage.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage; +package org.deeplearning4j.ui.model.storage; -import org.deeplearning4j.ui.storage.mapdb.MapDBStatsStorage; +import org.deeplearning4j.ui.model.storage.mapdb.MapDBStatsStorage; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/InMemoryStatsStorage.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/InMemoryStatsStorage.java similarity index 93% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/InMemoryStatsStorage.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/InMemoryStatsStorage.java index 842d1a309..893de4465 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/InMemoryStatsStorage.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/InMemoryStatsStorage.java @@ -14,13 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage; +package org.deeplearning4j.ui.model.storage; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorageEvent; -import org.deeplearning4j.api.storage.StatsStorageListener; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.ui.storage.mapdb.MapDBStatsStorage; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorageListener; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.ui.model.storage.mapdb.MapDBStatsStorage; import java.io.IOException; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/JavaStorageMetaData.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/JavaStorageMetaData.java similarity index 96% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/JavaStorageMetaData.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/JavaStorageMetaData.java index e193d7e06..7c64d5985 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/JavaStorageMetaData.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/JavaStorageMetaData.java @@ -14,12 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage.impl; +package org.deeplearning4j.ui.model.storage.impl; import lombok.Data; import org.apache.commons.compress.utils.IOUtils; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.ui.stats.impl.SbeUtil; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.ui.model.stats.impl.SbeUtil; import java.io.*; import java.lang.reflect.Field; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/QueuePairStatsStorageListener.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/QueuePairStatsStorageListener.java similarity index 84% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/QueuePairStatsStorageListener.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/QueuePairStatsStorageListener.java index dd86aab65..2895104b4 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/QueuePairStatsStorageListener.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/QueuePairStatsStorageListener.java @@ -14,13 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage.impl; +package org.deeplearning4j.ui.model.storage.impl; import lombok.AllArgsConstructor; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; -import org.deeplearning4j.api.storage.StatsStorageListener; -import org.nd4j.linalg.primitives.Pair; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorageListener; +import org.nd4j.common.primitives.Pair; import java.util.Queue; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/QueueStatsStorageListener.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/QueueStatsStorageListener.java similarity index 88% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/QueueStatsStorageListener.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/QueueStatsStorageListener.java index 5d9f3bce7..313bdf8b5 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/QueueStatsStorageListener.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/QueueStatsStorageListener.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage.impl; +package org.deeplearning4j.ui.model.storage.impl; import lombok.AllArgsConstructor; -import org.deeplearning4j.api.storage.StatsStorageEvent; -import org.deeplearning4j.api.storage.StatsStorageListener; +import org.deeplearning4j.core.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorageListener; import java.util.Queue; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/SbeStorageMetaData.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/SbeStorageMetaData.java similarity index 92% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/SbeStorageMetaData.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/SbeStorageMetaData.java index c2bf61ba9..66654e20a 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/impl/SbeStorageMetaData.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/impl/SbeStorageMetaData.java @@ -14,19 +14,20 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage.impl; +package org.deeplearning4j.ui.model.storage.impl; import lombok.Data; import org.agrona.DirectBuffer; import org.agrona.MutableDirectBuffer; import org.agrona.concurrent.UnsafeBuffer; import org.apache.commons.io.IOUtils; -import org.deeplearning4j.ui.stats.impl.SbeUtil; -import org.deeplearning4j.ui.stats.sbe.MessageHeaderDecoder; -import org.deeplearning4j.ui.stats.sbe.MessageHeaderEncoder; -import org.deeplearning4j.ui.stats.sbe.StorageMetaDataDecoder; -import org.deeplearning4j.ui.stats.sbe.StorageMetaDataEncoder; -import org.deeplearning4j.ui.storage.AgronaPersistable; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.ui.model.stats.impl.SbeUtil; +import org.deeplearning4j.ui.model.stats.sbe.MessageHeaderDecoder; +import org.deeplearning4j.ui.model.stats.sbe.MessageHeaderEncoder; +import org.deeplearning4j.ui.model.stats.sbe.StorageMetaDataDecoder; +import org.deeplearning4j.ui.model.stats.sbe.StorageMetaDataEncoder; +import org.deeplearning4j.ui.model.storage.AgronaPersistable; import java.io.IOException; import java.io.InputStream; @@ -40,7 +41,7 @@ import java.nio.ByteBuffer; * @author Alex Black */ @Data -public class SbeStorageMetaData implements org.deeplearning4j.api.storage.StorageMetaData, AgronaPersistable { +public class SbeStorageMetaData implements StorageMetaData, AgronaPersistable { private long timeStamp; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/mapdb/MapDBStatsStorage.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/mapdb/MapDBStatsStorage.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/mapdb/MapDBStatsStorage.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/mapdb/MapDBStatsStorage.java index 5441a4f5b..307fe6a9f 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/mapdb/MapDBStatsStorage.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/mapdb/MapDBStatsStorage.java @@ -14,12 +14,14 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage.mapdb; +package org.deeplearning4j.ui.model.storage.mapdb; import lombok.Data; import lombok.NonNull; -import org.deeplearning4j.api.storage.*; -import org.deeplearning4j.ui.storage.BaseCollectionStatsStorage; +import org.deeplearning4j.core.storage.*; +import org.deeplearning4j.ui.model.storage.FileStatsStorage; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.storage.BaseCollectionStatsStorage; import org.mapdb.*; import java.io.File; @@ -33,7 +35,7 @@ import java.util.concurrent.locks.ReentrantLock; /** * An implementation of the {@link StatsStorage} interface, backed by MapDB (in-memory or file).
- * See also {@link org.deeplearning4j.ui.storage.InMemoryStatsStorage} and {@link org.deeplearning4j.ui.storage.FileStatsStorage} + * See also {@link InMemoryStatsStorage} and {@link FileStatsStorage} * * @author Alex Black */ diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/sqlite/J7FileStatsStorage.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/sqlite/J7FileStatsStorage.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/sqlite/J7FileStatsStorage.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/sqlite/J7FileStatsStorage.java index 2c91da607..5f33c6e01 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/storage/sqlite/J7FileStatsStorage.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/storage/sqlite/J7FileStatsStorage.java @@ -14,12 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.storage.sqlite; +package org.deeplearning4j.ui.model.storage.sqlite; import it.unimi.dsi.fastutil.longs.LongArrayList; import lombok.NonNull; -import org.deeplearning4j.api.storage.*; -import org.nd4j.linalg.primitives.Pair; +import org.deeplearning4j.core.storage.*; +import org.deeplearning4j.ui.model.storage.FileStatsStorage; +import org.nd4j.common.primitives.Pair; import java.io.*; import java.sql.*; @@ -27,9 +28,9 @@ import java.util.*; /** * A Java 7 compatible file-based {@link StatsStorage} implementation, based on SQLite. - * Note: Where possible, use {@link org.deeplearning4j.ui.storage.FileStatsStorage} which should be faster (is based + * Note: Where possible, use {@link FileStatsStorage} which should be faster (is based * on MapDB). - * Obviously, the storage formats for J7FileStatsStorage and {@link org.deeplearning4j.ui.storage.FileStatsStorage} are + * Obviously, the storage formats for J7FileStatsStorage and {@link FileStatsStorage} are * incompatible. * * @author Alex Black diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/weights/ConvolutionListenerPersistable.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/weights/ConvolutionListenerPersistable.java similarity index 97% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/weights/ConvolutionListenerPersistable.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/weights/ConvolutionListenerPersistable.java index 91c1de5ed..fa06cad27 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/weights/ConvolutionListenerPersistable.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/weights/ConvolutionListenerPersistable.java @@ -14,12 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.weights; +package org.deeplearning4j.ui.model.weights; import lombok.AllArgsConstructor; import lombok.Data; import org.apache.commons.compress.utils.IOUtils; -import org.deeplearning4j.api.storage.Persistable; +import org.deeplearning4j.core.storage.Persistable; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/weights/HistogramBin.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/weights/HistogramBin.java similarity index 99% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/weights/HistogramBin.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/weights/HistogramBin.java index 35f5436c4..c7e045dcc 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/weights/HistogramBin.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/weights/HistogramBin.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.weights; +package org.deeplearning4j.ui.model.weights; import lombok.Data; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/weights/beans/CompactModelAndGradient.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/weights/beans/CompactModelAndGradient.java similarity index 98% rename from deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/weights/beans/CompactModelAndGradient.java rename to deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/weights/beans/CompactModelAndGradient.java index fd3bc6cc4..f1442850b 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/weights/beans/CompactModelAndGradient.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/main/java/org/deeplearning4j/ui/model/weights/beans/CompactModelAndGradient.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.deeplearning4j.ui.weights.beans; +package org.deeplearning4j.ui.model.weights.beans; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/TestStorageMetaData.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/TestStorageMetaData.java index 6351e15fc..ca874e76b 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/TestStorageMetaData.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/TestStorageMetaData.java @@ -17,8 +17,8 @@ package org.deeplearning4j.ui; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.ui.storage.impl.SbeStorageMetaData; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.ui.model.storage.impl.SbeStorageMetaData; import org.junit.Test; import java.io.Serializable; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestStatsClasses.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestStatsClasses.java index 74ff75588..53ff426d6 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestStatsClasses.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestStatsClasses.java @@ -17,13 +17,13 @@ package org.deeplearning4j.ui.stats; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.ui.stats.api.*; -import org.deeplearning4j.ui.stats.impl.SbeStatsInitializationReport; -import org.deeplearning4j.ui.stats.impl.SbeStatsReport; -import org.deeplearning4j.ui.stats.impl.java.JavaStatsInitializationReport; +import org.deeplearning4j.ui.model.stats.api.*; +import org.deeplearning4j.ui.model.stats.impl.SbeStatsInitializationReport; +import org.deeplearning4j.ui.model.stats.impl.SbeStatsReport; +import org.deeplearning4j.ui.model.stats.impl.java.JavaStatsInitializationReport; import org.junit.Assert; import org.junit.Test; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.*; import java.util.ArrayList; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestStatsListener.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestStatsListener.java index 1991c17f5..e3ae2ad4e 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestStatsListener.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestStatsListener.java @@ -16,8 +16,8 @@ package org.deeplearning4j.ui.stats; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorage; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorage; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; @@ -25,7 +25,9 @@ import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.layers.OutputLayer; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.ui.storage.mapdb.MapDBStatsStorage; +import org.deeplearning4j.ui.model.stats.J7StatsListener; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.storage.mapdb.MapDBStatsStorage; import org.junit.Test; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.dataset.DataSet; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestTransferStatsCollection.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestTransferStatsCollection.java index 07916643a..90b84265d 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestTransferStatsCollection.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/stats/TestTransferStatsCollection.java @@ -24,7 +24,8 @@ import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.transferlearning.FineTuneConfiguration; import org.deeplearning4j.nn.transferlearning.TransferLearning; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.ui.storage.FileStatsStorage; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.storage.FileStatsStorage; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -35,7 +36,6 @@ import org.nd4j.linalg.learning.config.Sgd; import java.io.File; import java.io.IOException; -import java.nio.file.Files; /** * Created by Alex on 07/04/2017. diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/storage/TestStatsStorage.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/storage/TestStatsStorage.java index 58ed7f27d..adf379f59 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/storage/TestStatsStorage.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui-model/src/test/java/org/deeplearning4j/ui/storage/TestStatsStorage.java @@ -18,20 +18,20 @@ package org.deeplearning4j.ui.storage; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; -import org.deeplearning4j.api.storage.StatsStorageListener; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorageListener; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.ui.stats.api.StatsInitializationReport; -import org.deeplearning4j.ui.stats.api.StatsReport; -import org.deeplearning4j.ui.stats.impl.SbeStatsInitializationReport; -import org.deeplearning4j.ui.stats.impl.SbeStatsReport; -import org.deeplearning4j.ui.stats.impl.java.JavaStatsInitializationReport; -import org.deeplearning4j.ui.stats.impl.java.JavaStatsReport; -import org.deeplearning4j.ui.storage.mapdb.MapDBStatsStorage; -import org.deeplearning4j.ui.storage.sqlite.J7FileStatsStorage; +import org.deeplearning4j.ui.model.stats.api.StatsInitializationReport; +import org.deeplearning4j.ui.model.stats.api.StatsReport; +import org.deeplearning4j.ui.model.stats.impl.SbeStatsInitializationReport; +import org.deeplearning4j.ui.model.stats.impl.SbeStatsReport; +import org.deeplearning4j.ui.model.stats.impl.java.JavaStatsInitializationReport; +import org.deeplearning4j.ui.model.stats.impl.java.JavaStatsReport; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.storage.mapdb.MapDBStatsStorage; +import org.deeplearning4j.ui.model.storage.sqlite.J7FileStatsStorage; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -39,7 +39,6 @@ import org.junit.rules.TemporaryFolder; import java.io.File; import java.io.IOException; -import java.nio.file.Files; import java.util.*; import static org.junit.Assert.*; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/main/java/org/deeplearning4j/ui/weights/ConvolutionalIterationListener.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/main/java/org/deeplearning4j/ui/weights/ConvolutionalIterationListener.java index 1c12af527..87444f214 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/main/java/org/deeplearning4j/ui/weights/ConvolutionalIterationListener.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/main/java/org/deeplearning4j/ui/weights/ConvolutionalIterationListener.java @@ -20,21 +20,22 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.datavec.image.loader.ImageLoader; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageRouter; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.optimize.api.BaseTrainingListener; import org.deeplearning4j.ui.api.UIServer; -import org.deeplearning4j.ui.UiConnectionInfo; -import org.deeplearning4j.ui.storage.mapdb.MapDBStatsStorage; -import org.deeplearning4j.util.UIDProvider; +import org.deeplearning4j.core.ui.UiConnectionInfo; +import org.deeplearning4j.ui.model.storage.mapdb.MapDBStatsStorage; +import org.deeplearning4j.core.util.UIDProvider; +import org.deeplearning4j.ui.model.weights.ConvolutionListenerPersistable; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JArraySizeException; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/ApiTest.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/ApiTest.java index 07735fa78..3474d7d71 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/ApiTest.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/ApiTest.java @@ -24,8 +24,8 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.resources.Resources; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.resources.Resources; import java.io.File; import java.util.List; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/ManualTests.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/ManualTests.java index a489dc854..c45e5c509 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/ManualTests.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/ManualTests.java @@ -48,6 +48,7 @@ import org.deeplearning4j.ui.api.UIServer; import org.deeplearning4j.ui.weights.ConvolutionalIterationListener; import org.junit.Ignore; import org.junit.Test; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.buffer.util.DataTypeUtil; @@ -60,7 +61,7 @@ import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.learning.config.AdaGrad; import org.nd4j.linalg.learning.config.Nesterovs; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -115,7 +116,7 @@ public class ManualTests { - org.nd4j.linalg.io.ClassPathResource labels = new org.nd4j.linalg.io.ClassPathResource("mnist2500_labels.txt"); + ClassPathResource labels = new ClassPathResource("mnist2500_labels.txt"); List labelsList = IOUtils.readLines(labels.getInputStream()).subList(0, 100); b.fit(data); File save = new File(System.getProperty("java.io.tmpdir"), "labels-" + UUID.randomUUID().toString()); diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/weights/HistogramBinTest.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/weights/HistogramBinTest.java index 7673d6d92..3794d0ce9 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/weights/HistogramBinTest.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-ui/src/test/java/org/deeplearning4j/ui/weights/HistogramBinTest.java @@ -16,6 +16,7 @@ package org.deeplearning4j.ui.weights; +import org.deeplearning4j.ui.model.weights.HistogramBin; import org.junit.Before; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/VertxUIServer.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/VertxUIServer.java index 77382d6f4..e42c60f9e 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/VertxUIServer.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/VertxUIServer.java @@ -1,4 +1,4 @@ -/* ****************************************************************************** + /* ****************************************************************************** * Copyright (c) 2019 Konduit K.K. * * This program and the accompanying materials are made available under the @@ -32,11 +32,11 @@ import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; -import org.deeplearning4j.api.storage.StatsStorageListener; -import org.deeplearning4j.api.storage.StatsStorageRouter; -import org.deeplearning4j.config.DL4JSystemProperties; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorageListener; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.common.config.DL4JSystemProperties; import org.deeplearning4j.exception.DL4JException; import org.deeplearning4j.ui.api.Route; import org.deeplearning4j.ui.api.UIModule; @@ -48,12 +48,12 @@ import org.deeplearning4j.ui.module.defaultModule.DefaultModule; import org.deeplearning4j.ui.module.remote.RemoteReceiverModule; import org.deeplearning4j.ui.module.train.TrainModule; import org.deeplearning4j.ui.module.tsne.TsneModule; -import org.deeplearning4j.ui.storage.FileStatsStorage; -import org.deeplearning4j.ui.storage.InMemoryStatsStorage; -import org.deeplearning4j.ui.storage.impl.QueueStatsStorageListener; -import org.deeplearning4j.util.DL4JFileUtils; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.primitives.Pair; +import org.deeplearning4j.ui.model.storage.FileStatsStorage; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.storage.impl.QueueStatsStorageListener; +import org.deeplearning4j.common.util.DL4JFileUtils; +import org.nd4j.common.function.Function; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.util.*; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/api/UIModule.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/api/UIModule.java index b35ae537a..0a2ca40c3 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/api/UIModule.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/api/UIModule.java @@ -17,8 +17,8 @@ package org.deeplearning4j.ui.api; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; import org.deeplearning4j.ui.i18n.I18NResource; import java.util.Collection; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/api/UIServer.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/api/UIServer.java index e287111c2..81180990f 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/api/UIServer.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/api/UIServer.java @@ -18,11 +18,12 @@ package org.deeplearning4j.ui.api; import io.vertx.core.Promise; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageRouter; +import org.deeplearning4j.core.storage.impl.RemoteUIStatsStorageRouter; import org.deeplearning4j.exception.DL4JException; import org.deeplearning4j.ui.VertxUIServer; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.List; @@ -127,7 +128,7 @@ public interface UIServer { /** * Enable the remote listener functionality, storing all data in memory, and attaching the instance to the UI. - * Typically used with {@link org.deeplearning4j.api.storage.impl.RemoteUIStatsStorageRouter}, which will send information + * Typically used with {@link RemoteUIStatsStorageRouter}, which will send information * remotely to this UI instance * * @see #enableRemoteListener(StatsStorageRouter, boolean) diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/i18n/I18NResource.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/i18n/I18NResource.java index 5558d7dbd..119dba718 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/i18n/I18NResource.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/i18n/I18NResource.java @@ -19,7 +19,7 @@ package org.deeplearning4j.ui.i18n; import lombok.AllArgsConstructor; import lombok.Data; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; import java.io.InputStream; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/SameDiffModule.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/SameDiffModule.java index b385ec72c..ed187f366 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/SameDiffModule.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/SameDiffModule.java @@ -16,8 +16,8 @@ package org.deeplearning4j.ui.module; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; import org.deeplearning4j.ui.api.HttpMethod; import org.deeplearning4j.ui.api.Route; import org.deeplearning4j.ui.api.UIModule; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/convolutional/ConvolutionalListenerModule.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/convolutional/ConvolutionalListenerModule.java index 3236e9b2f..6818e5492 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/convolutional/ConvolutionalListenerModule.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/convolutional/ConvolutionalListenerModule.java @@ -20,15 +20,15 @@ package org.deeplearning4j.ui.module.convolutional; import io.vertx.core.buffer.Buffer; import io.vertx.ext.web.RoutingContext; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; -import org.deeplearning4j.api.storage.StatsStorageListener; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorageListener; import org.deeplearning4j.ui.api.HttpMethod; import org.deeplearning4j.ui.api.Route; import org.deeplearning4j.ui.api.UIModule; import org.deeplearning4j.ui.i18n.I18NResource; -import org.deeplearning4j.ui.weights.ConvolutionListenerPersistable; +import org.deeplearning4j.ui.model.weights.ConvolutionListenerPersistable; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/defaultModule/DefaultModule.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/defaultModule/DefaultModule.java index 1acf29b75..7c637b5dd 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/defaultModule/DefaultModule.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/defaultModule/DefaultModule.java @@ -17,8 +17,8 @@ package org.deeplearning4j.ui.module.defaultModule; import io.netty.handler.codec.http.HttpResponseStatus; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; import org.deeplearning4j.ui.api.HttpMethod; import org.deeplearning4j.ui.api.Route; import org.deeplearning4j.ui.api.UIModule; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/remote/RemoteReceiverModule.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/remote/RemoteReceiverModule.java index 53cc29be3..baee006fe 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/remote/RemoteReceiverModule.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/remote/RemoteReceiverModule.java @@ -22,7 +22,8 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.vertx.core.json.JsonObject; import io.vertx.ext.web.RoutingContext; import lombok.extern.slf4j.Slf4j; -import org.deeplearning4j.api.storage.*; +import org.deeplearning4j.core.storage.*; +import org.deeplearning4j.core.storage.impl.RemoteUIStatsStorageRouter; import org.deeplearning4j.ui.api.HttpMethod; import org.deeplearning4j.ui.api.Route; import org.deeplearning4j.ui.api.UIModule; @@ -38,7 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * * Used to receive UI updates remotely. - * Used in conjunction with {@link org.deeplearning4j.api.storage.impl.RemoteUIStatsStorageRouter}, which posts to the UI. + * Used in conjunction with {@link RemoteUIStatsStorageRouter}, which posts to the UI. * UI information is then deserialized and routed to the specified StatsStorageRouter, which may (or may not) * be attached to the UI * diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/train/TrainModule.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/train/TrainModule.java index f90360d26..82cf33b77 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/train/TrainModule.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/train/TrainModule.java @@ -31,11 +31,11 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; -import org.deeplearning4j.api.storage.StatsStorageListener; -import org.deeplearning4j.config.DL4JSystemProperties; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorageListener; +import org.deeplearning4j.common.config.DL4JSystemProperties; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; @@ -50,17 +50,17 @@ import org.deeplearning4j.ui.api.UIModule; import org.deeplearning4j.ui.i18n.DefaultI18N; import org.deeplearning4j.ui.i18n.I18NProvider; import org.deeplearning4j.ui.i18n.I18NResource; -import org.deeplearning4j.ui.stats.StatsListener; -import org.deeplearning4j.ui.stats.api.Histogram; -import org.deeplearning4j.ui.stats.api.StatsInitializationReport; -import org.deeplearning4j.ui.stats.api.StatsReport; -import org.deeplearning4j.ui.stats.api.StatsType; -import org.nd4j.linalg.function.Function; -import org.nd4j.linalg.function.Supplier; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.stats.api.Histogram; +import org.deeplearning4j.ui.model.stats.api.StatsInitializationReport; +import org.deeplearning4j.ui.model.stats.api.StatsReport; +import org.deeplearning4j.ui.model.stats.api.StatsType; +import org.nd4j.common.function.Function; +import org.nd4j.common.function.Supplier; import org.nd4j.linalg.learning.config.IUpdater; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; -import org.nd4j.resources.Resources; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; +import org.nd4j.common.resources.Resources; import org.nd4j.shade.jackson.core.JsonProcessingException; import java.io.File; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java index 627a2b94b..96029e01f 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java @@ -21,8 +21,8 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.vertx.ext.web.FileUpload; import io.vertx.ext.web.RoutingContext; import org.apache.commons.io.FileUtils; -import org.deeplearning4j.api.storage.StatsStorage; -import org.deeplearning4j.api.storage.StatsStorageEvent; +import org.deeplearning4j.core.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorageEvent; import org.deeplearning4j.nn.conf.serde.JsonMappers; import org.deeplearning4j.ui.api.HttpMethod; import org.deeplearning4j.ui.api.Route; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestRemoteReceiver.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestRemoteReceiver.java index 0b81e45b4..b173f1a8c 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestRemoteReceiver.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestRemoteReceiver.java @@ -18,10 +18,10 @@ package org.deeplearning4j.ui; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.api.storage.Persistable; -import org.deeplearning4j.api.storage.StorageMetaData; -import org.deeplearning4j.api.storage.impl.CollectionStatsStorageRouter; -import org.deeplearning4j.api.storage.impl.RemoteUIStatsStorageRouter; +import org.deeplearning4j.core.storage.Persistable; +import org.deeplearning4j.core.storage.StorageMetaData; +import org.deeplearning4j.core.storage.impl.CollectionStatsStorageRouter; +import org.deeplearning4j.core.storage.impl.RemoteUIStatsStorageRouter; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; @@ -31,10 +31,10 @@ import org.deeplearning4j.nn.conf.layers.OutputLayer; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.optimize.listeners.ScoreIterationListener; import org.deeplearning4j.ui.api.UIServer; -import org.deeplearning4j.ui.stats.StatsListener; -import org.deeplearning4j.ui.stats.impl.SbeStatsInitializationReport; -import org.deeplearning4j.ui.stats.impl.SbeStatsReport; -import org.deeplearning4j.ui.storage.impl.SbeStorageMetaData; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.stats.impl.SbeStatsInitializationReport; +import org.deeplearning4j.ui.model.stats.impl.SbeStatsReport; +import org.deeplearning4j.ui.model.storage.impl.SbeStorageMetaData; import org.junit.Ignore; import org.junit.Test; import org.nd4j.linalg.activations.Activation; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUI.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUI.java index 7f11ef970..f7dc6f079 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUI.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUI.java @@ -23,7 +23,7 @@ import io.vertx.core.Vertx; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.api.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorage; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.exception.DL4JException; import org.deeplearning4j.nn.api.OptimizationAlgorithm; @@ -40,14 +40,14 @@ import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; import org.deeplearning4j.optimize.listeners.ScoreIterationListener; import org.deeplearning4j.ui.api.UIServer; -import org.deeplearning4j.ui.stats.StatsListener; -import org.deeplearning4j.ui.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUIManual.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUIManual.java index befd8a093..c47abbe61 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUIManual.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUIManual.java @@ -5,7 +5,7 @@ import io.vertx.core.Future; import io.vertx.core.Promise; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.api.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorage; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; @@ -16,13 +16,13 @@ import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; import org.deeplearning4j.optimize.listeners.ScoreIterationListener; import org.deeplearning4j.ui.api.UIServer; -import org.deeplearning4j.ui.stats.StatsListener; -import org.deeplearning4j.ui.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; import org.junit.Ignore; import org.junit.Test; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import org.nd4j.linalg.learning.config.Sgd; import org.nd4j.linalg.lossfunctions.LossFunctions; diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUIMultiSession.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUIMultiSession.java index e4545ce55..c9577d4a3 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUIMultiSession.java +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUIMultiSession.java @@ -20,7 +20,7 @@ package org.deeplearning4j.ui; import io.netty.handler.codec.http.HttpResponseStatus; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.BaseDL4JTest; -import org.deeplearning4j.api.storage.StatsStorage; +import org.deeplearning4j.core.storage.StatsStorage; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; import org.deeplearning4j.exception.DL4JException; import org.deeplearning4j.nn.api.OptimizationAlgorithm; @@ -31,14 +31,14 @@ import org.deeplearning4j.nn.conf.layers.OutputLayer; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.optimize.listeners.ScoreIterationListener; import org.deeplearning4j.ui.api.UIServer; -import org.deeplearning4j.ui.stats.StatsListener; -import org.deeplearning4j.ui.storage.InMemoryStatsStorage; +import org.deeplearning4j.ui.model.stats.StatsListener; +import org.deeplearning4j.ui.model.storage.InMemoryStatsStorage; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.lossfunctions.LossFunctions; diff --git a/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/model/NASNet.java b/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/model/NASNet.java index 748f124da..40a839830 100644 --- a/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/model/NASNet.java +++ b/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/model/NASNet.java @@ -22,9 +22,6 @@ import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.*; -import org.deeplearning4j.nn.conf.distribution.Distribution; -import org.deeplearning4j.nn.conf.distribution.NormalDistribution; -import org.deeplearning4j.nn.conf.distribution.TruncatedNormalDistribution; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.conf.layers.*; import org.deeplearning4j.nn.graph.ComputationGraph; @@ -37,7 +34,7 @@ import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.learning.config.AdaDelta; import org.nd4j.linalg.learning.config.IUpdater; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import static org.deeplearning4j.zoo.model.helper.NASNetHelper.normalA; import static org.deeplearning4j.zoo.model.helper.NASNetHelper.reductionA; diff --git a/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/model/helper/NASNetHelper.java b/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/model/helper/NASNetHelper.java index ecd20690f..1b6a1063a 100644 --- a/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/model/helper/NASNetHelper.java +++ b/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/model/helper/NASNetHelper.java @@ -26,7 +26,7 @@ import org.deeplearning4j.nn.conf.layers.*; import org.deeplearning4j.nn.conf.layers.convolutional.Cropping2D; import org.deeplearning4j.zoo.model.NASNet; import org.nd4j.linalg.activations.Activation; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Map; diff --git a/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/util/BaseLabels.java b/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/util/BaseLabels.java index d2e86fe94..bcca7c1b1 100644 --- a/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/util/BaseLabels.java +++ b/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/util/BaseLabels.java @@ -18,10 +18,10 @@ package org.deeplearning4j.zoo.util; import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.common.resources.ResourceType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.resources.Downloader; +import org.nd4j.common.resources.Downloader; import java.io.*; import java.net.URL; diff --git a/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/util/imagenet/ImageNetLabels.java b/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/util/imagenet/ImageNetLabels.java index 2889f6720..9006b99c7 100644 --- a/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/util/imagenet/ImageNetLabels.java +++ b/deeplearning4j/deeplearning4j-zoo/src/main/java/org/deeplearning4j/zoo/util/imagenet/ImageNetLabels.java @@ -18,7 +18,7 @@ package org.deeplearning4j.zoo.util.imagenet; import org.deeplearning4j.common.resources.DL4JResources; import org.deeplearning4j.zoo.util.BaseLabels; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.shade.jackson.databind.ObjectMapper; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/IntegrationTestBaselineGenerator.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/IntegrationTestBaselineGenerator.java index 01b3b2e53..51caaf21f 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/IntegrationTestBaselineGenerator.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/IntegrationTestBaselineGenerator.java @@ -20,7 +20,6 @@ package org.deeplearning4j.integration; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.deeplearning4j.datasets.iterator.MultiDataSetWrapperIterator; -import org.deeplearning4j.integration.testcases.dl4j.*; import org.deeplearning4j.integration.testcases.samediff.SameDiffCNNCases; import org.deeplearning4j.integration.testcases.samediff.SameDiffMLPTestCases; import org.deeplearning4j.integration.testcases.samediff.SameDiffRNNTestCases; @@ -35,14 +34,14 @@ import org.nd4j.autodiff.listeners.records.History; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.VariableType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.guava.io.Files; import java.io.*; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/IntegrationTestRunner.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/IntegrationTestRunner.java index cd1a36493..618184824 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/IntegrationTestRunner.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/IntegrationTestRunner.java @@ -46,7 +46,7 @@ import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.VariableType; import org.nd4j.autodiff.samediff.internal.SameDiffOp; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.classification.*; import org.nd4j.evaluation.regression.RegressionEvaluation; @@ -62,8 +62,8 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.BooleanIndexing; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.resources.Resources; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.resources.Resources; import org.nd4j.shade.guava.collect.ImmutableSet; import org.nd4j.shade.guava.reflect.ClassPath; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/TestCase.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/TestCase.java index 69e6ab0d9..ab1347699 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/TestCase.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/TestCase.java @@ -24,7 +24,7 @@ import org.nd4j.evaluation.IEvaluation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.util.List; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN1DTestCases.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN1DTestCases.java index 379d03356..e30adc52b 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN1DTestCases.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN1DTestCases.java @@ -18,7 +18,6 @@ package org.deeplearning4j.integration.testcases.dl4j; import org.deeplearning4j.datasets.iterator.EarlyTerminationDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.integration.ModelType; import org.deeplearning4j.integration.TestCase; import org.deeplearning4j.integration.testcases.dl4j.misc.CharacterIterator; @@ -28,18 +27,19 @@ import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.conf.layers.*; import org.deeplearning4j.nn.conf.layers.convolutional.Cropping1D; import org.deeplearning4j.nn.weights.WeightInit; +import org.nd4j.common.primitives.Pair; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.classification.Evaluation; import org.nd4j.evaluation.classification.ROCMultiClass; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; import java.util.Collections; import java.util.List; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN2DTestCases.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN2DTestCases.java index b857b2fb2..baebf6b45 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN2DTestCases.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN2DTestCases.java @@ -28,7 +28,6 @@ import org.deeplearning4j.integration.TestCase; import org.deeplearning4j.datasets.fetchers.DataSetType; import org.deeplearning4j.datasets.iterator.EarlyTerminationDataSetIterator; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.datasets.iterator.impl.TinyImageNetDataSetIterator; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.api.OptimizationAlgorithm; @@ -53,6 +52,7 @@ import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; @@ -62,7 +62,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.Nesterovs; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.util.*; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN3DTestCases.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN3DTestCases.java index 1192e7893..f22237faa 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN3DTestCases.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/CNN3DTestCases.java @@ -38,7 +38,7 @@ import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Nesterovs; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collections; import java.util.List; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/MLPTestCases.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/MLPTestCases.java index 4264531aa..a2f86477e 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/MLPTestCases.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/MLPTestCases.java @@ -25,7 +25,6 @@ import org.datavec.api.split.FileSplit; import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator; import org.deeplearning4j.datasets.iterator.EarlyTerminationDataSetIterator; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.inputs.InputType; @@ -41,14 +40,15 @@ import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.Nesterovs; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.schedule.MapSchedule; import org.nd4j.linalg.schedule.ScheduleType; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/RNNTestCases.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/RNNTestCases.java index 29f382735..de9209c23 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/RNNTestCases.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/RNNTestCases.java @@ -23,6 +23,7 @@ import org.nd4j.evaluation.classification.Evaluation; import org.nd4j.evaluation.classification.EvaluationCalibration; import org.nd4j.evaluation.classification.ROCMultiClass; import org.nd4j.linalg.api.buffer.DataType; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.preprocessor.CompositeMultiDataSetPreProcessor; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.shade.guava.io.Files; @@ -33,7 +34,6 @@ import org.datavec.api.records.reader.impl.csv.CSVSequenceRecordReader; import org.datavec.api.split.NumberedFileInputSplit; import org.deeplearning4j.datasets.datavec.SequenceRecordReaderDataSetIterator; import org.deeplearning4j.datasets.iterator.EarlyTerminationDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.nn.conf.BackpropType; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; import org.deeplearning4j.nn.conf.inputs.InputType; @@ -50,11 +50,10 @@ import org.nd4j.linalg.dataset.api.preprocessor.MultiDataNormalization; import org.nd4j.linalg.dataset.api.preprocessor.MultiNormalizerMinMaxScaler; import org.nd4j.linalg.dataset.api.preprocessor.MultiNormalizerStandardize; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.learning.config.Adam; -import org.nd4j.linalg.learning.config.RmsProp; import org.nd4j.linalg.lossfunctions.LossFunctions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.util.Collections; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/UnsupervisedTestCases.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/UnsupervisedTestCases.java index b627f06dc..f10dff828 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/UnsupervisedTestCases.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/dl4j/UnsupervisedTestCases.java @@ -20,7 +20,6 @@ package org.deeplearning4j.integration.testcases.dl4j; import org.deeplearning4j.datasets.iterator.EarlyTerminationDataSetIterator; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.integration.ModelType; import org.deeplearning4j.integration.TestCase; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; @@ -30,10 +29,11 @@ import org.deeplearning4j.nn.weights.WeightInit; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.learning.config.Adam; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffCNNCases.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffCNNCases.java index 74c4f3bfb..81b1b87ff 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffCNNCases.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffCNNCases.java @@ -17,7 +17,6 @@ package org.deeplearning4j.integration.testcases.samediff; import org.deeplearning4j.datasets.iterator.EarlyTerminationDataSetIterator; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.datasets.iterator.impl.SingletonMultiDataSetIterator; import org.deeplearning4j.integration.ModelType; import org.deeplearning4j.integration.TestCase; @@ -34,6 +33,7 @@ import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv3DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Pooling2DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Pooling3DConfig; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffMLPTestCases.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffMLPTestCases.java index 9761c87b0..3f7dda540 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffMLPTestCases.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffMLPTestCases.java @@ -21,11 +21,8 @@ import org.datavec.api.split.FileSplit; import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator; import org.deeplearning4j.datasets.iterator.EarlyTerminationDataSetIterator; import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; -import org.deeplearning4j.datasets.iterator.impl.SingletonMultiDataSetIterator; import org.deeplearning4j.integration.ModelType; import org.deeplearning4j.integration.TestCase; -import org.nd4j.autodiff.loss.LossReduce; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.TrainingConfig; @@ -35,26 +32,19 @@ import org.nd4j.evaluation.classification.EvaluationCalibration; import org.nd4j.evaluation.classification.ROCMultiClass; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; -import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv3DConfig; -import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Pooling2DConfig; -import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Pooling3DConfig; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.learning.config.Nesterovs; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.util.*; -import static org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig.*; - public class SameDiffMLPTestCases { diff --git a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffRNNTestCases.java b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffRNNTestCases.java index 6bc6254c9..9e2890455 100644 --- a/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffRNNTestCases.java +++ b/deeplearning4j/dl4j-integration-tests/src/test/java/org/deeplearning4j/integration/testcases/samediff/SameDiffRNNTestCases.java @@ -19,7 +19,6 @@ import org.datavec.api.records.reader.SequenceRecordReader; import org.datavec.api.records.reader.impl.csv.CSVSequenceRecordReader; import org.datavec.api.split.NumberedFileInputSplit; import org.deeplearning4j.datasets.datavec.SequenceRecordReaderDataSetIterator; -import org.deeplearning4j.datasets.iterator.impl.MultiDataSetIteratorAdapter; import org.deeplearning4j.integration.ModelType; import org.deeplearning4j.integration.TestCase; import org.nd4j.autodiff.samediff.SDVariable; @@ -37,6 +36,7 @@ import org.nd4j.linalg.api.ops.impl.layers.recurrent.config.LSTMDirectionMode; import org.nd4j.linalg.api.ops.impl.layers.recurrent.config.LSTMLayerConfig; import org.nd4j.linalg.api.ops.impl.layers.recurrent.outputs.LSTMLayerOutputs; import org.nd4j.linalg.api.ops.impl.layers.recurrent.weights.LSTMLayerWeights; +import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.MultiDataSetPreProcessor; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; @@ -47,7 +47,7 @@ import org.nd4j.linalg.dataset.api.preprocessor.MultiNormalizerStandardize; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.learning.config.Adam; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import org.nd4j.shade.guava.io.Files; import java.io.File; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/execution/input/Operands.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/execution/input/Operands.java index 488b48edb..7022cfb0b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/execution/input/Operands.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/execution/input/Operands.java @@ -18,7 +18,7 @@ package org.nd4j.autodiff.execution.input; import lombok.*; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java index a4a2111a5..54707887f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java @@ -25,7 +25,7 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.serde.FlatBuffersMapper; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.descriptors.properties.AttributeAdapter; import org.nd4j.imports.descriptors.properties.PropertyMapping; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/ListenerEvaluations.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/ListenerEvaluations.java index 9bdc54dd7..256bdb4a6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/ListenerEvaluations.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/ListenerEvaluations.java @@ -22,13 +22,12 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.NonNull; import lombok.Setter; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/Loss.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/Loss.java index c67f8bd45..d95f662bf 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/Loss.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/Loss.java @@ -5,7 +5,7 @@ import java.util.Collections; import lombok.Data; import lombok.NonNull; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/checkpoint/CheckpointListener.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/checkpoint/CheckpointListener.java index 7dbb0119d..c15db7e08 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/checkpoint/CheckpointListener.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/checkpoint/CheckpointListener.java @@ -12,7 +12,7 @@ import org.nd4j.autodiff.listeners.Loss; import org.nd4j.autodiff.listeners.records.LossCurve; import org.nd4j.autodiff.listeners.Operation; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.dataset.api.MultiDataSet; import java.io.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/debugging/ArraySavingListener.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/debugging/ArraySavingListener.java index 9770dc50c..2a9c6e9ad 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/debugging/ArraySavingListener.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/debugging/ArraySavingListener.java @@ -6,7 +6,7 @@ import org.nd4j.autodiff.listeners.BaseListener; import org.nd4j.autodiff.listeners.Operation; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.internal.SameDiffOp; -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.OpContext; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/debugging/OpBenchmarkListener.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/debugging/OpBenchmarkListener.java index 621a93d30..703559729 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/debugging/OpBenchmarkListener.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/debugging/OpBenchmarkListener.java @@ -12,7 +12,7 @@ import org.nd4j.linalg.api.ops.Op; import org.nd4j.linalg.api.ops.OpContext; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.text.DecimalFormat; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/impl/ScoreListener.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/impl/ScoreListener.java index 90d8f5739..9bb0c7de3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/impl/ScoreListener.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/impl/ScoreListener.java @@ -8,7 +8,7 @@ import org.nd4j.autodiff.listeners.Loss; import org.nd4j.autodiff.listeners.records.LossCurve; import org.nd4j.autodiff.listeners.Operation; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.dataset.api.MultiDataSet; import java.text.DecimalFormat; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/impl/UIListener.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/impl/UIListener.java index b4f3a371b..2cd544508 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/impl/UIListener.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/impl/UIListener.java @@ -12,7 +12,7 @@ import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.internal.SameDiffOp; import org.nd4j.autodiff.samediff.internal.Variable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.classification.Evaluation; import org.nd4j.graph.UIGraphStructure; import org.nd4j.graph.UIInfoType; @@ -22,7 +22,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.OpContext; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.learning.config.IUpdater; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/ProfilingListener.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/ProfilingListener.java index 3dc21876e..57de9f2e9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/ProfilingListener.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/ProfilingListener.java @@ -26,15 +26,11 @@ import org.nd4j.autodiff.listeners.profiler.data.Phase; import org.nd4j.autodiff.listeners.profiler.data.TraceEvent; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.internal.SameDiffOp; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.api.ops.Op; import org.nd4j.linalg.api.ops.OpContext; import org.nd4j.linalg.dataset.api.MultiDataSet; -import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.AtomicBoolean; import org.nd4j.shade.jackson.databind.DeserializationFeature; import org.nd4j.shade.jackson.databind.MapperFeature; import org.nd4j.shade.jackson.databind.ObjectMapper; @@ -42,10 +38,8 @@ import org.nd4j.shade.jackson.databind.SerializationFeature; import java.io.*; import java.lang.management.ManagementFactory; -import java.text.DecimalFormat; import java.util.*; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.LinkedBlockingDeque; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/comparison/Config.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/comparison/Config.java index 602a26f99..f174bfe4f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/comparison/Config.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/comparison/Config.java @@ -18,7 +18,7 @@ package org.nd4j.autodiff.listeners.profiler.comparison; import lombok.Builder; import lombok.Data; import lombok.experimental.Accessors; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import java.io.File; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/comparison/ProfileAnalyzer.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/comparison/ProfileAnalyzer.java index 5c7038e26..c60ebe20a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/comparison/ProfileAnalyzer.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/profiler/comparison/ProfileAnalyzer.java @@ -23,11 +23,11 @@ import org.nd4j.autodiff.listeners.profiler.ProfilingListener; import org.nd4j.autodiff.listeners.profiler.data.Phase; import org.nd4j.autodiff.listeners.profiler.data.TraceEvent; import org.nd4j.autodiff.listeners.profiler.data.TraceEvents; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.list.NDArrayList; import org.nd4j.shade.jackson.databind.ObjectMapper; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/EvaluationRecord.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/EvaluationRecord.java index 149ea5f2c..1f05469c4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/EvaluationRecord.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/EvaluationRecord.java @@ -21,7 +21,6 @@ import org.nd4j.shade.guava.collect.Collections2; import org.nd4j.shade.guava.collect.ImmutableMap; import org.nd4j.shade.guava.collect.Lists; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -30,7 +29,7 @@ import java.util.Map; import lombok.Getter; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.IMetric; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/History.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/History.java index 809400c0b..c4bb830a4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/History.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/History.java @@ -24,7 +24,7 @@ import lombok.Getter; import org.nd4j.autodiff.listeners.Listener; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.IMetric; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/LossCurve.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/LossCurve.java index f3f24b98a..4d7300c62 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/LossCurve.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/listeners/records/LossCurve.java @@ -23,7 +23,7 @@ import lombok.Getter; import lombok.NonNull; import org.nd4j.autodiff.listeners.Loss; import org.nd4j.autodiff.samediff.SDVariable; -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.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/SDVariable.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/SDVariable.java index 5ee0801d0..d78c6b5b3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/SDVariable.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/SDVariable.java @@ -21,19 +21,18 @@ import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.autodiff.samediff.internal.SameDiffOp; import org.nd4j.autodiff.samediff.internal.Variable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.blas.params.MMulTranspose; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.LongShapeDescriptor; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.weightinit.WeightInitScheme; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Map; -import java.util.Objects; /** * diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/SameDiff.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/SameDiff.java index 77d46b889..1535ed105 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/SameDiff.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/SameDiff.java @@ -38,7 +38,7 @@ import org.nd4j.autodiff.samediff.config.OutputConfig; import org.nd4j.autodiff.samediff.internal.*; import org.nd4j.autodiff.samediff.ops.*; import org.nd4j.autodiff.samediff.serde.FlatBuffersMapper; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.classification.Evaluation; import org.nd4j.evaluation.classification.ROC; @@ -72,10 +72,10 @@ import org.nd4j.linalg.exception.ND4UnresolvedOutputVariables; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.GradientUpdater; import org.nd4j.linalg.learning.regularization.Regularization; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; -import org.nd4j.linalg.util.ND4JFileUtils; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; +import org.nd4j.common.util.ND4JFileUtils; import org.nd4j.shade.guava.collect.HashBasedTable; import org.nd4j.shade.guava.collect.Sets; import org.nd4j.shade.guava.collect.Table; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/TrainingConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/TrainingConfig.java index 25aec0028..70c962781 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/TrainingConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/TrainingConfig.java @@ -18,7 +18,7 @@ package org.nd4j.autodiff.samediff; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; import org.nd4j.linalg.learning.config.IUpdater; import org.nd4j.linalg.learning.regularization.L1Regularization; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/BatchOutputConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/BatchOutputConfig.java index ffa0c5f85..a0a3dd503 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/BatchOutputConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/BatchOutputConfig.java @@ -28,12 +28,8 @@ import lombok.Setter; import org.nd4j.autodiff.listeners.Listener; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.autodiff.samediff.VariableType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; -import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; -import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; /** * Configuration for a single batch {@link SameDiff} inference operation. diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/EvaluationConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/EvaluationConfig.java index 389e14306..b77e13c8d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/EvaluationConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/EvaluationConfig.java @@ -29,7 +29,7 @@ import org.nd4j.autodiff.listeners.Listener; import org.nd4j.autodiff.listeners.records.EvaluationRecord; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.IEvaluation; import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/FitConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/FitConfig.java index 8386c05e6..8932a563f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/FitConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/FitConfig.java @@ -28,7 +28,7 @@ import org.nd4j.autodiff.listeners.records.History; import org.nd4j.autodiff.listeners.Listener; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.TrainingConfig; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.MultiDataSetIterator; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/OutputConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/OutputConfig.java index 193229ff9..97f80490a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/OutputConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/config/OutputConfig.java @@ -28,7 +28,7 @@ import org.nd4j.autodiff.listeners.Listener; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.util.SameDiffUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.adapter.MultiDataSetIteratorAdapter; import org.nd4j.linalg.dataset.adapter.SingletonMultiDataSetIterator; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/AbstractDependencyTracker.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/AbstractDependencyTracker.java index 1faea9c66..5496df7a1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/AbstractDependencyTracker.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/AbstractDependencyTracker.java @@ -3,9 +3,9 @@ package org.nd4j.autodiff.samediff.internal; import lombok.Getter; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.function.Predicate; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.function.Predicate; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/AbstractSession.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/AbstractSession.java index a6273e0b3..5e2e7a4de 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/AbstractSession.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/AbstractSession.java @@ -24,11 +24,10 @@ import org.nd4j.autodiff.listeners.Listener; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.VariableType; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.api.ndarray.INDArray; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ops.impl.controlflow.compat.*; import org.nd4j.linalg.dataset.api.MultiDataSet; -import org.nd4j.linalg.function.Predicate; +import org.nd4j.common.function.Predicate; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/DependencyList.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/DependencyList.java index c718bf152..98b5806d5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/DependencyList.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/DependencyList.java @@ -2,7 +2,7 @@ package org.nd4j.autodiff.samediff.internal; import lombok.AllArgsConstructor; import lombok.Data; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/DependencyTracker.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/DependencyTracker.java index d172221ee..069fac4ab 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/DependencyTracker.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/DependencyTracker.java @@ -1,9 +1,6 @@ package org.nd4j.autodiff.samediff.internal; -import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.primitives.Pair; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/IdentityDependencyTracker.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/IdentityDependencyTracker.java index 5e7e46c80..828b19a62 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/IdentityDependencyTracker.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/IdentityDependencyTracker.java @@ -1,10 +1,7 @@ package org.nd4j.autodiff.samediff.internal; -import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/InferenceSession.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/InferenceSession.java index 26bf82893..e29721749 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/InferenceSession.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/InferenceSession.java @@ -18,7 +18,6 @@ package org.nd4j.autodiff.samediff.internal; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.bytedeco.javacpp.Pointer; import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.autodiff.listeners.At; import org.nd4j.autodiff.listeners.Listener; @@ -26,7 +25,7 @@ import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.VariableType; import org.nd4j.autodiff.samediff.internal.memory.ArrayCacheMemoryMgr; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; @@ -47,8 +46,8 @@ import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/TrainingSession.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/TrainingSession.java index d0d0b14cf..ff900ef3c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/TrainingSession.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/TrainingSession.java @@ -9,14 +9,14 @@ import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.TrainingConfig; import org.nd4j.autodiff.samediff.VariableType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.OpContext; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.learning.GradientUpdater; import org.nd4j.linalg.learning.regularization.Regularization; -import org.nd4j.linalg.primitives.AtomicDouble; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.AtomicDouble; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/memory/ArrayCacheMemoryMgr.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/memory/ArrayCacheMemoryMgr.java index c802dd4e2..6fb12b826 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/memory/ArrayCacheMemoryMgr.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/memory/ArrayCacheMemoryMgr.java @@ -2,12 +2,12 @@ package org.nd4j.autodiff.samediff.internal.memory; import lombok.*; import org.bytedeco.javacpp.Pointer; -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.shape.LongShapeDescriptor; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/memory/CloseValidationMemoryMgr.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/memory/CloseValidationMemoryMgr.java index 8417bfb35..433a9393d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/memory/CloseValidationMemoryMgr.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/internal/memory/CloseValidationMemoryMgr.java @@ -9,11 +9,11 @@ import org.nd4j.autodiff.samediff.internal.DependencyList; import org.nd4j.autodiff.samediff.internal.IdentityDependencyTracker; import org.nd4j.autodiff.samediff.internal.InferenceSession; import org.nd4j.autodiff.samediff.internal.SessionMemMgr; -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.shape.LongShapeDescriptor; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDBaseOps.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDBaseOps.java index 157ec1fbb..79bd82ad3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDBaseOps.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDBaseOps.java @@ -23,7 +23,7 @@ import static org.nd4j.autodiff.samediff.ops.SDValidation.isSameType; import java.lang.String; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.indexing.conditions.Condition; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDBitwise.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDBitwise.java index 956444ffe..96d794d09 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDBitwise.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDBitwise.java @@ -23,7 +23,7 @@ import static org.nd4j.autodiff.samediff.ops.SDValidation.isSameType; import java.lang.String; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; public class SDBitwise extends SDOps { public SDBitwise(SameDiff sameDiff) { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDCNN.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDCNN.java index 9d45aa76e..bbb3096f3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDCNN.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDCNN.java @@ -23,7 +23,7 @@ import static org.nd4j.autodiff.samediff.ops.SDValidation.isSameType; import java.lang.String; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.DataFormat; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv1DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDImage.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDImage.java index a58d4d180..907a8e48e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDImage.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDImage.java @@ -23,7 +23,7 @@ import static org.nd4j.autodiff.samediff.ops.SDValidation.isSameType; import java.lang.String; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.ImageResizeMethod; public class SDImage extends SDOps { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDMath.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDMath.java index 601a28a53..4d42b2295 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDMath.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDMath.java @@ -23,7 +23,7 @@ import static org.nd4j.autodiff.samediff.ops.SDValidation.isSameType; import java.lang.String; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.PartitionMode; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.indexing.conditions.Condition; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDNN.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDNN.java index 15d70aac5..016fc721d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDNN.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDNN.java @@ -23,7 +23,7 @@ import static org.nd4j.autodiff.samediff.ops.SDValidation.isSameType; import java.lang.String; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.PadMode; public class SDNN extends SDOps { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDOps.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDOps.java index fc406caa6..e65145494 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDOps.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDOps.java @@ -20,12 +20,7 @@ package org.nd4j.autodiff.samediff.ops; import static org.nd4j.autodiff.samediff.ops.SDValidation.isSameType; -import java.lang.String; -import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.api.buffer.DataType; -import org.nd4j.linalg.indexing.conditions.Condition; public class SDOps { protected SameDiff sd; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDRandom.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDRandom.java index cd986d7bd..3bd31f3b6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDRandom.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/ops/SDRandom.java @@ -23,7 +23,7 @@ import static org.nd4j.autodiff.samediff.ops.SDValidation.isSameType; import java.lang.String; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; public class SDRandom extends SDOps { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/serde/FlatBuffersMapper.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/serde/FlatBuffersMapper.java index 20fffdc4c..7f44962f0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/serde/FlatBuffersMapper.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/serde/FlatBuffersMapper.java @@ -32,7 +32,7 @@ import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.VariableType; import org.nd4j.autodiff.samediff.internal.Variable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.graph.DType; import org.nd4j.graph.FlatArray; import org.nd4j.graph.FlatNode; @@ -54,7 +54,7 @@ import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.exception.ND4UnresolvedOutputVariables; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; @Slf4j public class FlatBuffersMapper { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/transform/GraphTransformUtil.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/transform/GraphTransformUtil.java index 44bd9b79e..fde3988f4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/transform/GraphTransformUtil.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/transform/GraphTransformUtil.java @@ -22,7 +22,7 @@ import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.internal.SameDiffOp; import org.nd4j.autodiff.samediff.internal.Variable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.ArrayList; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/transform/SubGraphPredicate.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/transform/SubGraphPredicate.java index bf6ba09fe..51be8802b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/transform/SubGraphPredicate.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/transform/SubGraphPredicate.java @@ -20,7 +20,7 @@ import lombok.NonNull; import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/util/SameDiffUtils.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/util/SameDiffUtils.java index a3f9ddea2..a351a063b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/util/SameDiffUtils.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/util/SameDiffUtils.java @@ -23,7 +23,7 @@ import lombok.NoArgsConstructor; import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.layers.ExternalErrorsFunction; import org.nd4j.linalg.api.ops.impl.shape.ReductionShape; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/ActivationGradientCheckListener.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/ActivationGradientCheckListener.java index d1137746d..512082e7d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/ActivationGradientCheckListener.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/ActivationGradientCheckListener.java @@ -8,7 +8,7 @@ import org.nd4j.autodiff.listeners.BaseListener; import org.nd4j.autodiff.listeners.Operation; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.internal.SameDiffOp; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/GradCheckUtil.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/GradCheckUtil.java index b35369ad4..e202d187c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/GradCheckUtil.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/GradCheckUtil.java @@ -27,7 +27,7 @@ import org.nd4j.autodiff.samediff.VariableType; import org.nd4j.autodiff.samediff.internal.SameDiffOp; import org.nd4j.autodiff.samediff.internal.Variable; import org.nd4j.autodiff.validation.listeners.NonInplaceValidationListener; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.iter.NdIndexIterator; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpTestCase.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpTestCase.java index 6d19d5bc6..d401c8b66 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpTestCase.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpTestCase.java @@ -21,11 +21,10 @@ import lombok.NonNull; import lombok.experimental.Accessors; import org.nd4j.autodiff.validation.functions.EqualityFn; import org.nd4j.autodiff.validation.functions.RelErrorFn; -import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.shape.LongShapeDescriptor; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpValidation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpValidation.java index 950baa7e8..756052851 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpValidation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/OpValidation.java @@ -20,7 +20,6 @@ import org.nd4j.linalg.api.ops.custom.*; import org.nd4j.linalg.api.ops.impl.indexaccum.custom.ArgMax; import org.nd4j.linalg.api.ops.impl.indexaccum.custom.ArgMin; import org.nd4j.linalg.api.ops.impl.reduce.HashCode; -import org.nd4j.linalg.api.ops.impl.scalar.RectifiedLinearDerivative; import org.nd4j.shade.guava.collect.ImmutableSet; import org.nd4j.shade.guava.reflect.ClassPath; import lombok.extern.slf4j.Slf4j; @@ -32,7 +31,7 @@ import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.internal.SameDiffOp; import org.nd4j.autodiff.samediff.internal.Variable; import org.nd4j.autodiff.validation.listeners.NonInplaceValidationListener; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.descriptors.tensorflow.TensorflowDescriptorParser; import org.nd4j.linalg.api.iter.NdIndexIterator; @@ -93,9 +92,9 @@ import org.nd4j.linalg.api.ops.random.impl.*; import org.nd4j.linalg.api.ops.random.impl.Linspace; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import org.nd4j.linalg.indexing.conditions.Conditions; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.tensorflow.framework.OpDef; import java.io.IOException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/TestCase.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/TestCase.java index 2767a22f9..42b577055 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/TestCase.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/TestCase.java @@ -24,9 +24,9 @@ import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.validation.functions.EqualityFn; import org.nd4j.autodiff.validation.functions.RelErrorFn; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/functions/EqualityFn.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/functions/EqualityFn.java index bc6c1c63c..a430d82a0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/functions/EqualityFn.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/functions/EqualityFn.java @@ -18,7 +18,7 @@ package org.nd4j.autodiff.validation.functions; import lombok.AllArgsConstructor; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; @AllArgsConstructor public class EqualityFn implements Function { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/functions/RelErrorFn.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/functions/RelErrorFn.java index a8c7c2cca..41ad47c74 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/functions/RelErrorFn.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/functions/RelErrorFn.java @@ -20,7 +20,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import org.nd4j.linalg.api.iter.NdIndexIterator; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/listeners/NonInplaceValidationListener.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/listeners/NonInplaceValidationListener.java index 3d28b29fb..23d4f974a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/listeners/NonInplaceValidationListener.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/validation/listeners/NonInplaceValidationListener.java @@ -1,13 +1,12 @@ package org.nd4j.autodiff.validation.listeners; import lombok.Getter; -import lombok.val; import org.nd4j.autodiff.listeners.At; import org.nd4j.autodiff.listeners.BaseListener; import org.nd4j.autodiff.listeners.Operation; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.internal.SameDiffOp; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.Op; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/BaseEvaluation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/BaseEvaluation.java index 5f7b75250..190acfa07 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/BaseEvaluation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/BaseEvaluation.java @@ -19,7 +19,7 @@ package org.nd4j.evaluation; import lombok.EqualsAndHashCode; import lombok.NonNull; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.classification.*; import org.nd4j.evaluation.regression.RegressionEvaluation; import org.nd4j.linalg.api.buffer.DataType; @@ -27,9 +27,9 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.broadcast.BroadcastTo; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.serde.json.JsonMappers; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.databind.exc.InvalidTypeIdException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/EvaluationUtils.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/EvaluationUtils.java index d7fbd32d6..765c6d5b8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/EvaluationUtils.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/EvaluationUtils.java @@ -19,7 +19,7 @@ package org.nd4j.evaluation; import lombok.val; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/Evaluation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/Evaluation.java index 7c1d36d94..b1df94fee 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/Evaluation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/Evaluation.java @@ -18,7 +18,7 @@ package org.nd4j.evaluation.classification; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.BaseEvaluation; import org.nd4j.evaluation.EvaluationAveraging; import org.nd4j.evaluation.EvaluationUtils; @@ -32,9 +32,9 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.reduce.longer.MatchCondition; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.conditions.Conditions; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Counter; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; import org.nd4j.shade.jackson.annotation.JsonIgnoreProperties; @@ -400,7 +400,7 @@ public class Evaluation extends BaseEvaluation { //Check for NaNs in predictions - without this, evaulation could silently be intepreted as class 0 prediction due to argmax long count = Nd4j.getExecutioner().execAndReturn(new MatchCondition(predictions2d, Conditions.isNan())).getFinalResult().longValue(); - org.nd4j.base.Preconditions.checkState(count == 0, "Cannot perform evaluation with NaNs present in predictions:" + + Preconditions.checkState(count == 0, "Cannot perform evaluation with NaNs present in predictions:" + " %s NaNs present in predictions INDArray", count); // Add the number of rows to numRowCounter diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/EvaluationBinary.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/EvaluationBinary.java index fea9b7308..00d2b9154 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/EvaluationBinary.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/EvaluationBinary.java @@ -19,6 +19,7 @@ package org.nd4j.evaluation.classification; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.BaseEvaluation; import org.nd4j.evaluation.EvaluationUtils; import org.nd4j.evaluation.IEvaluation; @@ -29,7 +30,7 @@ import org.nd4j.linalg.api.ops.impl.broadcast.bool.BroadcastGreaterThan; import org.nd4j.linalg.api.ops.impl.reduce.longer.MatchCondition; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.conditions.Conditions; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; import org.nd4j.shade.jackson.databind.annotation.JsonDeserialize; @@ -181,7 +182,7 @@ public class EvaluationBinary extends BaseEvaluation { //Check for NaNs in predictions - without this, evaulation could silently be intepreted as class 0 prediction due to argmax long count = Nd4j.getExecutioner().execAndReturn(new MatchCondition(predictionsArr, Conditions.isNan())).getFinalResult().longValue(); - org.nd4j.base.Preconditions.checkState(count == 0, "Cannot perform evaluation with NaNs present in predictions:" + + Preconditions.checkState(count == 0, "Cannot perform evaluation with NaNs present in predictions:" + " %s NaNs present in predictions INDArray", count); if (countTruePositive != null && countTruePositive.length != labelsArr.size(axis)) { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/EvaluationCalibration.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/EvaluationCalibration.java index 1a0348324..a49fb94eb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/EvaluationCalibration.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/EvaluationCalibration.java @@ -19,7 +19,7 @@ package org.nd4j.evaluation.classification; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.val; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.BaseEvaluation; import org.nd4j.evaluation.IMetric; import org.nd4j.evaluation.curves.Histogram; @@ -32,7 +32,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import org.nd4j.serde.jackson.shaded.NDArrayDeSerializer; import org.nd4j.serde.jackson.shaded.NDArraySerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROC.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROC.java index 5c7c181d1..259ea2206 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROC.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROC.java @@ -18,7 +18,7 @@ package org.nd4j.evaluation.classification; import lombok.*; import org.apache.commons.lang3.ArrayUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.BaseEvaluation; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.IMetric; @@ -36,8 +36,8 @@ import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.indexing.conditions.Condition; import org.nd4j.linalg.indexing.conditions.Conditions; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; import org.nd4j.shade.jackson.annotation.JsonIgnoreProperties; import org.nd4j.shade.jackson.annotation.JsonTypeInfo; import org.nd4j.shade.jackson.databind.annotation.JsonSerialize; @@ -604,7 +604,7 @@ public class ROC extends BaseEvaluation { //Check for NaNs in predictions - without this, evaulation could silently be intepreted as class 0 prediction due to argmax long count = Nd4j.getExecutioner().execAndReturn(new MatchCondition(predictions2d, Conditions.isNan())).getFinalResult().longValue(); - org.nd4j.base.Preconditions.checkState(count == 0, "Cannot perform evaluation with NaN(s) present:" + + Preconditions.checkState(count == 0, "Cannot perform evaluation with NaN(s) present:" + " %s NaN(s) present in predictions INDArray", count); double step = 1.0 / thresholdSteps; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROCBinary.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROCBinary.java index a4d54e3c7..73251e072 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROCBinary.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROCBinary.java @@ -19,17 +19,15 @@ package org.nd4j.evaluation.classification; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.val; -import org.nd4j.base.Preconditions; import org.nd4j.evaluation.BaseEvaluation; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.IMetric; -import org.nd4j.evaluation.classification.ROCMultiClass.Metric; import org.nd4j.evaluation.curves.PrecisionRecallCurve; import org.nd4j.evaluation.curves.RocCurve; import org.nd4j.evaluation.serde.ROCArraySerializer; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import org.nd4j.shade.jackson.databind.annotation.JsonSerialize; import java.io.Serializable; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROCMultiClass.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROCMultiClass.java index a2a1ed16e..b173d4ced 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROCMultiClass.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/classification/ROCMultiClass.java @@ -18,16 +18,15 @@ package org.nd4j.evaluation.classification; import lombok.Data; import lombok.EqualsAndHashCode; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.evaluation.BaseEvaluation; import org.nd4j.evaluation.IEvaluation; import org.nd4j.evaluation.IMetric; -import org.nd4j.evaluation.classification.ROC.Metric; import org.nd4j.evaluation.curves.PrecisionRecallCurve; import org.nd4j.evaluation.curves.RocCurve; import org.nd4j.evaluation.serde.ROCArraySerializer; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import org.nd4j.shade.jackson.databind.annotation.JsonSerialize; import java.io.Serializable; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/curves/PrecisionRecallCurve.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/curves/PrecisionRecallCurve.java index 3f9611519..9ca30f843 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/curves/PrecisionRecallCurve.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/curves/PrecisionRecallCurve.java @@ -19,7 +19,7 @@ package org.nd4j.evaluation.curves; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.shade.jackson.annotation.JsonProperty; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/curves/RocCurve.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/curves/RocCurve.java index 9e0b7c71b..3ed813685 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/curves/RocCurve.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/curves/RocCurve.java @@ -18,7 +18,7 @@ package org.nd4j.evaluation.curves; import lombok.Data; import lombok.EqualsAndHashCode; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.shade.jackson.annotation.JsonProperty; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/regression/RegressionEvaluation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/regression/RegressionEvaluation.java index b5fac0dd4..3444591f1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/regression/RegressionEvaluation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/evaluation/regression/RegressionEvaluation.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.reduce.same.ASum; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; import org.nd4j.shade.jackson.databind.annotation.JsonDeserialize; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/graph/ui/LogFileWriter.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/graph/ui/LogFileWriter.java index 7bba2b765..0a4284e46 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/graph/ui/LogFileWriter.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/graph/ui/LogFileWriter.java @@ -28,7 +28,7 @@ import org.nd4j.autodiff.samediff.VariableType; import org.nd4j.autodiff.samediff.internal.SameDiffOp; import org.nd4j.autodiff.samediff.internal.Variable; import org.nd4j.autodiff.samediff.serde.FlatBuffersMapper; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.graph.*; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; @@ -37,7 +37,7 @@ import org.nd4j.linalg.api.ops.impl.controlflow.compat.Enter; import org.nd4j.linalg.api.ops.impl.controlflow.compat.Exit; import org.nd4j.linalg.api.ops.impl.controlflow.compat.NextIteration; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/descriptors/onnx/OnnxDescriptorParser.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/descriptors/onnx/OnnxDescriptorParser.java index 0575c8b58..3ce862297 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/descriptors/onnx/OnnxDescriptorParser.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/descriptors/onnx/OnnxDescriptorParser.java @@ -16,7 +16,7 @@ package org.nd4j.imports.descriptors.onnx; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.shade.jackson.databind.ObjectMapper; import java.io.InputStream; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/descriptors/tensorflow/TensorflowDescriptorParser.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/descriptors/tensorflow/TensorflowDescriptorParser.java index 3d0464782..0c9a3e128 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/descriptors/tensorflow/TensorflowDescriptorParser.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/descriptors/tensorflow/TensorflowDescriptorParser.java @@ -18,7 +18,7 @@ package org.nd4j.imports.descriptors.tensorflow; import org.nd4j.shade.protobuf.TextFormat; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.tensorflow.framework.OpDef; import java.io.BufferedInputStream; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/TFGraphMapper.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/TFGraphMapper.java index 4ce62f93b..7fc763190 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/TFGraphMapper.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/TFGraphMapper.java @@ -26,7 +26,7 @@ import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.VariableType; import org.nd4j.autodiff.samediff.internal.SameDiffOp; import org.nd4j.autodiff.samediff.internal.Variable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.descriptors.properties.AttributeAdapter; import org.nd4j.imports.descriptors.properties.PropertyMapping; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/tensors/TFTensorMappers.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/tensors/TFTensorMappers.java index 25d9d0897..11c1e3794 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/tensors/TFTensorMappers.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/tensors/TFTensorMappers.java @@ -6,7 +6,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.options.ArrayOptionsHelper; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.TensorProto; import java.nio.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/tensorflow/TensorFlowImportValidator.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/tensorflow/TensorFlowImportValidator.java index 0493099f2..0cd77c124 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/tensorflow/TensorFlowImportValidator.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/tensorflow/TensorFlowImportValidator.java @@ -24,10 +24,10 @@ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.input.CloseShieldInputStream; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.util.ArchiveUtils; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/IActivation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/IActivation.java index 72a618b1a..e67a99c8a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/IActivation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/IActivation.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.activations; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.serde.json.LegacyIActivationDeserializerHelper; import org.nd4j.shade.jackson.annotation.JsonAutoDetect; import org.nd4j.shade.jackson.annotation.JsonTypeInfo; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationCube.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationCube.java index fc4e2217d..c1c938a98 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationCube.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationCube.java @@ -24,7 +24,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.CubeBp; import org.nd4j.linalg.api.ops.impl.transforms.same.Cube; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * f(x) = x^3 diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationELU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationELU.java index 95afe8157..71f31cba5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationELU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationELU.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.EluBp; import org.nd4j.linalg.api.ops.impl.transforms.strict.ELU; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * f(x) = alpha * (exp(x) - 1.0); x < 0 diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationGELU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationGELU.java index 1e16f61a9..953cb2587 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationGELU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationGELU.java @@ -25,7 +25,7 @@ import org.nd4j.linalg.api.ops.impl.transforms.strict.GELUDerivative; import org.nd4j.linalg.api.ops.impl.transforms.strict.PreciseGELU; import org.nd4j.linalg.api.ops.impl.transforms.strict.PreciseGELUDerivative; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * GELU activation function - Gaussian Error Linear Units diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationHardSigmoid.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationHardSigmoid.java index 2cbc95824..623757bb0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationHardSigmoid.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationHardSigmoid.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.HardSigmoidBp; import org.nd4j.linalg.api.ops.impl.transforms.strict.HardSigmoid; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * f(x) = min(1, max(0, 0.2*x + 0.5)) diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationHardTanH.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationHardTanH.java index 44e732b6a..cc11a3810 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationHardTanH.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationHardTanH.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.HardTanhBp; import org.nd4j.linalg.api.ops.impl.transforms.strict.HardTanh; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * ⎧ 1, if x > 1 diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationIdentity.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationIdentity.java index d94e87348..f86f1c21e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationIdentity.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationIdentity.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.activations.impl; import lombok.EqualsAndHashCode; import lombok.Getter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.activations.BaseActivationFunction; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationLReLU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationLReLU.java index 437524314..8e0faf160 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationLReLU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationLReLU.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.scalar.LeakyReLU; import org.nd4j.linalg.api.ops.impl.transforms.gradient.LeakyReLUBp; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Leaky RELU diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationMish.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationMish.java index 1d1bba123..f0d873215 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationMish.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationMish.java @@ -24,7 +24,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.strict.Mish; import org.nd4j.linalg.api.ops.impl.transforms.strict.MishDerivative; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * https://arxiv.org/ftp/arxiv/papers/1908/1908.08681.pdf diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationPReLU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationPReLU.java index 08bbbb997..7ab79d81f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationPReLU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationPReLU.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.activations.BaseActivationFunction; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** /** Parametrized Rectified Linear Unit (PReLU) diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRReLU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRReLU.java index 9221d601c..8e0161839 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRReLU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRReLU.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.activations.impl; import lombok.EqualsAndHashCode; import lombok.Getter; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.activations.BaseActivationFunction; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.scalar.RectifiedLinear; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRationalTanh.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRationalTanh.java index e67150a93..dd0bf6566 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRationalTanh.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRationalTanh.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.RationalTanhBp; import org.nd4j.linalg.api.ops.impl.transforms.strict.RationalTanh; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Rational tanh approximation diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationReLU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationReLU.java index 5aa90c2e5..52cc5015e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationReLU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationReLU.java @@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import org.nd4j.linalg.api.ops.impl.scalar.*; import org.nd4j.linalg.api.ops.impl.transforms.gradient.LeakyReLUBp; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.activations.BaseActivationFunction; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationReLU6.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationReLU6.java index 103719292..d5e0cb76c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationReLU6.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationReLU6.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.scalar.Relu6; import org.nd4j.linalg.api.ops.impl.transforms.gradient.Relu6Derivative; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * f(x) = min(max(input, cutoff), 6) diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRectifiedTanh.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRectifiedTanh.java index 252c6d590..9764e55d2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRectifiedTanh.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationRectifiedTanh.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.RectifiedTanhBp; import org.nd4j.linalg.api.ops.impl.transforms.strict.RectifiedTanh; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Rectified tanh diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSELU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSELU.java index 64c0d5fc0..d7f71e382 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSELU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSELU.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.SeluBp; import org.nd4j.linalg.api.ops.impl.transforms.strict.SELU; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * https://arxiv.org/pdf/1706.02515.pdf diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSigmoid.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSigmoid.java index 40674b17a..de2db231a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSigmoid.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSigmoid.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.SigmoidDerivative; import org.nd4j.linalg.api.ops.impl.transforms.strict.Sigmoid; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * f(x) = 1 / (1 + exp(-x)) diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftPlus.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftPlus.java index 0306e8ad4..6f2c82ba7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftPlus.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftPlus.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.SoftPlusBp; import org.nd4j.linalg.api.ops.impl.transforms.strict.SoftPlus; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * f(x) = log(1+e^x) diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftSign.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftSign.java index 31a305cdf..aefe0297e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftSign.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftSign.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.gradient.SoftSignBp; import org.nd4j.linalg.api.ops.impl.transforms.strict.SoftSign; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * f_i(x) = x_i / (1+|x_i|) diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftmax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftmax.java index 4cb7bd58b..dfcabe269 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftmax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSoftmax.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.custom.SoftMax; import org.nd4j.linalg.api.ops.impl.transforms.gradient.SoftmaxBp; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * f_i(x) = exp(x_i - shift) / sum_j exp(x_j - shift) diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSwish.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSwish.java index 8a1a83ee5..793181112 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSwish.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationSwish.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.strict.Swish; import org.nd4j.linalg.api.ops.impl.transforms.strict.SwishDerivative; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * f(x) = x * sigmoid(x) diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationTanH.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationTanH.java index b5d580e2a..2b29bada4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationTanH.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationTanH.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.activations.impl; import lombok.EqualsAndHashCode; import lombok.Getter; import org.nd4j.linalg.api.ops.impl.transforms.gradient.TanhDerivative; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.activations.BaseActivationFunction; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.strict.Tanh; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationThresholdedReLU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationThresholdedReLU.java index 71e87e2c7..5eb1c3e9c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationThresholdedReLU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/activations/impl/ActivationThresholdedReLU.java @@ -22,7 +22,7 @@ import org.nd4j.linalg.activations.BaseActivationFunction; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Thresholded RELU diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/buffer/BaseDataBuffer.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/buffer/BaseDataBuffer.java index b99d9f105..212d55cd8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/buffer/BaseDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/buffer/BaseDataBuffer.java @@ -21,12 +21,12 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.bytedeco.javacpp.*; import org.bytedeco.javacpp.indexer.*; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.AtomicDouble; -import org.nd4j.linalg.primitives.Triple; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.primitives.AtomicDouble; +import org.nd4j.common.primitives.Triple; +import org.nd4j.common.util.ArrayUtil; import java.io.*; import java.nio.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/FlatIterator.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/FlatIterator.java index 70f254eb6..671a0ad22 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/FlatIterator.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/FlatIterator.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.api.iter; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Iterator; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/LinearIndexLookup.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/LinearIndexLookup.java index 7fda53b55..618e24163 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/LinearIndexLookup.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/LinearIndexLookup.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.api.iter; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.io.Serializable; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/NdIndexIterator.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/NdIndexIterator.java index a6be87caf..133a50498 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/NdIndexIterator.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/iter/NdIndexIterator.java @@ -16,9 +16,9 @@ package org.nd4j.linalg.api.iter; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.HashMap; import java.util.Iterator; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/memory/abstracts/Nd4jWorkspace.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/memory/abstracts/Nd4jWorkspace.java index 23aa3533a..45029fb1e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/memory/abstracts/Nd4jWorkspace.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/memory/abstracts/Nd4jWorkspace.java @@ -31,7 +31,7 @@ import org.nd4j.linalg.api.memory.pointers.PointersPair; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.api.memory.MemoryManager; -import org.nd4j.linalg.util.ND4JFileUtils; +import org.nd4j.common.util.ND4JFileUtils; import java.io.BufferedOutputStream; import java.io.File; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/memory/provider/BasicWorkspaceManager.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/memory/provider/BasicWorkspaceManager.java index 1baea4bc9..37085370e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/memory/provider/BasicWorkspaceManager.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/memory/provider/BasicWorkspaceManager.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.memory.conf.WorkspaceConfiguration; import org.nd4j.linalg.api.memory.enums.*; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.api.memory.abstracts.DummyWorkspace; -import org.nd4j.linalg.primitives.SynchronizedObject; +import org.nd4j.common.primitives.SynchronizedObject; import java.util.ArrayList; import java.util.HashMap; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java index 46daa869b..55ce8039b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java @@ -25,7 +25,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.commons.math3.util.FastMath; import org.nd4j.autodiff.samediff.serde.FlatBuffersMapper; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.graph.ByteOrder; import org.nd4j.graph.FlatArray; import org.nd4j.linalg.api.blas.BlasBufferUtil; @@ -73,9 +73,9 @@ import org.nd4j.linalg.indexing.*; import org.nd4j.linalg.indexing.conditions.Condition; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.api.memory.MemcpyDirection; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.string.NDArrayStrings; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.util.LinAlgExceptions; import org.nd4j.linalg.util.NDArrayMath; import org.nd4j.linalg.workspace.WorkspaceUtils; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseShapeInfoProvider.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseShapeInfoProvider.java index f756e49ca..ea0802b70 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseShapeInfoProvider.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseShapeInfoProvider.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ndarray; import lombok.extern.slf4j.Slf4j; import org.nd4j.linalg.api.buffer.DataType; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/ShapeInfoProvider.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/ShapeInfoProvider.java index 7ad0438ec..1919128c7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/ShapeInfoProvider.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/ShapeInfoProvider.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.api.ndarray; import org.nd4j.linalg.api.buffer.DataType; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.buffer.DataBuffer; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseBroadcastBoolOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseBroadcastBoolOp.java index e2ca9329e..5d7a3de42 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseBroadcastBoolOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseBroadcastBoolOp.java @@ -23,7 +23,7 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.util.SameDiffUtils; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseBroadcastOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseBroadcastOp.java index 56201560a..7493543b0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseBroadcastOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseBroadcastOp.java @@ -23,7 +23,7 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.util.SameDiffUtils; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseIndexAccumulation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseIndexAccumulation.java index 502874cc1..3459d2050 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseIndexAccumulation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseIndexAccumulation.java @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.util.SameDiffUtils; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseOp.java index 5c45ecf50..991cdc9cf 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseOp.java @@ -24,7 +24,7 @@ import onnx.Onnx; import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceBoolOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceBoolOp.java index af022c86f..5071d21f2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceBoolOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceBoolOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceFloatOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceFloatOp.java index 29860aee9..ba57ca857 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceFloatOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceFloatOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceLongOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceLongOp.java index b5131eb61..8b015e438 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceLongOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceLongOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceOp.java index 66c3e95d3..f1bafe0de 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceOp.java @@ -27,7 +27,7 @@ import org.nd4j.autodiff.util.SameDiffUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceSameOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceSameOp.java index 015b87b5d..258dad019 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceSameOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseReduceSameOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseScalarBoolOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseScalarBoolOp.java index 858b6a81c..538daf453 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseScalarBoolOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseScalarBoolOp.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.util.SameDiffUtils; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseScalarOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseScalarOp.java index 66a204602..f69576f77 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseScalarOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseScalarOp.java @@ -22,7 +22,7 @@ import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.util.SameDiffUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformAnyOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformAnyOp.java index 7aa24a60b..28b07e66c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformAnyOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformAnyOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformBoolOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformBoolOp.java index d4e69db5d..76e3d9ef9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformBoolOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformBoolOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformFloatOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformFloatOp.java index 42e2ef278..e34bcfff9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformFloatOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformFloatOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformOp.java index 7f8e0487e..bf6bbcd45 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformOp.java @@ -17,19 +17,13 @@ package org.nd4j.linalg.api.ops; import lombok.extern.slf4j.Slf4j; -import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.util.SameDiffUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.LongShapeDescriptor; -import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.util.ArrayUtil; import org.nd4j.linalg.util.LinAlgExceptions; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformSameOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformSameOp.java index b7d0ff4ff..d47ba8677 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformSameOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformSameOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformStrictOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformStrictOp.java index 963138880..efbcda7a6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformStrictOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseTransformStrictOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.shape.LongShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/DynamicCustomOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/DynamicCustomOp.java index 67dd5701d..91297e024 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/DynamicCustomOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/DynamicCustomOp.java @@ -31,7 +31,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/IndexAccumulation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/IndexAccumulation.java index 0671e9a24..b3d418ab6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/IndexAccumulation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/IndexAccumulation.java @@ -17,7 +17,6 @@ package org.nd4j.linalg.api.ops; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; /**An index accumulation is an operation that returns an index within * a NDArray.
diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/OpContext.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/OpContext.java index 4bda3701e..49bc315c7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/OpContext.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/OpContext.java @@ -19,9 +19,8 @@ package org.nd4j.linalg.api.ops; import org.bytedeco.javacpp.Pointer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; -import java.util.Collection; import java.util.List; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/aggregates/Batch.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/aggregates/Batch.java index 7e3939265..a962846c7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/aggregates/Batch.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/aggregates/Batch.java @@ -21,7 +21,7 @@ import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.exception.ND4JIllegalStateException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/compat/CompatSparseToDense.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/compat/CompatSparseToDense.java index 18293c2ee..41ebd659d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/compat/CompatSparseToDense.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/compat/CompatSparseToDense.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.api.ops.compat; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/compat/CompatStringSplit.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/compat/CompatStringSplit.java index 33b6df4a6..2119fd5fd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/compat/CompatStringSplit.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/compat/CompatStringSplit.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.api.ops.compat; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustHue.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustHue.java index bd0c88792..5e354d446 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustHue.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustHue.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustSaturation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustSaturation.java index 3c98f2149..19065055d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustSaturation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustSaturation.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BaseAdjustContrast.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BaseAdjustContrast.java index a5e296043..80c344fe2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BaseAdjustContrast.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BaseAdjustContrast.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BetaInc.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BetaInc.java index ce45869cc..9365eac5c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BetaInc.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BetaInc.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BitCast.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BitCast.java index cafc228f2..aeb3e9f44 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BitCast.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BitCast.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Digamma.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Digamma.java index 206d0027f..fed26470f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Digamma.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Digamma.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DivideNoNan.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DivideNoNan.java index 347a5855f..c6bb32abf 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DivideNoNan.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DivideNoNan.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.api.ops.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DrawBoundingBoxes.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DrawBoundingBoxes.java index b92a6f8f9..782d06b67 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DrawBoundingBoxes.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DrawBoundingBoxes.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.api.ops.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FakeQuantWithMinMaxVarsPerChannel.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FakeQuantWithMinMaxVarsPerChannel.java index d46529a84..c53c09476 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FakeQuantWithMinMaxVarsPerChannel.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FakeQuantWithMinMaxVarsPerChannel.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.api.ops.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Flatten.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Flatten.java index 721c98d45..540d470b7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Flatten.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Flatten.java @@ -21,7 +21,7 @@ import lombok.NoArgsConstructor; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FusedBatchNorm.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FusedBatchNorm.java index 7b41695ff..06bae2835 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FusedBatchNorm.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FusedBatchNorm.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/HsvToRgb.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/HsvToRgb.java index 6b1361376..48078d862 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/HsvToRgb.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/HsvToRgb.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Igamma.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Igamma.java index e8efddb12..e22cd231f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Igamma.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Igamma.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Igammac.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Igammac.java index e18fe4839..9d31d1c82 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Igammac.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Igammac.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lgamma.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lgamma.java index 3df488120..06b826cbc 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lgamma.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lgamma.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/LinearSolve.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/LinearSolve.java index a107d8c10..0a3e397fd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/LinearSolve.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/LinearSolve.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Logdet.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Logdet.java index 81b8cbc08..e1c558ef1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Logdet.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Logdet.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lstsq.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lstsq.java index 2cd862515..6c437518c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lstsq.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lstsq.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lu.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lu.java index 96ccde960..4e607a214 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lu.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Lu.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/MatrixBandPart.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/MatrixBandPart.java index 40d50afe3..804c07699 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/MatrixBandPart.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/MatrixBandPart.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Polygamma.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Polygamma.java index 3b528eb62..647c82bcf 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Polygamma.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Polygamma.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RandomCrop.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RandomCrop.java index 42845561f..f37f79f97 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RandomCrop.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RandomCrop.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToHsv.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToHsv.java index d96981460..7baf0a788 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToHsv.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToHsv.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToYiq.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToYiq.java index 1d6a48a4f..628e770ee 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToYiq.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToYiq.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToYuv.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToYuv.java index c65c6e777..8c7ed7353 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToYuv.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/RgbToYuv.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Roll.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Roll.java index 004a2e5ab..9a7c04c87 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Roll.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Roll.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/ToggleBits.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/ToggleBits.java index 641cb4117..4aa33dc0d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/ToggleBits.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/ToggleBits.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Tri.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Tri.java index 61187ce13..ce4ed3b61 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Tri.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/Tri.java @@ -18,11 +18,9 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.factory.Nd4j; import java.util.Arrays; import java.util.Collections; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/TriangularSolve.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/TriangularSolve.java index 8fe7b1a31..641425d61 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/TriangularSolve.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/TriangularSolve.java @@ -3,7 +3,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/YiqToRgb.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/YiqToRgb.java index 8126a1803..bca9999a8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/YiqToRgb.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/YiqToRgb.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/YuvToRgb.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/YuvToRgb.java index 4643ec3fe..d6e52771c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/YuvToRgb.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/YuvToRgb.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/executioner/DefaultOpExecutioner.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/executioner/DefaultOpExecutioner.java index ff139c236..e65bf4860 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/executioner/DefaultOpExecutioner.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/executioner/DefaultOpExecutioner.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.bytedeco.javacpp.Pointer; import org.nd4j.autodiff.functions.DifferentialFunction; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.environment.Nd4jEnvironment; @@ -39,11 +39,11 @@ import org.nd4j.linalg.api.shape.TadPack; import org.nd4j.linalg.cache.TADManager; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.Optional; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.primitives.Optional; import org.nd4j.linalg.profiler.OpProfiler; import org.nd4j.linalg.profiler.ProfilerConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAdd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAdd.java index cea3b388a..3cf533518 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAdd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAdd.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAddGrad.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAddGrad.java index df936bbe6..bf9b05ae9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAddGrad.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAddGrad.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastTo.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastTo.java index 6dddea415..44429745c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastTo.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastTo.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/Select.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/Select.java index 5fdebd03d..4da11727c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/Select.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/Select.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.controlflow; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/Where.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/Where.java index d7283b034..10d638178 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/Where.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/Where.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.controlflow; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Enter.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Enter.java index 27d6f7609..fce142111 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Enter.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Enter.java @@ -20,7 +20,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.Op; import org.nd4j.linalg.api.ops.Op.Type; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Exit.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Exit.java index e0c5b093a..7fdd92962 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Exit.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Exit.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.controlflow.compat; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.Op; import org.nd4j.linalg.api.ops.Op.Type; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/LoopCond.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/LoopCond.java index 7ae86a306..e408912a3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/LoopCond.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/LoopCond.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.controlflow.compat; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.Op; import org.tensorflow.framework.AttrValue; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Merge.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Merge.java index 9adbd78df..1e6ec02d9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Merge.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Merge.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.controlflow.compat; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.Op; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/NextIteration.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/NextIteration.java index 33f4dcf5c..5fd09dcd0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/NextIteration.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/NextIteration.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.controlflow.compat; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.Op; import org.nd4j.linalg.api.ops.Op.Type; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Switch.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Switch.java index a7804f39f..2bd6923e7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Switch.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/controlflow/compat/Switch.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.controlflow.compat; import lombok.Getter; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.Op; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/CropAndResize.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/CropAndResize.java index da0896a46..67c67e8fa 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/CropAndResize.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/CropAndResize.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ExtractImagePatches.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ExtractImagePatches.java index 5e6362d67..e71d430c3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ExtractImagePatches.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ExtractImagePatches.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.image; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ImageResize.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ImageResize.java index 4bdca62a6..ec05a3621 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ImageResize.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ImageResize.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.ImageResizeMethod; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeArea.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeArea.java index 8acf558e9..30a05ba55 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeArea.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeArea.java @@ -20,7 +20,7 @@ import lombok.NonNull; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeBicubic.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeBicubic.java index 18cb15617..7c98cb12c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeBicubic.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeBicubic.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeBilinear.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeBilinear.java index 32840d97a..65c671ae3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeBilinear.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeBilinear.java @@ -21,7 +21,7 @@ import lombok.NonNull; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeNearestNeighbor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeNearestNeighbor.java index 9293e7965..a9975f0c7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeNearestNeighbor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/ResizeNearestNeighbor.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.image; import java.util.Collections; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/indexaccum/custom/ArgMax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/indexaccum/custom/ArgMax.java index 67c232079..1c19b82a5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/indexaccum/custom/ArgMax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/indexaccum/custom/ArgMax.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.indexaccum.custom; import lombok.Data; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/indexaccum/custom/ArgMin.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/indexaccum/custom/ArgMin.java index 87601f389..c93bb1acf 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/indexaccum/custom/ArgMin.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/indexaccum/custom/ArgMin.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.indexaccum.custom; import lombok.Data; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/ExternalErrorsFunction.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/ExternalErrorsFunction.java index 8b8cc5f53..e154d4da7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/ExternalErrorsFunction.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/ExternalErrorsFunction.java @@ -20,7 +20,7 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.VariableType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/AvgPooling2D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/AvgPooling2D.java index 17ed2e124..ce1898d0b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/AvgPooling2D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/AvgPooling2D.java @@ -25,13 +25,13 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Pooling2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/AvgPooling3D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/AvgPooling3D.java index c0ec62610..caa9d8cd8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/AvgPooling3D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/AvgPooling3D.java @@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.layers.convolution.config.Pooling3DConfig; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/BatchNorm.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/BatchNorm.java index b4f881fac..c58bc5dc9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/BatchNorm.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/BatchNorm.java @@ -25,7 +25,7 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.internal.SameDiffOp; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; @@ -34,7 +34,7 @@ import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv1DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv3DConfig; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Col2Im.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Col2Im.java index 4a7df20b4..72c2b870b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Col2Im.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Col2Im.java @@ -21,12 +21,12 @@ import lombok.Getter; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv1D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv1D.java index e33037738..d7d679299 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv1D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv1D.java @@ -23,13 +23,13 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv1DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.PaddingMode; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.lang.reflect.Field; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv1DDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv1DDerivative.java index 267cb9c12..df67eecc0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv1DDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv1DDerivative.java @@ -22,13 +22,13 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv1DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.PaddingMode; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv2D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv2D.java index 5417b14cd..22eada4f7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv2D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv2D.java @@ -25,7 +25,7 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.descriptors.properties.AttributeAdapter; @@ -36,7 +36,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv2DDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv2DDerivative.java index b1492d257..62afaf903 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv2DDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv2DDerivative.java @@ -20,7 +20,7 @@ import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv3D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv3D.java index bb30930d7..0a6ecc80d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv3D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv3D.java @@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.descriptors.properties.AttributeAdapter; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv3DDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv3DDerivative.java index 7e0722a47..3c75e0cdb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv3DDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Conv3DDerivative.java @@ -20,7 +20,7 @@ import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv3DConfig; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2D.java index 74b448dc8..1e082f6f3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2D.java @@ -25,7 +25,7 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; @@ -33,7 +33,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.DeConv2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2DDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2DDerivative.java index c73b50c35..06c551447 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2DDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2DDerivative.java @@ -20,7 +20,7 @@ import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.DeConv2DConfig; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2DTF.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2DTF.java index dfabc89dd..7d6e30e08 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2DTF.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv2DTF.java @@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.descriptors.properties.AttributeAdapter; import org.nd4j.imports.descriptors.properties.PropertyMapping; @@ -34,7 +34,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.DeConv2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3D.java index d0b04b36a..b41f4fe64 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3D.java @@ -22,15 +22,14 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.DeConv3DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.lang.reflect.Field; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3DDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3DDerivative.java index 3b71104d2..9aec486ee 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3DDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3DDerivative.java @@ -20,12 +20,12 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.DeConv3DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.ArrayList; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3DTF.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3DTF.java index 9eada15e6..0ec5ec448 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3DTF.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DeConv3DTF.java @@ -23,11 +23,11 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.DeConv3DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DepthwiseConv2D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DepthwiseConv2D.java index 798b544b8..031d82447 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DepthwiseConv2D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DepthwiseConv2D.java @@ -24,7 +24,7 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.descriptors.properties.AttributeAdapter; @@ -38,7 +38,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DepthwiseConv2DBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DepthwiseConv2DBp.java index 482944fe2..56681a4ac 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DepthwiseConv2DBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/DepthwiseConv2DBp.java @@ -19,19 +19,11 @@ import lombok.*; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; -import org.nd4j.imports.converters.DifferentialFunctionClassHolder; -import org.nd4j.imports.descriptors.properties.AttributeAdapter; -import org.nd4j.imports.descriptors.properties.PropertyMapping; -import org.nd4j.imports.descriptors.properties.adapters.ConditionalFieldValueIntIndexArrayAdapter; -import org.nd4j.imports.descriptors.properties.adapters.NDArrayShapeAdapter; -import org.nd4j.imports.descriptors.properties.adapters.SizeThresholdIntArrayIntIndexAdpater; -import org.nd4j.imports.descriptors.properties.adapters.StringEqualsAdapter; +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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.lang.reflect.Field; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Im2col.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Im2col.java index 86bfbacc9..7fde898b2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Im2col.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Im2col.java @@ -19,12 +19,12 @@ package org.nd4j.linalg.api.ops.impl.layers.convolution; import lombok.Builder; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Im2colBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Im2colBp.java index 30a815dbd..b6dff8797 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Im2colBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Im2colBp.java @@ -18,11 +18,11 @@ package org.nd4j.linalg.api.ops.impl.layers.convolution; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/LocalResponseNormalization.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/LocalResponseNormalization.java index 10108d87c..644c99b6f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/LocalResponseNormalization.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/LocalResponseNormalization.java @@ -25,7 +25,7 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPoolWithArgmax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPoolWithArgmax.java index 8b151d717..6a568acf8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPoolWithArgmax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPoolWithArgmax.java @@ -23,14 +23,14 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Pooling2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPooling2D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPooling2D.java index 1da1f36bf..cab37eb3d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPooling2D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPooling2D.java @@ -24,13 +24,13 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Pooling2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPooling3D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPooling3D.java index e931d1583..4aa4ba3e5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPooling3D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/MaxPooling3D.java @@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.layers.convolution.config.Pooling3DConfig; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2D.java index 9c4e25c90..30a3de688 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2D.java @@ -29,12 +29,12 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Pooling2DConfig; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2DDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2DDerivative.java index aa58603e1..f5880596a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2DDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2DDerivative.java @@ -21,7 +21,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling3D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling3D.java index 17305cdf6..5bc675edd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling3D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling3D.java @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling3DDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling3DDerivative.java index ad48f988c..d0062e95a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling3DDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling3DDerivative.java @@ -21,7 +21,7 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.layers.convolution.config.Pooling3DConfig; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/SConv2D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/SConv2D.java index fdc1b40fe..04cfbdc67 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/SConv2D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/SConv2D.java @@ -21,7 +21,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/SConv2DDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/SConv2DDerivative.java index 8931d29ed..ed450cb00 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/SConv2DDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/SConv2DDerivative.java @@ -20,7 +20,7 @@ import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling2d.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling2d.java index 3370b6f30..214fb00fd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling2d.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling2d.java @@ -18,11 +18,10 @@ package org.nd4j.linalg.api.ops.impl.layers.convolution; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling2dDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling2dDerivative.java index e4d9f6687..7fd25ab75 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling2dDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling2dDerivative.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.layers.convolution; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling3d.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling3d.java index af3358eb7..67f516012 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling3d.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling3d.java @@ -21,7 +21,7 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling3dBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling3dBp.java index ddd1147df..a5236cbc5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling3dBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Upsampling3dBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.layers.convolution; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import java.util.Collections; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv1DConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv1DConfig.java index c62341f28..f401c88a5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv1DConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv1DConfig.java @@ -22,7 +22,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.NonNull; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.util.ConvConfigUtil; @Data diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv2DConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv2DConfig.java index 92701a696..30c20a452 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv2DConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv2DConfig.java @@ -21,7 +21,7 @@ import java.util.Map; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.WeightsFormat; import org.nd4j.linalg.util.ConvConfigUtil; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv3DConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv3DConfig.java index f94c23329..c2a7ba9b8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv3DConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/Conv3DConfig.java @@ -22,7 +22,7 @@ import java.util.Map; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.util.ConvConfigUtil; @Data diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/DeConv2DConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/DeConv2DConfig.java index 89e8e7bf3..65d076d41 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/DeConv2DConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/DeConv2DConfig.java @@ -21,7 +21,7 @@ import java.util.Map; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.util.ConvConfigUtil; @Data diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/DeConv3DConfig.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/DeConv3DConfig.java index 2936c2ba2..ef6414124 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/DeConv3DConfig.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/DeConv3DConfig.java @@ -21,7 +21,7 @@ import java.util.Map; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.util.ConvConfigUtil; @Data diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRU.java index 0cc62833d..7d15fbf62 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRU.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRUBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRUBp.java index b667fa811..0bc8a6fcf 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRUBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRUBp.java @@ -20,12 +20,10 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import java.util.ArrayList; -import java.util.Collections; import java.util.List; @NoArgsConstructor diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRUCell.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRUCell.java index d938cf8e9..79563e8af 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRUCell.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/GRUCell.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.layers.recurrent; import lombok.Getter; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMBlock.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMBlock.java index 20d84a2d6..127d071a6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMBlock.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMBlock.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMBlockCell.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMBlockCell.java index bfc65ab89..41b8e6eae 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMBlockCell.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMBlockCell.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.layers.recurrent; import lombok.Getter; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMLayer.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMLayer.java index b4567cb0d..ebd812b72 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMLayer.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMLayer.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMLayerBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMLayerBp.java index d6ffcd6e5..6e4866b6c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMLayerBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/LSTMLayerBp.java @@ -20,17 +20,14 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.layers.recurrent.config.LSTMLayerConfig; import org.nd4j.linalg.api.ops.impl.layers.recurrent.weights.LSTMLayerWeights; import org.nd4j.shade.guava.primitives.Booleans; -import javax.xml.crypto.Data; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/config/LSTMCellConfiguration.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/config/LSTMCellConfiguration.java index 4b1b354a8..1f50c9c8f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/config/LSTMCellConfiguration.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/config/LSTMCellConfiguration.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.layers.recurrent.config; import lombok.Builder; import lombok.Data; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.LinkedHashMap; import java.util.Map; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/config/LSTMConfiguration.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/config/LSTMConfiguration.java index 4cf807765..985ea6048 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/config/LSTMConfiguration.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/config/LSTMConfiguration.java @@ -18,10 +18,9 @@ package org.nd4j.linalg.api.ops.impl.layers.recurrent.config; import lombok.Builder; import lombok.Data; -import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.linalg.api.ops.impl.layers.recurrent.LSTMBlockCell; import org.nd4j.linalg.api.ops.impl.layers.recurrent.LSTMLayer; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.LinkedHashMap; import java.util.Map; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/GRUCellOutputs.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/GRUCellOutputs.java index a39a5bcc7..6d2f5bc72 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/GRUCellOutputs.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/GRUCellOutputs.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import lombok.Getter; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ops.impl.layers.recurrent.GRUCell; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/LSTMCellOutputs.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/LSTMCellOutputs.java index 4fec87e8b..25899294a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/LSTMCellOutputs.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/LSTMCellOutputs.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import lombok.Getter; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ops.impl.layers.recurrent.LSTMBlockCell; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/LSTMLayerOutputs.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/LSTMLayerOutputs.java index 7e2b4fb5a..18e9b5598 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/LSTMLayerOutputs.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/LSTMLayerOutputs.java @@ -2,7 +2,7 @@ package org.nd4j.linalg.api.ops.impl.layers.recurrent.outputs; import lombok.Getter; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ops.impl.layers.recurrent.LSTMLayer; import org.nd4j.linalg.api.ops.impl.layers.recurrent.config.LSTMDataFormat; import org.nd4j.linalg.api.ops.impl.layers.recurrent.config.LSTMDirectionMode; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/SRUCellOutputs.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/SRUCellOutputs.java index d82ad63b1..9eddcc446 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/SRUCellOutputs.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/SRUCellOutputs.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import lombok.Getter; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ops.impl.layers.recurrent.GRUCell; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/SRULayerOutputs.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/SRULayerOutputs.java index 281d2cc10..213b007ca 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/SRULayerOutputs.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/outputs/SRULayerOutputs.java @@ -2,11 +2,11 @@ package org.nd4j.linalg.api.ops.impl.layers.recurrent.outputs; import java.util.Arrays; import java.util.List; -import lombok.AccessLevel; + import lombok.Getter; import org.nd4j.autodiff.samediff.SDIndex; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ops.impl.layers.recurrent.GRUCell; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/weights/LSTMLayerWeights.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/weights/LSTMLayerWeights.java index 8f0113685..dc63a2aae 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/weights/LSTMLayerWeights.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/weights/LSTMLayerWeights.java @@ -20,10 +20,10 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import org.nd4j.autodiff.samediff.SDVariable; -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.layers.recurrent.LSTMLayer; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; /** * The weight configuration of a LSTMLayer. For {@link LSTMLayer} diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/weights/RNNWeights.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/weights/RNNWeights.java index e0b8a5c27..c6c931c9b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/weights/RNNWeights.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/recurrent/weights/RNNWeights.java @@ -1,10 +1,10 @@ package org.nd4j.linalg.api.ops.impl.layers.recurrent.weights; import java.lang.reflect.Array; -import java.util.Arrays; + import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; public abstract class RNNWeights { public abstract SDVariable[] args(); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/BaseLoss.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/BaseLoss.java index 3f890da0b..8f5936465 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/BaseLoss.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/BaseLoss.java @@ -20,7 +20,7 @@ import lombok.NonNull; import org.nd4j.autodiff.loss.LossReduce; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/HuberLoss.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/HuberLoss.java index 564e726b3..0c1c65886 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/HuberLoss.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/HuberLoss.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.loss; import org.nd4j.autodiff.loss.LossReduce; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.loss.bp.HuberLossBp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/L2Loss.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/L2Loss.java index d36d36c2f..14c8b736f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/L2Loss.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/L2Loss.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.loss; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SoftmaxCrossEntropyWithLogitsLoss.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SoftmaxCrossEntropyWithLogitsLoss.java index defb8292b..de8a57aee 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SoftmaxCrossEntropyWithLogitsLoss.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SoftmaxCrossEntropyWithLogitsLoss.java @@ -19,13 +19,11 @@ package org.nd4j.linalg.api.ops.impl.loss; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.loss.bp.SoftmaxCrossEntropyWithLogitsLossBp; -import org.nd4j.linalg.factory.Nd4j; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SparseSoftmaxCrossEntropyLossWithLogits.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SparseSoftmaxCrossEntropyLossWithLogits.java index c58933134..f89b2ca53 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SparseSoftmaxCrossEntropyLossWithLogits.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SparseSoftmaxCrossEntropyLossWithLogits.java @@ -21,7 +21,7 @@ import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.internal.SameDiffOp; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/WeightedCrossEntropyLoss.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/WeightedCrossEntropyLoss.java index 2ee16ff22..e10c5b73b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/WeightedCrossEntropyLoss.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/WeightedCrossEntropyLoss.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/BaseLossBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/BaseLossBp.java index ea6be5992..1e931146e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/BaseLossBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/BaseLossBp.java @@ -20,7 +20,7 @@ import lombok.NonNull; import org.nd4j.autodiff.loss.LossReduce; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/HuberLossBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/HuberLossBp.java index 5b6d6e8b0..6041d5fce 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/HuberLossBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/HuberLossBp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.loss.bp; import org.nd4j.autodiff.loss.LossReduce; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; /** * Hinge loss diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/SoftmaxCrossEntropyLossBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/SoftmaxCrossEntropyLossBp.java index 8acf6f648..983aff519 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/SoftmaxCrossEntropyLossBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/SoftmaxCrossEntropyLossBp.java @@ -20,19 +20,11 @@ import lombok.NoArgsConstructor; import org.nd4j.autodiff.loss.LossReduce; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; -import org.nd4j.imports.NoOpNameFoundException; -import org.nd4j.imports.graphmapper.tf.TFGraphMapper; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; -import org.nd4j.linalg.api.ops.Op; -import org.nd4j.linalg.api.ops.impl.loss.BaseLoss; -import org.tensorflow.framework.AttrValue; -import org.tensorflow.framework.GraphDef; -import org.tensorflow.framework.NodeDef; import java.util.Arrays; import java.util.List; -import java.util.Map; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/SparseSoftmaxCrossEntropyLossWithLogitsBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/SparseSoftmaxCrossEntropyLossWithLogitsBp.java index 694d813be..e2f6171df 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/SparseSoftmaxCrossEntropyLossWithLogitsBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/bp/SparseSoftmaxCrossEntropyLossWithLogitsBp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.loss.bp; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/HashCode.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/HashCode.java index b8c7bf3d2..51b75c8c2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/HashCode.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/HashCode.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.api.ops.impl.reduce; import lombok.NonNull; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Mmul.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Mmul.java index d4bec6ac2..f778c552b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Mmul.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Mmul.java @@ -21,13 +21,13 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.linalg.api.blas.params.MMulTranspose; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/MmulBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/MmulBp.java index ee2ff0e13..5027872e3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/MmulBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/MmulBp.java @@ -19,12 +19,12 @@ package org.nd4j.linalg.api.ops.impl.reduce; import lombok.EqualsAndHashCode; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.blas.params.MMulTranspose; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Moments.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Moments.java index 89ba1549b..82627898e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Moments.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Moments.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/NormalizeMoments.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/NormalizeMoments.java index 366bbfe86..99e8df60b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/NormalizeMoments.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/NormalizeMoments.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.reduce; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/TensorMmul.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/TensorMmul.java index 820df18ab..8f69733ca 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/TensorMmul.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/TensorMmul.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.api.ops.impl.reduce; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.shade.guava.primitives.Ints; import org.nd4j.shade.guava.primitives.Longs; @@ -32,14 +32,14 @@ import org.nd4j.linalg.api.ops.Op; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; import java.util.*; -import static org.nd4j.linalg.util.ArrayUtil.*; +import static org.nd4j.common.util.ArrayUtil.*; /** * TensorMmul diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/ZeroFraction.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/ZeroFraction.java index 42ecc2f57..8f99e599c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/ZeroFraction.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/ZeroFraction.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/BaseReductionBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/BaseReductionBp.java index a66225c07..29c1ce0e0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/BaseReductionBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/BaseReductionBp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.reduce.bp; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/DotBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/DotBp.java index 88e78dd2a..2db5424fd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/DotBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/DotBp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.reduce.bp; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/PowBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/PowBp.java index 5e56c3d13..eedec9fe3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/PowBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bp/PowBp.java @@ -3,7 +3,7 @@ package org.nd4j.linalg.api.ops.impl.reduce.bp; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/BatchMmul.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/BatchMmul.java index 97fd5e538..602f4fc05 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/BatchMmul.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/BatchMmul.java @@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; import org.apache.commons.lang3.ArrayUtils; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/LogSumExp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/LogSumExp.java index edc3298b5..e9d39d1ba 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/LogSumExp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/LogSumExp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.reduce.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce3/BaseReduce3Op.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce3/BaseReduce3Op.java index 3f6b518f7..25f5cf274 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce3/BaseReduce3Op.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce3/BaseReduce3Op.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.reduce3; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/PRelu.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/PRelu.java index 4b9b37026..502a3a390 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/PRelu.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/PRelu.java @@ -16,7 +16,6 @@ package org.nd4j.linalg.api.ops.impl.scalar; -import java.util.Arrays; import java.util.Collections; import java.util.List; import lombok.Getter; @@ -24,7 +23,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/RectifiedLinearDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/RectifiedLinearDerivative.java index 0ee0c07f7..9136234df 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/RectifiedLinearDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/RectifiedLinearDerivative.java @@ -3,7 +3,7 @@ package org.nd4j.linalg.api.ops.impl.scalar; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterAdd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterAdd.java index 1c524ccf1..b43071af3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterAdd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterAdd.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterDiv.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterDiv.java index c2993eb23..7ef3109d7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterDiv.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterDiv.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMax.java index 12fe3380a..7808ef2b3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMax.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMin.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMin.java index 91a49487e..a063eba38 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMin.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMin.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMul.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMul.java index 705b85d3d..1c6773eb5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMul.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterMul.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNd.java index 5a16e4221..f11315b6a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNd.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdAdd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdAdd.java index c79ec058d..e0cf2ff7b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdAdd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdAdd.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdSub.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdSub.java index 8efc6717f..831f37f35 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdSub.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdSub.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdUpdate.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdUpdate.java index bf95b448d..8a0a116b9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdUpdate.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterNdUpdate.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterSub.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterSub.java index 15e6d5ac2..7f7159b2f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterSub.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterSub.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterUpdate.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterUpdate.java index 2e87af624..d3f746c31 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterUpdate.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scatter/ScatterUpdate.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scatter; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Concat.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Concat.java index 85cf62247..1db208bb6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Concat.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Concat.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Create.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Create.java index 0b966008c..9fbf51926 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Create.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Create.java @@ -20,7 +20,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Cross.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Cross.java index 616d4d1aa..44225f720 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Cross.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Cross.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Diag.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Diag.java index 94516ec54..ad5ddea56 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Diag.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Diag.java @@ -21,7 +21,7 @@ import lombok.NonNull; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.tensorflow.framework.AttrValue; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/DiagPart.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/DiagPart.java index b498157b6..eef93a568 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/DiagPart.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/DiagPart.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.tensorflow.framework.AttrValue; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ExpandDims.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ExpandDims.java index c51207d64..cef44a8c4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ExpandDims.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ExpandDims.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeAvg.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeAvg.java index 3fc734b6b..1a678e14c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeAvg.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeAvg.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMax.java index 4e41344fb..546299af9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMax.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMaxIndex.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMaxIndex.java index 47f7b606a..ca6345efd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMaxIndex.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMaxIndex.java @@ -19,14 +19,11 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; -import org.nd4j.linalg.api.ops.impl.layers.recurrent.weights.LSTMLayerWeights; -import org.nd4j.linalg.util.ArrayUtil; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeSum.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeSum.java index 36c522b8b..9f0a5df90 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeSum.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeSum.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/OneHot.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/OneHot.java index c08dcb1d6..8806133d7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/OneHot.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/OneHot.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/OnesLike.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/OnesLike.java index 8da18be06..ee9c9619c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/OnesLike.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/OnesLike.java @@ -20,7 +20,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ParallelStack.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ParallelStack.java index b4d71b40f..86fd8dc13 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ParallelStack.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ParallelStack.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Rank.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Rank.java index 5f1448d06..7344fb2d1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Rank.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Rank.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ReductionShape.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ReductionShape.java index d1f25408d..77e77e3b7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ReductionShape.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ReductionShape.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.Op; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SequenceMask.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SequenceMask.java index 94a6e6c2b..115be9ada 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SequenceMask.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SequenceMask.java @@ -21,7 +21,7 @@ import lombok.NonNull; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Shape.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Shape.java index 62bc5714e..2c379b13f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Shape.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Shape.java @@ -21,7 +21,7 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.serde.FlatBuffersMapper; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.descriptors.properties.adapters.DataTypeAdapter; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Size.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Size.java index acec28f68..a4130f99b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Size.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Size.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SizeAt.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SizeAt.java index 83521057f..28cc69dd1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SizeAt.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SizeAt.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Slice.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Slice.java index effe95b2b..9286af7be 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Slice.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Slice.java @@ -20,7 +20,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Split.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Split.java index 685623d32..105e866a5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Split.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Split.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import lombok.val; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Squeeze.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Squeeze.java index 2734d68b1..534f2cc61 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Squeeze.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Squeeze.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.tensorflow.framework.AttrValue; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Stack.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Stack.java index 28e92930c..d49d8eb4c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Stack.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Stack.java @@ -20,7 +20,7 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/StridedSlice.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/StridedSlice.java index 53deb43ca..027360222 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/StridedSlice.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/StridedSlice.java @@ -16,13 +16,12 @@ package org.nd4j.linalg.api.ops.impl.shape; -import lombok.NoArgsConstructor; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.linalg.api.buffer.DataType; @@ -30,7 +29,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.shape.bp.StridedSliceBp; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Tile.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Tile.java index 687342ed8..3eb6c0fe3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Tile.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Tile.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Transpose.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Transpose.java index ea4096f63..1af3fcda3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Transpose.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Transpose.java @@ -22,13 +22,13 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.VariableType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Unstack.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Unstack.java index b8d952b37..dc6ffcea2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Unstack.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Unstack.java @@ -21,7 +21,7 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ZerosLike.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ZerosLike.java index d71200e4a..ce004f704 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ZerosLike.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ZerosLike.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/ConcatBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/ConcatBp.java index 05b14ea0c..84ba47a97 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/ConcatBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/ConcatBp.java @@ -20,7 +20,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.Op; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/SliceBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/SliceBp.java index 08b7eb1c2..8dd9cada8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/SliceBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/SliceBp.java @@ -20,7 +20,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.exception.ND4JIllegalStateException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/StridedSliceBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/StridedSliceBp.java index 0f9ed2d90..a44ab3d7c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/StridedSliceBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/StridedSliceBp.java @@ -20,7 +20,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.exception.ND4JIllegalStateException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/TileBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/TileBp.java index 5253836a1..b453d79fb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/TileBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/bp/TileBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.shape.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/tensorops/EmbeddingLookup.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/tensorops/EmbeddingLookup.java index e59abc268..b2ddc535d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/tensorops/EmbeddingLookup.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/tensorops/EmbeddingLookup.java @@ -17,15 +17,13 @@ package org.nd4j.linalg.api.ops.impl.shape.tensorops; import lombok.NoArgsConstructor; import lombok.NonNull; -import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.PartitionMode; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.factory.Nd4j; import java.util.Collections; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/summarystats/Variance.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/summarystats/Variance.java index 9f69f8e6a..c4a97745a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/summarystats/Variance.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/summarystats/Variance.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.summarystats; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/BaseDynamicTransformOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/BaseDynamicTransformOp.java index 05a4fe37d..3813e1712 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/BaseDynamicTransformOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/BaseDynamicTransformOp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/BinCount.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/BinCount.java index b1d9cf3f8..4d082b6b8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/BinCount.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/BinCount.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/CheckNumerics.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/CheckNumerics.java index 3334c9bbd..83a563705 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/CheckNumerics.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/CheckNumerics.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Cholesky.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Cholesky.java index dd45af037..15688b819 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Cholesky.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Cholesky.java @@ -19,8 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.autodiff.samediff.ops.SDValidation; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Histogram.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Histogram.java index fdd48e133..00b53c120 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Histogram.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Histogram.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.api.ops.impl.transforms; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/HistogramFixedWidth.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/HistogramFixedWidth.java index 577c2018a..6889add66 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/HistogramFixedWidth.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/HistogramFixedWidth.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/NthElement.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/NthElement.java index fcf6390cf..50e790b0a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/NthElement.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/NthElement.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Pad.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Pad.java index ef8283be8..1540084d9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Pad.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Pad.java @@ -20,7 +20,7 @@ import lombok.NonNull; import org.nd4j.autodiff.samediff.SDIndex; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.PadMode; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/BooleanNot.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/BooleanNot.java index 053199731..cc212439e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/BooleanNot.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/BooleanNot.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.bool; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByAvgNorm.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByAvgNorm.java index a5f53622b..a528ed257 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByAvgNorm.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByAvgNorm.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.clip; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByNorm.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByNorm.java index ef1ebb38a..8c7b4b8c8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByNorm.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByNorm.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.clip; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByNormBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByNormBp.java index 7555a1da8..441dcdf18 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByNormBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByNormBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.clip; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByValue.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByValue.java index 44cde0abb..d221cc331 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByValue.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/clip/ClipByValue.java @@ -20,7 +20,7 @@ import lombok.NonNull; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/comparison/CompareAndReplace.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/comparison/CompareAndReplace.java index 9c5b54c72..c50c5f5df 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/comparison/CompareAndReplace.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/comparison/CompareAndReplace.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.comparison; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ATan2.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ATan2.java index e847142a6..34be3fdc7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ATan2.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ATan2.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Assign.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Assign.java index e9ce44c57..938ede32a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Assign.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Assign.java @@ -19,12 +19,11 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.Op; -import org.nd4j.linalg.factory.Nd4j; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitsHammingDistance.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitsHammingDistance.java index 1fa749830..2b85a4b79 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitsHammingDistance.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitsHammingDistance.java @@ -3,7 +3,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseAnd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseAnd.java index df972ff4b..751793d38 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseAnd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseAnd.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseOr.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseOr.java index e1e436297..9edc2bb1c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseOr.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseOr.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseXor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseXor.java index 601cc5d84..8ba7d99e5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseXor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseXor.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CReLU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CReLU.java index d442bc141..08045619a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CReLU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CReLU.java @@ -21,11 +21,11 @@ import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.Collections; import java.util.List; -import lombok.Getter; + import lombok.NonNull; @NoArgsConstructor diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CReluBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CReluBp.java index 7b96afffd..0d41cfaaa 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CReluBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CReluBp.java @@ -21,11 +21,11 @@ import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.Collections; import java.util.List; -import lombok.Getter; + import lombok.NonNull; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Choose.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Choose.java index 030d0a5be..3ecf23e54 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Choose.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Choose.java @@ -20,7 +20,7 @@ import org.nd4j.shade.guava.primitives.Doubles; import org.nd4j.shade.guava.primitives.Ints; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CumProd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CumProd.java index 34e3e5f1d..f93d2bcf8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CumProd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CumProd.java @@ -20,7 +20,7 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.AttributeAdapter; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.descriptors.properties.adapters.BooleanAdapter; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CumSum.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CumSum.java index 97c53f4e2..8c4bb6524 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CumSum.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CumSum.java @@ -21,7 +21,7 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.AttributeAdapter; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.descriptors.properties.adapters.BooleanAdapter; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CyclicRShiftBits.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CyclicRShiftBits.java index a8b4ebbb0..fa691bf8d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CyclicRShiftBits.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CyclicRShiftBits.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CyclicShiftBits.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CyclicShiftBits.java index ea7ae1715..b11e0cefe 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CyclicShiftBits.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/CyclicShiftBits.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Dilation2D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Dilation2D.java index 3bc812596..262160440 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Dilation2D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Dilation2D.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.descriptors.properties.AttributeAdapter; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DotProductAttention.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DotProductAttention.java index 300f8277a..1e3787133 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DotProductAttention.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DotProductAttention.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DotProductAttentionBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DotProductAttentionBp.java index 0d88f028f..358a5b2ef 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DotProductAttentionBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DotProductAttentionBp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DynamicStitch.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DynamicStitch.java index 8c94c3e54..1163b2403 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DynamicStitch.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/DynamicStitch.java @@ -20,7 +20,7 @@ import lombok.NonNull; import org.apache.commons.lang3.ArrayUtils; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/EqualTo.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/EqualTo.java index e58609f2a..dc132f437 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/EqualTo.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/EqualTo.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/FakeQuantWithMinMaxArgs.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/FakeQuantWithMinMaxArgs.java index 5186fda30..3cd9ce8f4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/FakeQuantWithMinMaxArgs.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/FakeQuantWithMinMaxArgs.java @@ -2,7 +2,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/FakeQuantWithMinMaxVars.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/FakeQuantWithMinMaxVars.java index efe7d71a1..9cd7e316a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/FakeQuantWithMinMaxVars.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/FakeQuantWithMinMaxVars.java @@ -2,7 +2,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Fill.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Fill.java index 0e39eb77b..7fa9e71e0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Fill.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Fill.java @@ -20,7 +20,7 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.adapters.DataTypeAdapter; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/GreaterThan.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/GreaterThan.java index e4b28e56a..153470200 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/GreaterThan.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/GreaterThan.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/GreaterThanOrEqual.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/GreaterThanOrEqual.java index 0ebea5e9c..d9d03306d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/GreaterThanOrEqual.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/GreaterThanOrEqual.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/InTopK.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/InTopK.java index 72863718a..9e8f7825a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/InTopK.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/InTopK.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/InvertPermutation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/InvertPermutation.java index dbf3bfdd4..f3e9fd04e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/InvertPermutation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/InvertPermutation.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNonDecreasing.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNonDecreasing.java index 95640fead..0a9360670 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNonDecreasing.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNonDecreasing.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNumericTensor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNumericTensor.java index 4f1804480..e0346a8a1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNumericTensor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNumericTensor.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsStrictlyIncreasing.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsStrictlyIncreasing.java index f6701c4ca..2f85f5352 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsStrictlyIncreasing.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsStrictlyIncreasing.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LayerNorm.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LayerNorm.java index f16a92318..b9795c97a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LayerNorm.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LayerNorm.java @@ -20,13 +20,12 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LayerNormBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LayerNormBp.java index f55db2e50..07504a9af 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LayerNormBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LayerNormBp.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LessThan.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LessThan.java index 0445b58c4..a44b008ab 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LessThan.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LessThan.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LessThanOrEqual.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LessThanOrEqual.java index 06e03335c..ef7bc642a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LessThanOrEqual.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LessThanOrEqual.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogMatrixDeterminant.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogMatrixDeterminant.java index b5c52c20f..ad2f44421 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogMatrixDeterminant.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogMatrixDeterminant.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogSoftMax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogSoftMax.java index 2de57451f..e452ff4eb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogSoftMax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogSoftMax.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalAnd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalAnd.java index e2d0f910d..a6feadd15 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalAnd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalAnd.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalNot.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalNot.java index be6ae051a..feee869a1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalNot.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalNot.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalOr.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalOr.java index fb2430d2c..7b0c02957 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalOr.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalOr.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalXor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalXor.java index c3c515b25..29cc492da 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalXor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalXor.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDeterminant.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDeterminant.java index 37fe652d8..37e3d1864 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDeterminant.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDeterminant.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDiag.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDiag.java index 2081692f0..e62dee421 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDiag.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDiag.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDiagPart.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDiagPart.java index 4b1f07abb..e1109f55a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDiagPart.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixDiagPart.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixInverse.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixInverse.java index 475f3c6a8..93e6343f5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixInverse.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixInverse.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixSetDiag.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixSetDiag.java index 9f4b97576..073eaf182 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixSetDiag.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MatrixSetDiag.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Max.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Max.java index 0197f0c79..2d141a187 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Max.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Max.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Min.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Min.java index cf0cf9c58..70d42ea68 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Min.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Min.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MirrorPad.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MirrorPad.java index 7a679bff6..15bf8d261 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MirrorPad.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MirrorPad.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.AttributeAdapter; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.descriptors.properties.adapters.StringNotEqualsAdapter; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MultiHeadDotProductAttention.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MultiHeadDotProductAttention.java index 98765ed96..60bdd4b01 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MultiHeadDotProductAttention.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MultiHeadDotProductAttention.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MultiHeadDotProductAttentionBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MultiHeadDotProductAttentionBp.java index 4de13639e..89d60c2c3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MultiHeadDotProductAttentionBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/MultiHeadDotProductAttentionBp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/NotEqualTo.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/NotEqualTo.java index ba2e36ea2..b49ac7402 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/NotEqualTo.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/NotEqualTo.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ParallelConcat.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ParallelConcat.java index 074256515..4610b4725 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ParallelConcat.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ParallelConcat.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.AttributeAdapter; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Pow.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Pow.java index 0f8286769..5c25e9891 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Pow.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Pow.java @@ -19,13 +19,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.reduce.bp.PowBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Qr.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Qr.java index 409b0bd8e..714a93b6e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Qr.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Qr.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/RShiftBits.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/RShiftBits.java index d476b51f9..bc5f32496 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/RShiftBits.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/RShiftBits.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Reverse.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Reverse.java index bd35c6813..26a63d08a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Reverse.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Reverse.java @@ -19,14 +19,13 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.shape.bp.MergeAvgBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ReverseV2.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ReverseV2.java index a493cd46e..f22023410 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ReverseV2.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ReverseV2.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ShiftBits.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ShiftBits.java index e93ab6d4f..f1c8c0f78 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ShiftBits.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ShiftBits.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/SoftMax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/SoftMax.java index 737e76f3b..8ff063943 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/SoftMax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/SoftMax.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Standardize.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Standardize.java index 8acef4029..f3d8af145 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Standardize.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Standardize.java @@ -18,12 +18,11 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/StandardizeBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/StandardizeBp.java index 20f132907..6369126fd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/StandardizeBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/StandardizeBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Svd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Svd.java index 60de8a665..80280e2dd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Svd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Svd.java @@ -21,7 +21,7 @@ import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ThresholdRelu.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ThresholdRelu.java index 1688c03c4..5e19d8f91 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ThresholdRelu.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/ThresholdRelu.java @@ -22,7 +22,7 @@ import lombok.Getter; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/TopK.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/TopK.java index 82a40218a..b210de072 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/TopK.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/TopK.java @@ -18,12 +18,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Trace.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Trace.java index 9faca3403..48db0e257 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Trace.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Trace.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Unique.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Unique.java index 8df10d2e9..d79c2d2c2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Unique.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Unique.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/UniqueWithCounts.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/UniqueWithCounts.java index 74a7397a4..7c605bda4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/UniqueWithCounts.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/UniqueWithCounts.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/XwPlusB.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/XwPlusB.java index 7b8dbf209..cb98ce740 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/XwPlusB.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/XwPlusB.java @@ -19,9 +19,8 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; -import org.nd4j.linalg.api.blas.params.MMulTranspose; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Zeta.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Zeta.java index 1c69a17c2..d00c3587e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Zeta.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/Zeta.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMax.java index 217062e09..0d978b73f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMax.java @@ -18,13 +18,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom.segment; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.SegmentMaxBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMean.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMean.java index 79e887001..11780b260 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMean.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMean.java @@ -18,13 +18,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom.segment; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.SegmentMeanBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMin.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMin.java index 367d6ee1a..8063562d5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMin.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentMin.java @@ -18,13 +18,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom.segment; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.SegmentMinBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentProd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentProd.java index ddd719045..6bfcb78c1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentProd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentProd.java @@ -18,13 +18,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom.segment; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.SegmentProdBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentSum.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentSum.java index 9f6269848..e0c0af833 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentSum.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/segment/SegmentSum.java @@ -18,13 +18,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.custom.segment; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.SegmentSumBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/dtype/Cast.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/dtype/Cast.java index b168adb43..96cd840ba 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/dtype/Cast.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/dtype/Cast.java @@ -21,7 +21,7 @@ import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.serde.FlatBuffersMapper; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.converters.DifferentialFunctionClassHolder; import org.nd4j.imports.descriptors.properties.AttributeAdapter; import org.nd4j.imports.descriptors.properties.PropertyMapping; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/CubeBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/CubeBp.java index 16f67c910..fafc8c65a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/CubeBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/CubeBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/EluBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/EluBp.java index 0e2a4c6b9..ae6032ffe 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/EluBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/EluBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/HardSigmoidBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/HardSigmoidBp.java index 7bf905c5d..e2d376cdc 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/HardSigmoidBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/HardSigmoidBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/HardTanhBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/HardTanhBp.java index 10102eb2b..e0cd91b25 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/HardTanhBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/HardTanhBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/LeakyReLUBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/LeakyReLUBp.java index 60ef40423..45ca54d3e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/LeakyReLUBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/LeakyReLUBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/LogSoftMaxDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/LogSoftMaxDerivative.java index 6be0367fe..ff866498c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/LogSoftMaxDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/LogSoftMaxDerivative.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.gradient; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/PReluBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/PReluBp.java index 6c41af445..0d2ce1b36 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/PReluBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/PReluBp.java @@ -23,7 +23,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/RationalTanhBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/RationalTanhBp.java index f70d79ae1..a07051390 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/RationalTanhBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/RationalTanhBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/RectifiedTanhBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/RectifiedTanhBp.java index c10d6071a..2009462d1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/RectifiedTanhBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/RectifiedTanhBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/Relu6Derivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/Relu6Derivative.java index 554893052..ef6ed3a30 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/Relu6Derivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/Relu6Derivative.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.gradient; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SeluBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SeluBp.java index a13171e10..cd0a254c9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SeluBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SeluBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftPlusBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftPlusBp.java index be8c1b702..4e9e9d347 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftPlusBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftPlusBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftSignBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftSignBp.java index 80a4df0e1..09f4f02fe 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftSignBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftSignBp.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftmaxBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftmaxBp.java index 37a1d8632..9797b19a9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftmaxBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SoftmaxBp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.gradient; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/ThresholdReluBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/ThresholdReluBp.java index 8d04a7118..80c325f67 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/ThresholdReluBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/ThresholdReluBp.java @@ -22,7 +22,7 @@ import lombok.Getter; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/FloorModOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/FloorModOp.java index 29799a221..ed2de94a6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/FloorModOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/FloorModOp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.pairwise.arithmetic; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/MergeAddOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/MergeAddOp.java index 6edf4d002..615eedbbe 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/MergeAddOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/MergeAddOp.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/bp/BaseArithmeticBackpropOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/bp/BaseArithmeticBackpropOp.java index 36256e893..d49dcd8a6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/bp/BaseArithmeticBackpropOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/bp/BaseArithmeticBackpropOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.pairwise.arithmetic.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/bp/SquaredDifferenceBpOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/bp/SquaredDifferenceBpOp.java index 05477a5f5..e7412a1b8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/bp/SquaredDifferenceBpOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/arithmetic/bp/SquaredDifferenceBpOp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.pairwise.arithmetic.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Abs.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Abs.java index ef21623c2..68ffdad34 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Abs.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Abs.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.same; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.BaseTransformSameOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Identity.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Identity.java index 6918b8d2c..f9744d8ce 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Identity.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Identity.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.same; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.impl.transforms.BaseDynamicTransformOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMax.java index 6f0432ba5..4fded8b58 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMax.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMean.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMean.java index ef39f1c91..637eff3bb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMean.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMean.java @@ -19,13 +19,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.UnsortedSegmentMeanBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMin.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMin.java index 6dc6e7737..29e191ddb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMin.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentMin.java @@ -19,13 +19,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.UnsortedSegmentMinBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentProd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentProd.java index f753fe6dc..5770c0a22 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentProd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentProd.java @@ -19,13 +19,12 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.UnsortedSegmentProdBp; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentSqrtN.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentSqrtN.java index ea5285f12..64b6d2427 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentSqrtN.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentSqrtN.java @@ -19,14 +19,13 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.UnsortedSegmentSqrtNBp; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentSum.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentSum.java index d0d5b095b..19a5f6e69 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentSum.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/UnsortedSegmentSum.java @@ -19,14 +19,13 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.api.ops.impl.transforms.segment.bp.UnsortedSegmentSumBp; import org.nd4j.linalg.factory.Nd4j; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMaxBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMaxBp.java index f910b90fe..f6c79a054 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMaxBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMaxBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMeanBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMeanBp.java index 0f6fdc810..a632e574f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMeanBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMeanBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMinBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMinBp.java index 491ef19f4..bfdce2499 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMinBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentMinBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentProdBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentProdBp.java index 3e8e853e2..de1f44f01 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentProdBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentProdBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentSumBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentSumBp.java index 81bed4d00..e8d4c6daf 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentSumBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/SegmentSumBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMaxBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMaxBp.java index 113a5b096..1f6e38480 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMaxBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMaxBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMeanBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMeanBp.java index 1122f7c8e..391510b9c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMeanBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMeanBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMinBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMinBp.java index 40b4697ad..ad2b2a45f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMinBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentMinBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentProdBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentProdBp.java index facb96b2a..f6ffa2b7b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentProdBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentProdBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentSqrtNBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentSqrtNBp.java index 1c911874d..f22f53530 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentSqrtNBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentSqrtNBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentSumBp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentSumBp.java index bd3e8a423..f7de058fb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentSumBp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/segment/bp/UnsortedSegmentSumBp.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.segment.bp; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/ELU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/ELU.java index 1c3c430d1..012fdcdb6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/ELU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/ELU.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.impl.transforms.strict; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/BaseRandomOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/BaseRandomOp.java index 0672f5d15..a51ac0c4c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/BaseRandomOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/BaseRandomOp.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random; import lombok.NoArgsConstructor; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.BaseOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/compat/RandomStandardNormal.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/compat/RandomStandardNormal.java index 074f7f453..9fc628f28 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/compat/RandomStandardNormal.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/compat/RandomStandardNormal.java @@ -18,12 +18,12 @@ package org.nd4j.linalg.api.ops.random.compat; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Collections; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/DistributionUniform.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/DistributionUniform.java index 4b104d08b..a10706365 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/DistributionUniform.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/DistributionUniform.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random.custom; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomBernoulli.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomBernoulli.java index 46da9e159..041d8c010 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomBernoulli.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomBernoulli.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random.custom; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomExponential.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomExponential.java index dfedd6dcd..bb0476478 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomExponential.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomExponential.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random.custom; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomGamma.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomGamma.java index d7ad376f0..7be70e218 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomGamma.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomGamma.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.adapters.DataTypeAdapter; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomNormal.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomNormal.java index ee6355cc1..44b6b8ae6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomNormal.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomNormal.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.random.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomPoisson.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomPoisson.java index 03dc05830..f14c2b709 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomPoisson.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomPoisson.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.descriptors.properties.adapters.DataTypeAdapter; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomShuffle.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomShuffle.java index b08970f11..68d2bf56d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomShuffle.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/custom/RandomShuffle.java @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -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.DynamicCustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BernoulliDistribution.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BernoulliDistribution.java index ec4bf96a5..1a413e154 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BernoulliDistribution.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BernoulliDistribution.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random.impl; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BinomialDistribution.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BinomialDistribution.java index 29a17aa29..f823700d0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BinomialDistribution.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BinomialDistribution.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random.impl; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BinomialDistributionEx.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BinomialDistributionEx.java index 3ec26a927..d6ed13a7e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BinomialDistributionEx.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/BinomialDistributionEx.java @@ -18,14 +18,12 @@ package org.nd4j.linalg.api.ops.random.impl; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.random.BaseRandomOp; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; /** * This Op generates binomial distribution diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/Choice.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/Choice.java index b1e399fc5..f0961a6bd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/Choice.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/Choice.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.random.impl; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.random.BaseRandomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/GaussianDistribution.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/GaussianDistribution.java index 1aa031ec0..eb78af894 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/GaussianDistribution.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/GaussianDistribution.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random.impl; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/LogNormalDistribution.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/LogNormalDistribution.java index 44545f8ab..d0e2bc462 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/LogNormalDistribution.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/LogNormalDistribution.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random.impl; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/Range.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/Range.java index b024659c0..6277a04bc 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/Range.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/Range.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.api.ops.random.impl; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/TruncatedNormalDistribution.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/TruncatedNormalDistribution.java index a95169d78..9453bab8b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/TruncatedNormalDistribution.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/TruncatedNormalDistribution.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random.impl; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/UniformDistribution.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/UniformDistribution.java index e1b40a382..84fade263 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/UniformDistribution.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/UniformDistribution.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.ops.random.impl; import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/util/PrintAffinity.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/util/PrintAffinity.java index d21e55916..c374c7dd3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/util/PrintAffinity.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/util/PrintAffinity.java @@ -16,10 +16,8 @@ package org.nd4j.linalg.api.ops.util; -import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.factory.Nd4j; /** * This is a wrapper for PrintAffinity op that just prints out affinity & locality status of INDArray diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/util/PrintVariable.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/util/PrintVariable.java index abbf88f15..76ffb20be 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/util/PrintVariable.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/util/PrintVariable.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.api.ops.util; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/rng/DefaultRandom.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/rng/DefaultRandom.java index b782a22b6..c23025117 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/rng/DefaultRandom.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/rng/DefaultRandom.java @@ -23,7 +23,7 @@ import org.bytedeco.javacpp.Pointer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; /** * Apache commons based random number generation diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/rng/distribution/impl/OrthogonalDistribution.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/rng/distribution/impl/OrthogonalDistribution.java index 80f9910db..8131617f8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/rng/distribution/impl/OrthogonalDistribution.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/rng/distribution/impl/OrthogonalDistribution.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.ops.random.impl.GaussianDistribution; import org.nd4j.linalg.api.rng.distribution.BaseDistribution; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; /** * diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/shape/LongShapeDescriptor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/shape/LongShapeDescriptor.java index b15da1ad5..63d29f3b9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/shape/LongShapeDescriptor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/shape/LongShapeDescriptor.java @@ -21,7 +21,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.shape.options.ArrayOptionsHelper; import org.nd4j.linalg.api.shape.options.ArrayType; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/shape/Shape.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/shape/Shape.java index 44298ffa2..2da490a0d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/shape/Shape.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/shape/Shape.java @@ -21,7 +21,7 @@ import org.nd4j.shade.guava.primitives.Ints; import org.nd4j.shade.guava.primitives.Longs; import lombok.NonNull; import lombok.val; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; @@ -31,7 +31,7 @@ import org.nd4j.linalg.api.shape.options.ArrayType; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.INDArrayIndex; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.*; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/cache/TADManager.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/cache/TADManager.java index 1ab608dc4..f681f437e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/cache/TADManager.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/cache/TADManager.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.cache; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/checkutil/NDArrayCreationUtil.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/checkutil/NDArrayCreationUtil.java index f3ac98565..81e6e6160 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/checkutil/NDArrayCreationUtil.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/checkutil/NDArrayCreationUtil.java @@ -22,8 +22,8 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/convolution/BaseConvolution.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/convolution/BaseConvolution.java index 7bdbcfa22..71c85890c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/convolution/BaseConvolution.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/convolution/BaseConvolution.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.convolution; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/DataSet.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/DataSet.java index 1a4e97d22..db356c44f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/DataSet.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/DataSet.java @@ -18,17 +18,17 @@ package org.nd4j.linalg.dataset; import org.nd4j.shade.guava.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSetUtil; import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.preprocessor.NormalizerStandardize; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.util.FeatureUtil; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.util.MathUtils; import java.io.*; import java.util.*; @@ -1368,7 +1368,7 @@ public class DataSet implements org.nd4j.linalg.dataset.api.DataSet { INDArray[] fMaskNew = (fMask != null ? new INDArray[] {fMask} : null); INDArray[] lMaskNew = (lMask != null ? new INDArray[] {lMask} : null); - return new org.nd4j.linalg.dataset.MultiDataSet(fNew, lNew, fMaskNew, lMaskNew); + return new org.nd4j.linalg.dataset.MultiDataSet(fNew, lNew, fMaskNew, lMaskNew, exampleMetaData); } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/MiniBatchFileDataSetIterator.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/MiniBatchFileDataSetIterator.java index 3673e3577..3c928175b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/MiniBatchFileDataSetIterator.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/MiniBatchFileDataSetIterator.java @@ -22,9 +22,8 @@ import org.nd4j.linalg.dataset.api.DataSetPreProcessor; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.util.ND4JFileUtils; +import org.nd4j.common.util.ND4JFileUtils; -import javax.annotation.processing.SupportedAnnotationTypes; import java.io.*; import java.util.ArrayList; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/MultiDataSet.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/MultiDataSet.java index 1216586fe..0603d93a3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/MultiDataSet.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/MultiDataSet.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.dataset; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSetUtil; import org.nd4j.linalg.factory.Nd4j; @@ -43,45 +43,63 @@ public class MultiDataSet implements org.nd4j.linalg.dataset.api.MultiDataSet { } - /** MultiDataSet constructor with single features/labels input, no mask arrays */ + /** + * MultiDataSet constructor with single features/labels input, no mask arrays + */ public MultiDataSet(INDArray features, INDArray labels) { this(features, labels, null, null); } - /** MultiDataSet constructor with single features/labels input, single mask arrays */ + /** + * MultiDataSet constructor with single features/labels input, single mask arrays + */ public MultiDataSet(INDArray features, INDArray labels, INDArray featuresMask, INDArray labelsMask) { - this((features != null ? new INDArray[] {features} : null), (labels != null ? new INDArray[] {labels} : null), - (featuresMask != null ? new INDArray[] {featuresMask} : null), - (labelsMask != null ? new INDArray[] {labelsMask} : null)); + this((features != null ? new INDArray[]{features} : null), (labels != null ? new INDArray[]{labels} : null), + (featuresMask != null ? new INDArray[]{featuresMask} : null), + (labelsMask != null ? new INDArray[]{labelsMask} : null)); } - /** MultiDataSet constructor with no mask arrays */ + /** + * MultiDataSet constructor with no mask arrays + */ public MultiDataSet(INDArray[] features, INDArray[] labels) { this(features, labels, null, null); } /** - * - * @param features The features (inputs) to the algorithm/neural network - * @param labels The labels (outputs) to the algorithm/neural network + * @param features The features (inputs) to the algorithm/neural network + * @param labels The labels (outputs) to the algorithm/neural network * @param featuresMaskArrays The mask arrays for the features. May be null. Typically used with variable-length time series models, etc - * @param labelsMaskArrays The mask arrays for the labels. May be null. Typically used with variable-length time series models, etc + * @param labelsMaskArrays The mask arrays for the labels. May be null. Typically used with variable-length time series models, etc */ public MultiDataSet(INDArray[] features, INDArray[] labels, INDArray[] featuresMaskArrays, - INDArray[] labelsMaskArrays) { + INDArray[] labelsMaskArrays) { + this(features, labels, featuresMaskArrays, labelsMaskArrays, null); + } + + /** + * @param features The features (inputs) to the algorithm/neural network + * @param labels The labels (outputs) to the algorithm/neural network + * @param featuresMaskArrays The mask arrays for the features. May be null. Typically used with variable-length time series models, etc + * @param labelsMaskArrays The mask arrays for the labels. May be null. Typically used with variable-length time series models, etc + * @param exampleMetaData Metadata for each example. May be null + */ + public MultiDataSet(INDArray[] features, INDArray[] labels, INDArray[] featuresMaskArrays, + INDArray[] labelsMaskArrays, List exampleMetaData) { if (features != null && featuresMaskArrays != null && features.length != featuresMaskArrays.length) { throw new IllegalArgumentException("Invalid features / features mask arrays combination: " - + "features and features mask arrays must not be different lengths"); + + "features and features mask arrays must not be different lengths"); } if (labels != null && labelsMaskArrays != null && labels.length != labelsMaskArrays.length) { throw new IllegalArgumentException("Invalid labels / labels mask arrays combination: " - + "labels and labels mask arrays must not be different lengths"); + + "labels and labels mask arrays must not be different lengths"); } this.features = features; this.labels = labels; this.featuresMaskArrays = featuresMaskArrays; this.labelsMaskArrays = labelsMaskArrays; + this.exampleMetaData = exampleMetaData; Nd4j.getExecutioner().commit(); } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/DataSetUtil.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/DataSetUtil.java index 94d5b1bfd..5c028cbfb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/DataSetUtil.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/DataSetUtil.java @@ -19,9 +19,9 @@ package org.nd4j.linalg.dataset.api; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.broadcast.BroadcastMulOp; import org.nd4j.linalg.api.shape.Shape; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/CompositeDataSetPreProcessor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/CompositeDataSetPreProcessor.java index 7be4d7d3b..82cf7f6d3 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/CompositeDataSetPreProcessor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/CompositeDataSetPreProcessor.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.dataset.api.preprocessor; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/CropAndResizeDataSetPreProcessor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/CropAndResizeDataSetPreProcessor.java index 9db87174b..ba896ad80 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/CropAndResizeDataSetPreProcessor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/CropAndResizeDataSetPreProcessor.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.dataset.api.preprocessor; -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.CustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/ImagePreProcessingScaler.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/ImagePreProcessingScaler.java index 77f3c39d9..c45ba7833 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/ImagePreProcessingScaler.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/ImagePreProcessingScaler.java @@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/LabelLastTimeStepPreProcessor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/LabelLastTimeStepPreProcessor.java index b42241a9d..43dab2b17 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/LabelLastTimeStepPreProcessor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/LabelLastTimeStepPreProcessor.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.dataset.api.preprocessor; -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.dataset.api.DataSet; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/PermuteDataSetPreProcessor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/PermuteDataSetPreProcessor.java index 3ea348975..a83ece5ec 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/PermuteDataSetPreProcessor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/PermuteDataSetPreProcessor.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.dataset.api.preprocessor; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/RGBtoGrayscaleDataSetPreProcessor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/RGBtoGrayscaleDataSetPreProcessor.java index d7839e8d8..a2bcd3224 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/RGBtoGrayscaleDataSetPreProcessor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/preprocessor/RGBtoGrayscaleDataSetPreProcessor.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.dataset.api.preprocessor; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dimensionalityreduction/PCA.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dimensionalityreduction/PCA.java index 1babd29de..d016017aa 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dimensionalityreduction/PCA.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dimensionalityreduction/PCA.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.dimensionalityreduction; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.eigen.Eigen; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/eigen/Eigen.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/eigen/Eigen.java index bda443b88..3bdda679b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/eigen/Eigen.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/eigen/Eigen.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.eigen; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.inverse.InvertMatrix; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/env/impl/OmpNumThreadsAction.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/env/impl/OmpNumThreadsAction.java index c3c9e5433..61afabd38 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/env/impl/OmpNumThreadsAction.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/env/impl/OmpNumThreadsAction.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.env.impl; import lombok.val; -import org.nd4j.config.ND4JEnvironmentVars; +import org.nd4j.common.config.ND4JEnvironmentVars; import org.nd4j.linalg.env.EnvironmentalAction; public class OmpNumThreadsAction implements EnvironmentalAction { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/BaseNDArrayFactory.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/BaseNDArrayFactory.java index 907290ef9..4757f96b6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/BaseNDArrayFactory.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/BaseNDArrayFactory.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.factory; import lombok.NonNull; import lombok.val; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.blas.*; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; @@ -32,8 +32,8 @@ import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.exception.ND4JArraySizeException; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.AtomicDouble; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.AtomicDouble; +import org.nd4j.common.util.ArrayUtil; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Broadcast.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Broadcast.java index 41d9e74c6..d1c613341 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Broadcast.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Broadcast.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.factory; -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.broadcast.*; import org.nd4j.linalg.api.ops.impl.broadcast.bool.*; @@ -29,7 +29,6 @@ import org.nd4j.linalg.api.ops.impl.transforms.custom.Max; import org.nd4j.linalg.api.ops.impl.transforms.custom.Min; import org.nd4j.linalg.api.ops.impl.transforms.custom.NotEqualTo; import org.nd4j.linalg.api.ops.impl.transforms.pairwise.arithmetic.*; -import org.nd4j.linalg.api.ops.impl.transforms.comparison.*; import org.nd4j.linalg.api.ops.impl.transforms.same.AMax; import org.nd4j.linalg.api.ops.impl.transforms.same.AMin; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/DataTypeValidation.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/DataTypeValidation.java index 4c13f9de5..0bf081445 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/DataTypeValidation.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/DataTypeValidation.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.factory; import lombok.val; -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; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Nd4j.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Nd4j.java index 6c371fe01..b01c28d16 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Nd4j.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Nd4j.java @@ -30,9 +30,9 @@ import org.apache.commons.lang3.ArrayUtils; import org.bytedeco.javacpp.*; import org.bytedeco.javacpp.indexer.*; import org.nd4j.autodiff.samediff.serde.FlatBuffersMapper; -import org.nd4j.base.Preconditions; -import org.nd4j.config.ND4JEnvironmentVars; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.config.ND4JEnvironmentVars; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.context.Nd4jContext; import org.nd4j.graph.FlatArray; import org.nd4j.linalg.api.blas.params.MMulTranspose; @@ -84,11 +84,11 @@ import org.nd4j.linalg.factory.Nd4jBackend.NoAvailableBackendException; import org.nd4j.linalg.api.memory.BasicMemoryManager; import org.nd4j.linalg.api.memory.MemoryManager; import org.nd4j.linalg.api.memory.deallocation.DeallocatorService; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.string.NDArrayStrings; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.util.LongUtils; -import org.nd4j.tools.PropertyParser; +import org.nd4j.common.tools.PropertyParser; import org.nd4j.versioncheck.VersionCheck; import java.io.*; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Nd4jBackend.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Nd4jBackend.java index c3b9ea558..03f4e4149 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Nd4jBackend.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/Nd4jBackend.java @@ -18,10 +18,10 @@ package org.nd4j.linalg.factory; import lombok.extern.slf4j.Slf4j; -import org.nd4j.config.ND4JEnvironmentVars; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.config.ND4JEnvironmentVars; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.context.Nd4jContext; -import org.nd4j.linalg.io.Resource; +import org.nd4j.common.io.Resource; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDBase.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDBase.java index cd2a2b540..83352cbba 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDBase.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDBase.java @@ -20,7 +20,7 @@ package org.nd4j.linalg.factory.ops; import static org.nd4j.linalg.factory.NDValidation.isSameType; -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.factory.NDValidation; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDBitwise.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDBitwise.java index d874b5bbf..901491226 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDBitwise.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDBitwise.java @@ -20,7 +20,7 @@ package org.nd4j.linalg.factory.ops; import static org.nd4j.linalg.factory.NDValidation.isSameType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.NDValidation; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDCNN.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDCNN.java index 103e761be..00123068e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDCNN.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDCNN.java @@ -20,7 +20,7 @@ package org.nd4j.linalg.factory.ops; import static org.nd4j.linalg.factory.NDValidation.isSameType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.DataFormat; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv1DConfig; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDImage.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDImage.java index 03b9f8571..e2443b300 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDImage.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDImage.java @@ -20,7 +20,7 @@ package org.nd4j.linalg.factory.ops; import static org.nd4j.linalg.factory.NDValidation.isSameType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.ImageResizeMethod; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.NDValidation; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDMath.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDMath.java index b00da5e04..cb8ab10c0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDMath.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDMath.java @@ -20,7 +20,7 @@ package org.nd4j.linalg.factory.ops; import static org.nd4j.linalg.factory.NDValidation.isSameType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.PartitionMode; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDNN.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDNN.java index e2a8af245..f12b2dac6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDNN.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDNN.java @@ -20,7 +20,7 @@ package org.nd4j.linalg.factory.ops; import static org.nd4j.linalg.factory.NDValidation.isSameType; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.enums.PadMode; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.NDValidation; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDRandom.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDRandom.java index dc5e472e8..f40a67891 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDRandom.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/ops/NDRandom.java @@ -20,7 +20,7 @@ package org.nd4j.linalg.factory.ops; import static org.nd4j.linalg.factory.NDValidation.isSameType; -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.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/Indices.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/Indices.java index c17295409..647b8f4b8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/Indices.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/Indices.java @@ -24,7 +24,7 @@ import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.NDArrayFactory; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.util.LongUtils; import java.util.ArrayList; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/IntervalIndex.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/IntervalIndex.java index b055430a7..01f82ddf4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/IntervalIndex.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/IntervalIndex.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.indexing; import org.nd4j.shade.guava.primitives.Longs; import lombok.Getter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/NDArrayIndex.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/NDArrayIndex.java index 62afce67f..04975f0a5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/NDArrayIndex.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/NDArrayIndex.java @@ -18,10 +18,10 @@ package org.nd4j.linalg.indexing; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.ArrayList; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Condition.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Condition.java index 6c7093cab..dd0a3af83 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Condition.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Condition.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.indexing.conditions; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; /** * Condition for boolean indexing diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/ConditionBuilder.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/ConditionBuilder.java index c98293229..dd893c314 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/ConditionBuilder.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/ConditionBuilder.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.indexing.conditions; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; /** * Mini dsl for building conditions diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Identity.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Identity.java index 6c19cef2d..c2d379ab0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Identity.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Identity.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.indexing.functions; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; /** * Created by agibsonccc on 10/8/14. diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/StableNumber.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/StableNumber.java index 483542a9a..67ea08ddf 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/StableNumber.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/StableNumber.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.indexing.functions; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; /** * Returns a stable number based on infinity diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Value.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Value.java index 5562bbb35..991fd467b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Value.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Value.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.indexing.functions; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; /** * Created by agibsonccc on 10/8/14. diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Zero.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Zero.java index b8b53c2d1..6096c53fe 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Zero.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/functions/Zero.java @@ -16,7 +16,7 @@ package org.nd4j.linalg.indexing.functions; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; /** * Created by agibsonccc on 10/8/14. diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/NoOpUpdater.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/NoOpUpdater.java index 7576a62be..694852645 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/NoOpUpdater.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/NoOpUpdater.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.learning; import lombok.Data; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.learning.config.NoOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/SgdUpdater.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/SgdUpdater.java index a2d0b0214..2476c4c3e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/SgdUpdater.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/SgdUpdater.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.learning; import lombok.Data; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.learning.config.Sgd; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/legacy/AdaGrad.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/legacy/AdaGrad.java index 6793f04f5..fddfd68f9 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/legacy/AdaGrad.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/learning/legacy/AdaGrad.java @@ -21,7 +21,7 @@ import lombok.NoArgsConstructor; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.io.Serializable; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/ILossFunction.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/ILossFunction.java index 71049d633..7af044937 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/ILossFunction.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/ILossFunction.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.lossfunctions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.serde.json.LegacyILossFunctionDeserializerHelper; import org.nd4j.shade.jackson.annotation.JsonTypeInfo; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/SameDiffLoss.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/SameDiffLoss.java index 2a3a05663..8b3c6a3bc 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/SameDiffLoss.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/SameDiffLoss.java @@ -17,11 +17,11 @@ package org.nd4j.linalg.lossfunctions; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.HashMap; import java.util.Map; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossBinaryXENT.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossBinaryXENT.java index 604585f6c..f32cb7a2d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossBinaryXENT.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossBinaryXENT.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.activations.impl.ActivationSoftmax; import org.nd4j.linalg.api.ndarray.INDArray; @@ -31,7 +31,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; import org.nd4j.shade.jackson.annotation.JsonInclude; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossCosineProximity.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossCosineProximity.java index aeaf57669..1f8ac1942 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossCosineProximity.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossCosineProximity.java @@ -17,13 +17,13 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossFMeasure.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossFMeasure.java index 3ba022892..dad0b9a7a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossFMeasure.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossFMeasure.java @@ -22,7 +22,7 @@ import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.annotation.JsonProperty; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossHinge.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossHinge.java index 50274183c..499a42133 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossHinge.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossHinge.java @@ -17,14 +17,14 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.indexing.BooleanIndexing; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Created by susaneraly on 8/15/16. diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossKLD.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossKLD.java index 55afdf6f4..ffcde7302 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossKLD.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossKLD.java @@ -18,14 +18,14 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Kullback Leibler Divergence loss function diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossL1.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossL1.java index affcd7c08..56ffaee08 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossL1.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossL1.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; import lombok.Getter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.same.Sign; @@ -26,7 +26,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; import org.nd4j.shade.jackson.annotation.JsonInclude; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossL2.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossL2.java index a9f3b2c18..b6d6bb761 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossL2.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossL2.java @@ -18,12 +18,12 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; import lombok.Getter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; import org.nd4j.shade.jackson.annotation.JsonInclude; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMAPE.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMAPE.java index e4d2e642a..03c9a461f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMAPE.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMAPE.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; import lombok.Getter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.transforms.same.Abs; @@ -27,7 +27,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; import org.nd4j.shade.jackson.annotation.JsonInclude; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMCXENT.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMCXENT.java index 78c21d95c..2863f282e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMCXENT.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMCXENT.java @@ -21,7 +21,7 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.activations.impl.ActivationSoftmax; import org.nd4j.linalg.api.ndarray.INDArray; @@ -30,7 +30,7 @@ import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; import org.nd4j.shade.jackson.annotation.JsonInclude; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMSLE.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMSLE.java index ef5c335b7..cf459e2aa 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMSLE.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMSLE.java @@ -18,13 +18,13 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; import lombok.Getter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; import org.nd4j.shade.jackson.annotation.JsonInclude; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMixtureDensity.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMixtureDensity.java index 53f87265a..b58be0e8b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMixtureDensity.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMixtureDensity.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.annotation.JsonInclude; import org.nd4j.shade.jackson.annotation.JsonProperty; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMultiLabel.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMultiLabel.java index 6e8e9a0ae..199ff4b4b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMultiLabel.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossMultiLabel.java @@ -24,7 +24,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.annotation.JsonInclude; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossPoisson.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossPoisson.java index b839bed62..54ec246af 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossPoisson.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossPoisson.java @@ -17,13 +17,13 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Created by susaneraly on 9/9/16. diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossSparseMCXENT.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossSparseMCXENT.java index c6879a133..43e76e511 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossSparseMCXENT.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossSparseMCXENT.java @@ -20,14 +20,12 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.impl.shape.OneHot; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.serde.jackson.shaded.NDArrayTextDeSerializer; -import org.nd4j.serde.jackson.shaded.NDArrayTextSerializer; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.annotation.JsonInclude; import org.nd4j.shade.jackson.annotation.JsonProperty; import org.nd4j.shade.jackson.databind.annotation.JsonDeserialize; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossSquaredHinge.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossSquaredHinge.java index a38657083..8f4874d9a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossSquaredHinge.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossSquaredHinge.java @@ -17,14 +17,14 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.indexing.BooleanIndexing; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Created by susaneraly on 9/9/16. diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossWasserstein.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossWasserstein.java index 1038922bb..5a837590e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossWasserstein.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/lossfunctions/impl/LossWasserstein.java @@ -17,13 +17,13 @@ package org.nd4j.linalg.lossfunctions.impl; import lombok.EqualsAndHashCode; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; /** * Wasserstein loss function, which calculates the Wasserstein distance, also known as earthmover's distance. diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/ops/transforms/Transforms.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/ops/transforms/Transforms.java index c63289e2c..1017ea186 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/ops/transforms/Transforms.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/ops/transforms/Transforms.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.ops.transforms; import lombok.NonNull; import lombok.val; -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.CustomOp; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/profiler/data/StringAggregator.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/profiler/data/StringAggregator.java index cdd3f8535..cdb99e302 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/profiler/data/StringAggregator.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/profiler/data/StringAggregator.java @@ -20,7 +20,7 @@ import org.nd4j.linalg.api.ops.CustomOp; import org.nd4j.linalg.api.ops.Op; import org.nd4j.linalg.profiler.data.primitives.ComparableAtomicLong; import org.nd4j.linalg.profiler.data.primitives.TimeSet; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/profiler/data/StringCounter.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/profiler/data/StringCounter.java index 88b1bea5e..6a340447c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/profiler/data/StringCounter.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/profiler/data/StringCounter.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.profiler.data; import org.nd4j.linalg.profiler.data.primitives.ComparableAtomicLong; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/ConvConfigUtil.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/ConvConfigUtil.java index d532dfe92..0f7bc1196 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/ConvConfigUtil.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/ConvConfigUtil.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; /** * Class with utility methods for validating convolution op configurations like {@link org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig} diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/DataSetUtils.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/DataSetUtils.java index 49c17fa11..f45f4fa4d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/DataSetUtils.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/DataSetUtils.java @@ -16,13 +16,14 @@ package org.nd4j.linalg.util; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.exception.ND4JArraySizeException; -import org.nd4j.tools.BTools; -import org.nd4j.tools.InfoLine; -import org.nd4j.tools.InfoValues; -import org.nd4j.tools.SIS; +import org.nd4j.common.tools.BTools; +import org.nd4j.common.tools.InfoLine; +import org.nd4j.common.tools.InfoValues; +import org.nd4j.common.tools.SIS; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/DeviceLocalNDArray.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/DeviceLocalNDArray.java index eb9644a39..d4705b6d8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/DeviceLocalNDArray.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/DeviceLocalNDArray.java @@ -20,15 +20,12 @@ import edu.umd.cs.findbugs.annotations.Nullable; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.executioner.GridExecutioner; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.profiler.OpProfiler; -import org.nd4j.linalg.profiler.ProfilerConfig; import java.util.Arrays; -import java.util.concurrent.atomic.AtomicInteger; /** * DeviceLocal implementation for INDArray, with special broadcast method diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/ND4JTestUtils.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/ND4JTestUtils.java index 535148e6a..3c8889a72 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/ND4JTestUtils.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/ND4JTestUtils.java @@ -19,11 +19,11 @@ package org.nd4j.linalg.util; import lombok.AllArgsConstructor; import lombok.Data; import org.apache.commons.io.FileUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.BiFunction; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.function.BiFunction; +import org.nd4j.common.primitives.Triple; import java.io.File; import java.net.URI; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayMath.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayMath.java index 3886321d2..87c55d255 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayMath.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayMath.java @@ -16,6 +16,7 @@ package org.nd4j.linalg.util; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.api.ndarray.INDArray; /** diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayPreconditionsFormat.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayPreconditionsFormat.java index 6a2cc7651..f8ab1654d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayPreconditionsFormat.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayPreconditionsFormat.java @@ -16,7 +16,8 @@ package org.nd4j.linalg.util; -import org.nd4j.base.PreconditionsFormat; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.base.PreconditionsFormat; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.indexing.NDArrayIndex; @@ -24,7 +25,7 @@ import java.util.Arrays; import java.util.List; /** - * Preconditions format: Defines a set of tags for use with {@link org.nd4j.base.Preconditions} class.
+ * Preconditions format: Defines a set of tags for use with {@link Preconditions} class.
* %ndRank: rank of INDArray
* %ndShape: shape of INDArray
* %ndStride: stride of INDArray
diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayUtil.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayUtil.java index e12019d4c..4da81b889 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayUtil.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/NDArrayUtil.java @@ -16,6 +16,7 @@ package org.nd4j.linalg.util; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalStateException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/Nd4jValidator.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/Nd4jValidator.java index bcd3f99cd..08b8cbb6d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/Nd4jValidator.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/util/Nd4jValidator.java @@ -9,8 +9,8 @@ import org.nd4j.graph.FlatGraph; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.validation.Nd4jCommonValidator; -import org.nd4j.validation.ValidationResult; +import org.nd4j.common.validation.Nd4jCommonValidator; +import org.nd4j.common.validation.ValidationResult; import java.io.*; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/list/NDArrayList.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/list/NDArrayList.java index f3b539d8c..81e4bdc4a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/list/NDArrayList.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/list/NDArrayList.java @@ -17,7 +17,7 @@ package org.nd4j.list; import lombok.NonNull; -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.exception.ND4JIllegalStateException; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/serde/binary/BinarySerde.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/serde/binary/BinarySerde.java index fc6f13922..557b1a227 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/serde/binary/BinarySerde.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/serde/binary/BinarySerde.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.compression.CompressedDataBuffer; import org.nd4j.linalg.compression.CompressionDescriptor; import org.nd4j.linalg.exception.ND4JArraySizeException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.*; import java.nio.Buffer; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/serde/json/JsonMappers.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/serde/json/JsonMappers.java index 4a1344ae3..16148fff4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/serde/json/JsonMappers.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/serde/json/JsonMappers.java @@ -17,12 +17,12 @@ package org.nd4j.serde.json; import lombok.extern.slf4j.Slf4j; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.AtomicDouble; -import org.nd4j.linalg.primitives.serde.JsonDeserializerAtomicBoolean; -import org.nd4j.linalg.primitives.serde.JsonDeserializerAtomicDouble; -import org.nd4j.linalg.primitives.serde.JsonSerializerAtomicBoolean; -import org.nd4j.linalg.primitives.serde.JsonSerializerAtomicDouble; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.primitives.AtomicDouble; +import org.nd4j.common.primitives.serde.JsonDeserializerAtomicBoolean; +import org.nd4j.common.primitives.serde.JsonDeserializerAtomicDouble; +import org.nd4j.common.primitives.serde.JsonSerializerAtomicBoolean; +import org.nd4j.common.primitives.serde.JsonSerializerAtomicDouble; import org.nd4j.shade.jackson.annotation.JsonAutoDetect; import org.nd4j.shade.jackson.databind.DeserializationFeature; import org.nd4j.shade.jackson.databind.MapperFeature; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/systeminfo/SystemInfo.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/systeminfo/SystemInfo.java index 6a19c19ab..db4cec0b2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/systeminfo/SystemInfo.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/systeminfo/SystemInfo.java @@ -38,7 +38,7 @@ import org.bytedeco.javacpp.Pointer; import org.nd4j.linalg.api.environment.Nd4jEnvironment; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.versioncheck.VersionCheck; import org.nd4j.versioncheck.VersionInfo; import oshi.software.os.OperatingSystem; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/versioncheck/VersionCheck.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/versioncheck/VersionCheck.java index f13ce118d..28853e75a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/versioncheck/VersionCheck.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/versioncheck/VersionCheck.java @@ -17,7 +17,7 @@ package org.nd4j.versioncheck; import lombok.extern.slf4j.Slf4j; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.config.ND4JSystemProperties; import java.io.IOException; import java.net.URI; @@ -38,7 +38,7 @@ import java.util.*; public class VersionCheck { /** - * @deprecated Use {@link org.nd4j.config.ND4JSystemProperties#VERSION_CHECK_PROPERTY} + * @deprecated Use {@link ND4JSystemProperties#VERSION_CHECK_PROPERTY} */ @Deprecated public static final String VERSION_CHECK_PROPERTY = ND4JSystemProperties.VERSION_CHECK_PROPERTY; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/compression/impl/AbstractCompressor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/compression/impl/AbstractCompressor.java index 8d2d85966..ca0cd6216 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/compression/impl/AbstractCompressor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/compression/impl/AbstractCompressor.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.compression.CompressedDataBuffer; import org.nd4j.linalg.compression.NDArrayCompressor; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; /** * @author raver119@gmail.com diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/NativeOpsHolder.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/NativeOpsHolder.java index 73bb11bea..6fde4adca 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/NativeOpsHolder.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/NativeOpsHolder.java @@ -19,8 +19,8 @@ package org.nd4j.nativeblas; import java.util.Properties; import lombok.Getter; import org.bytedeco.javacpp.Loader; -import org.nd4j.config.ND4JEnvironmentVars; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.config.ND4JEnvironmentVars; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.context.Nd4jContext; import org.nd4j.linalg.factory.Nd4j; import org.slf4j.Logger; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/Nd4jBlas.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/Nd4jBlas.java index d34e24def..52955befb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/Nd4jBlas.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/Nd4jBlas.java @@ -19,9 +19,8 @@ package org.nd4j.nativeblas; import lombok.extern.slf4j.Slf4j; import org.bytedeco.javacpp.Loader; -import org.bytedeco.javacpp.Pointer; -import org.nd4j.config.ND4JEnvironmentVars; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.config.ND4JEnvironmentVars; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.linalg.api.blas.Blas; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/resources/META-INF/services/org.nd4j.base.PreconditionsFormat b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/resources/META-INF/services/org.nd4j.common.base.PreconditionsFormat similarity index 100% rename from nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/resources/META-INF/services/org.nd4j.base.PreconditionsFormat rename to nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/resources/META-INF/services/org.nd4j.common.base.PreconditionsFormat diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/allocator/tad/BasicTADManager.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/allocator/tad/BasicTADManager.java index fbecefb29..981ffecdd 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/allocator/tad/BasicTADManager.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/allocator/tad/BasicTADManager.java @@ -18,7 +18,7 @@ package org.nd4j.jita.allocator.tad; import lombok.val; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.cache.TADManager; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/allocator/tad/DeviceTADManager.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/allocator/tad/DeviceTADManager.java index f97c8124e..4ad3e92aa 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/allocator/tad/DeviceTADManager.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/allocator/tad/DeviceTADManager.java @@ -17,7 +17,7 @@ package org.nd4j.jita.allocator.tad; import lombok.extern.slf4j.Slf4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/conf/Configuration.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/conf/Configuration.java index 5a252a2a8..49582f002 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/conf/Configuration.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/conf/Configuration.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.NonNull; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.nd4j.config.ND4JEnvironmentVars; +import org.nd4j.common.config.ND4JEnvironmentVars; import org.nd4j.jita.allocator.enums.Aggressiveness; import org.nd4j.jita.allocator.enums.AllocationStatus; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ConstantProtector.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ConstantProtector.java index 78e999cfd..388f49136 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ConstantProtector.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ConstantProtector.java @@ -17,7 +17,7 @@ package org.nd4j.jita.constant; import org.nd4j.linalg.api.shape.LongShapeDescriptor; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.shape.ShapeDescriptor; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ProtectedCudaConstantHandler.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ProtectedCudaConstantHandler.java index 0b2f1fca1..b2e2a0361 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ProtectedCudaConstantHandler.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ProtectedCudaConstantHandler.java @@ -35,7 +35,7 @@ import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.jcublas.buffer.*; import org.nd4j.linalg.api.memory.MemcpyDirection; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.nativeblas.NativeOpsHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ProtectedCudaShapeInfoProvider.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ProtectedCudaShapeInfoProvider.java index 60c36d8f4..13b26f363 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ProtectedCudaShapeInfoProvider.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/constant/ProtectedCudaShapeInfoProvider.java @@ -21,7 +21,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.api.shape.options.ArrayOptionsHelper; import org.nd4j.linalg.api.shape.options.ArrayType; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.ndarray.BaseShapeInfoProvider; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/handler/impl/CudaZeroHandler.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/handler/impl/CudaZeroHandler.java index 4c6e56bc9..4056338a9 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/handler/impl/CudaZeroHandler.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/jita/handler/impl/CudaZeroHandler.java @@ -17,7 +17,7 @@ package org.nd4j.jita.handler.impl; import lombok.var; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.nativeblas.OpaqueLaunchContext; import org.nd4j.shade.guava.collect.HashBasedTable; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/CachedShapeInfoProvider.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/CachedShapeInfoProvider.java index b82383682..e46650484 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/CachedShapeInfoProvider.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/CachedShapeInfoProvider.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.jcublas; import org.nd4j.linalg.api.buffer.DataType; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.jita.constant.ProtectedCudaShapeInfoProvider; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.ndarray.BaseShapeInfoProvider; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasBackend.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasBackend.java index 2f3ad94df..f9ecde2d8 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasBackend.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasBackend.java @@ -18,13 +18,13 @@ package org.nd4j.linalg.jcublas; import lombok.extern.slf4j.Slf4j; import org.bytedeco.javacpp.Loader; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.linalg.api.environment.Nd4jEnvironment; import org.nd4j.linalg.factory.Environment; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.linalg.io.Resource; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.io.Resource; import org.nd4j.nativeblas.CudaEnvironment; import org.nd4j.nativeblas.Nd4jCuda; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArray.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArray.java index 46c451f79..95f36ee26 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArray.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArray.java @@ -21,7 +21,7 @@ import com.google.flatbuffers.FlatBufferBuilder; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.bytedeco.javacpp.BytePointer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.graph.FlatArray; import org.nd4j.jita.allocator.enums.CudaConstants; import org.nd4j.jita.allocator.impl.AllocationPoint; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArrayFactory.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArrayFactory.java index 901936c49..4ed4ebf35 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArrayFactory.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArrayFactory.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.jcublas; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.buffer.DataTypeEx; import org.nd4j.linalg.api.memory.enums.MemoryKind; @@ -30,7 +30,7 @@ import org.nd4j.linalg.api.shape.options.ArrayType; import org.nd4j.linalg.compression.CompressionUtils; import org.nd4j.linalg.jcublas.buffer.*; import org.nd4j.linalg.api.memory.MemcpyDirection; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.bytedeco.javacpp.*; import org.nd4j.jita.allocator.enums.CudaConstants; import org.nd4j.jita.allocator.impl.AllocationPoint; @@ -50,7 +50,7 @@ import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.jcublas.blas.*; import org.nd4j.linalg.jcublas.context.CudaContext; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.nativeblas.*; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/blas/JcublasLevel1.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/blas/JcublasLevel1.java index e75ce1d5b..e19031e6c 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/blas/JcublasLevel1.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/blas/JcublasLevel1.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.jcublas.blas; import lombok.val; import org.bytedeco.javacpp.*; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.jita.allocator.Allocator; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.jita.allocator.pointers.cuda.cublasHandle_t; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/BaseCudaDataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/BaseCudaDataBuffer.java index e1d201ba5..5f1cfb99e 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/BaseCudaDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/BaseCudaDataBuffer.java @@ -21,7 +21,7 @@ import lombok.NonNull; import lombok.val; import org.bytedeco.javacpp.*; import org.bytedeco.javacpp.indexer.*; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.jita.allocator.enums.CudaConstants; import org.nd4j.jita.allocator.impl.AllocationPoint; import org.nd4j.jita.allocator.impl.AllocationShape; @@ -42,7 +42,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.performance.PerformanceTracker; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.api.memory.MemcpyDirection; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.util.LongUtils; import org.nd4j.nativeblas.NativeOpsHolder; import org.nd4j.nativeblas.OpaqueDataBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaBfloat16DataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaBfloat16DataBuffer.java index 145816a5e..d055a0824 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaBfloat16DataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaBfloat16DataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaBoolDataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaBoolDataBuffer.java index 27e231190..4bbed0004 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaBoolDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaBoolDataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaByteDataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaByteDataBuffer.java index 594de70ec..9649f99c2 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaByteDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaByteDataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaDoubleDataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaDoubleDataBuffer.java index d85fd5bf0..c3e00d32b 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaDoubleDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaDoubleDataBuffer.java @@ -23,7 +23,7 @@ import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaFloatDataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaFloatDataBuffer.java index cec6ca762..4e7b8b0f3 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaFloatDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaFloatDataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import lombok.extern.slf4j.Slf4j; import java.io.ByteArrayOutputStream; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaHalfDataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaHalfDataBuffer.java index 286ef02d8..d15c6b07c 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaHalfDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaHalfDataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaIntDataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaIntDataBuffer.java index 95a9c0ce9..488f9182e 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaIntDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaIntDataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaShortDataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaShortDataBuffer.java index fa50e22ad..3a54513a7 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaShortDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaShortDataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUByteDataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUByteDataBuffer.java index a8b5ea689..54ff947ff 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUByteDataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUByteDataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt16DataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt16DataBuffer.java index 809363494..fc51b20a2 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt16DataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt16DataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt32DataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt32DataBuffer.java index 1595cfda3..b7aeeed48 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt32DataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt32DataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt64DataBuffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt64DataBuffer.java index a107a5d8c..242d1f482 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt64DataBuffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUInt64DataBuffer.java @@ -21,7 +21,7 @@ import org.bytedeco.javacpp.indexer.Indexer; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUtf8Buffer.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUtf8Buffer.java index 5a98d5208..4b2e160b7 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUtf8Buffer.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaUtf8Buffer.java @@ -24,7 +24,7 @@ import org.bytedeco.javacpp.BytePointer; import org.bytedeco.javacpp.LongPointer; import org.bytedeco.javacpp.Pointer; import org.bytedeco.javacpp.indexer.Indexer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/factory/CudaDataBufferFactory.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/factory/CudaDataBufferFactory.java index 5083a2bf9..b30fa4652 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/factory/CudaDataBufferFactory.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/buffer/factory/CudaDataBufferFactory.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.api.buffer.factory.DataBufferFactory; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.jcublas.buffer.*; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/context/ContextHolder.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/context/ContextHolder.java index 837fa20a0..cab875700 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/context/ContextHolder.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/context/ContextHolder.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.jcublas.context; import lombok.Data; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaExecutioner.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaExecutioner.java index 4b8209027..76430a50e 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaExecutioner.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaExecutioner.java @@ -24,7 +24,7 @@ import lombok.val; import lombok.var; import org.bytedeco.javacpp.*; import org.bytedeco.javacpp.indexer.LongIndexer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.jita.allocator.pointers.CudaPointer; import org.nd4j.jita.allocator.tad.DeviceTADManager; @@ -61,9 +61,9 @@ import org.nd4j.linalg.jcublas.buffer.BaseCudaDataBuffer; import org.nd4j.linalg.jcublas.buffer.CudaLongDataBuffer; import org.nd4j.linalg.jcublas.buffer.CudaUtf8Buffer; import org.nd4j.linalg.jcublas.context.CudaContext; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.nativeblas.LongPointerWrapper; import org.nd4j.nativeblas.NativeOps; import org.nd4j.nativeblas.NativeOpsHolder; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaGridExecutioner.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaGridExecutioner.java index 1d8a3de65..77d264519 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaGridExecutioner.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaGridExecutioner.java @@ -20,10 +20,10 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.val; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.impl.summarystats.Variance; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.bytedeco.javacpp.*; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.linalg.api.buffer.DataBuffer; @@ -44,7 +44,7 @@ import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.jcublas.context.CudaContext; import org.nd4j.linalg.jcublas.ops.executioner.aggregates.AggregateDescriptor; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaOpContext.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaOpContext.java index 5e26b3ea3..faf24a4e6 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaOpContext.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaOpContext.java @@ -32,7 +32,7 @@ import org.nd4j.linalg.api.ops.OpContext; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.jcublas.buffer.BaseCudaDataBuffer; import org.nd4j.linalg.jcublas.context.CudaContext; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.nativeblas.NativeOps; import org.nd4j.nativeblas.NativeOpsHolder; import org.nd4j.nativeblas.OpaqueContext; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/jita/allocator/DeviceLocalNDArrayTests.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/jita/allocator/DeviceLocalNDArrayTests.java index e891d0fb9..66c77702e 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/jita/allocator/DeviceLocalNDArrayTests.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/jita/allocator/DeviceLocalNDArrayTests.java @@ -19,7 +19,7 @@ package org.nd4j.jita.allocator; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.util.DeviceLocalNDArray; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/jita/allocator/impl/MemoryTrackerTest.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/jita/allocator/impl/MemoryTrackerTest.java index 17ea8e690..b67b2dd40 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/jita/allocator/impl/MemoryTrackerTest.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/jita/allocator/impl/MemoryTrackerTest.java @@ -19,7 +19,7 @@ package org.nd4j.jita.allocator.impl; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/linalg/jcublas/buffer/BaseCudaDataBufferTest.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/linalg/jcublas/buffer/BaseCudaDataBufferTest.java index b9570377c..e4290a787 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/linalg/jcublas/buffer/BaseCudaDataBufferTest.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/test/java/org/nd4j/linalg/jcublas/buffer/BaseCudaDataBufferTest.java @@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Before; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.jita.allocator.impl.AtomicAllocator; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuBackend.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuBackend.java index d3fe308e6..f0dd831e2 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuBackend.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuBackend.java @@ -18,8 +18,8 @@ package org.nd4j.linalg.cpu.nativecpu; import org.nd4j.linalg.factory.Environment; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.linalg.io.Resource; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.io.Resource; /** * Cpu backend diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuNDArrayFactory.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuNDArrayFactory.java index 38cb6610e..caee5b545 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuNDArrayFactory.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuNDArrayFactory.java @@ -19,9 +19,9 @@ package org.nd4j.linalg.cpu.nativecpu; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.nd4j.base.Preconditions; -import org.nd4j.config.ND4JEnvironmentVars; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.config.ND4JEnvironmentVars; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.linalg.api.buffer.*; import org.nd4j.linalg.api.ops.custom.Flatten; import org.nd4j.linalg.api.ops.impl.shape.Concat; @@ -31,7 +31,7 @@ import org.nd4j.linalg.compression.CompressionUtils; import org.nd4j.linalg.cpu.nativecpu.buffer.BaseCpuDataBuffer; import org.nd4j.linalg.cpu.nativecpu.buffer.LongBuffer; import org.nd4j.linalg.cpu.nativecpu.buffer.Utf8Buffer; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.bytedeco.javacpp.*; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ndarray.INDArray; @@ -41,7 +41,7 @@ import org.nd4j.linalg.compression.CompressionType; import org.nd4j.linalg.cpu.nativecpu.blas.*; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.nativeblas.BaseNativeNDArrayFactory; import org.nd4j.nativeblas.LongPointerWrapper; import org.nd4j.nativeblas.NativeOpsHolder; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuTADManager.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuTADManager.java index c48178055..c6ffd022e 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuTADManager.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuTADManager.java @@ -24,7 +24,7 @@ import org.nd4j.linalg.cache.ConstantHandler; import org.nd4j.linalg.cache.TADManager; import org.nd4j.linalg.cache.TadDescriptor; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.nativeblas.NativeOps; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/DirectShapeInfoProvider.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/DirectShapeInfoProvider.java index 9cac6d3a9..b5584f847 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/DirectShapeInfoProvider.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/DirectShapeInfoProvider.java @@ -22,7 +22,7 @@ import org.nd4j.linalg.api.memory.AllocationsTracker; import org.nd4j.linalg.api.memory.enums.AllocationKind; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.api.shape.options.ArrayOptionsHelper; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.ndarray.BaseShapeInfoProvider; import org.nd4j.linalg.api.shape.ShapeDescriptor; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/NDArray.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/NDArray.java index 5d8af851a..909d2878c 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/NDArray.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/NDArray.java @@ -21,7 +21,7 @@ import com.google.flatbuffers.FlatBufferBuilder; import lombok.val; import org.bytedeco.javacpp.BytePointer; import org.bytedeco.javacpp.Pointer; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.graph.FlatArray; import org.nd4j.linalg.api.buffer.*; import org.nd4j.linalg.api.memory.MemoryWorkspace; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/buffer/DefaultDataBufferFactory.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/buffer/DefaultDataBufferFactory.java index 54b02e309..7933389ef 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/buffer/DefaultDataBufferFactory.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/buffer/DefaultDataBufferFactory.java @@ -28,7 +28,7 @@ import org.bytedeco.javacpp.indexer.IntIndexer; import org.nd4j.linalg.api.buffer.*; import org.nd4j.linalg.api.buffer.factory.DataBufferFactory; import org.nd4j.linalg.api.memory.MemoryWorkspace; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/CpuOpContext.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/CpuOpContext.java index 9d79e6545..1be649287 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/CpuOpContext.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/CpuOpContext.java @@ -28,14 +28,12 @@ import org.nd4j.linalg.api.ops.ExecutionMode; import org.nd4j.linalg.api.ops.OpContext; import org.nd4j.linalg.cpu.nativecpu.buffer.BaseCpuDataBuffer; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.nativeblas.NativeOps; import org.nd4j.nativeblas.NativeOpsHolder; import org.nd4j.nativeblas.OpaqueContext; import org.nd4j.nativeblas.OpaqueRandomGenerator; -import java.util.List; - /** * CPU backend Context wrapper * diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java index e42495e5e..96def59d7 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java @@ -26,9 +26,9 @@ import org.bytedeco.javacpp.*; import org.bytedeco.javacpp.indexer.LongIndexer; import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.autodiff.samediff.serde.FlatBuffersMapper; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.compression.impl.AbstractCompressor; -import org.nd4j.config.ND4JEnvironmentVars; +import org.nd4j.common.config.ND4JEnvironmentVars; import org.nd4j.linalg.api.buffer.*; import org.nd4j.linalg.api.concurrency.AffinityManager; import org.nd4j.linalg.api.environment.Nd4jEnvironment; @@ -66,10 +66,10 @@ import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.exception.ND4JOpProfilerException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.api.memory.MemcpyDirection; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.Optional; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.primitives.Optional; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.nativeblas.*; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/workspace/CpuWorkspaceDeallocator.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/workspace/CpuWorkspaceDeallocator.java index 436244ff8..05d56ac30 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/workspace/CpuWorkspaceDeallocator.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/workspace/CpuWorkspaceDeallocator.java @@ -19,13 +19,12 @@ package org.nd4j.linalg.cpu.nativecpu.workspace; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.bytedeco.javacpp.LongPointer; -import org.bytedeco.javacpp.Pointer; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.memory.Deallocator; import org.nd4j.linalg.api.memory.enums.LocationPolicy; import org.nd4j.linalg.api.memory.enums.MemoryKind; import org.nd4j.linalg.api.memory.pointers.PointersPair; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; import org.nd4j.nativeblas.NativeOpsHolder; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/cpujava/org/nd4j/tensorflow/conversion/GraphRunnerTest.java b/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/cpujava/org/nd4j/tensorflow/conversion/GraphRunnerTest.java index 81599cd5b..5ddc3849d 100644 --- a/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/cpujava/org/nd4j/tensorflow/conversion/GraphRunnerTest.java +++ b/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/cpujava/org/nd4j/tensorflow/conversion/GraphRunnerTest.java @@ -19,20 +19,19 @@ package org.nd4j.tensorflow.conversion; import junit.framework.TestCase; import org.apache.commons.io.FileUtils; -import org.bytedeco.tensorflow.TF_Tensor; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.api.buffer.DataType; -import org.nd4j.resources.Resources; -import org.nd4j.shade.protobuf.Descriptors; -import org.nd4j.shade.protobuf.util.JsonFormat; import org.apache.commons.io.IOUtils; +import org.bytedeco.tensorflow.TF_Tensor; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.resources.Resources; +import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.shade.protobuf.util.JsonFormat; import org.nd4j.tensorflow.conversion.graphrunner.GraphRunner; import org.nd4j.tensorflow.conversion.graphrunner.SavedModelConfig; import org.tensorflow.framework.ConfigProto; diff --git a/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/cpujava/org/nd4j/tensorflow/conversion/TensorflowConversionTest.java b/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/cpujava/org/nd4j/tensorflow/conversion/TensorflowConversionTest.java index fea5a5aa8..b0e70dc3d 100644 --- a/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/cpujava/org/nd4j/tensorflow/conversion/TensorflowConversionTest.java +++ b/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/cpujava/org/nd4j/tensorflow/conversion/TensorflowConversionTest.java @@ -19,11 +19,11 @@ package org.nd4j.tensorflow.conversion; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.tensorflow.framework.GraphDef; import org.bytedeco.tensorflow.*; diff --git a/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/gpujava/org/nd4j/tensorflow/conversion/GpuGraphRunnerTest.java b/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/gpujava/org/nd4j/tensorflow/conversion/GpuGraphRunnerTest.java index a035592df..09767cb0d 100644 --- a/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/gpujava/org/nd4j/tensorflow/conversion/GpuGraphRunnerTest.java +++ b/nd4j/nd4j-backends/nd4j-tests-tensorflow/src/test/gpujava/org/nd4j/tensorflow/conversion/GpuGraphRunnerTest.java @@ -17,14 +17,14 @@ package org.nd4j.tensorflow.conversion; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.shade.protobuf.util.JsonFormat; import org.apache.commons.io.IOUtils; import org.junit.Test; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.tensorflow.conversion.graphrunner.GraphRunner; import org.tensorflow.framework.ConfigProto; import org.tensorflow.framework.GPUOptions; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/AssertTestsExtendBaseClass.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/AssertTestsExtendBaseClass.java index a9cc6dffc..6414bec2f 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/AssertTestsExtendBaseClass.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/AssertTestsExtendBaseClass.java @@ -16,6 +16,8 @@ package org.nd4j; import lombok.extern.slf4j.Slf4j; +import org.nd4j.common.tests.AbstractAssertTestsClass; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.imports.TFGraphs.TFGraphTestAllLibnd4j; import org.nd4j.imports.TFGraphs.TFGraphTestAllSameDiff; import org.nd4j.imports.TFGraphs.TFGraphTestList; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/OpValidationSuite.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/OpValidationSuite.java index ea9373d90..1f0886a61 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/OpValidationSuite.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/OpValidationSuite.java @@ -26,7 +26,7 @@ import org.nd4j.autodiff.validation.OpValidation; import org.nd4j.imports.TFGraphs.TFGraphTestAllSameDiff; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import static org.junit.Assume.assumeFalse; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestOpMapping.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestOpMapping.java index adac58697..c056deaba 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestOpMapping.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestOpMapping.java @@ -66,7 +66,6 @@ import org.nd4j.linalg.api.ops.util.PrintAffinity; import org.nd4j.linalg.api.ops.util.PrintVariable; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.lossfunctions.ILossFunction; -import org.nd4j.resources.Resources; import org.reflections.Reflections; import java.io.File; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestSessions.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestSessions.java index 902aadea2..42e9a32fc 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestSessions.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestSessions.java @@ -31,7 +31,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/internal/TestDependencyTracker.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/internal/TestDependencyTracker.java index e71cddfe6..7523c4ea0 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/internal/TestDependencyTracker.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/internal/TestDependencyTracker.java @@ -8,7 +8,7 @@ import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Collections; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/MiscOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/MiscOpValidation.java index 2df7233d1..d2d7f8225 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/MiscOpValidation.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/MiscOpValidation.java @@ -26,7 +26,7 @@ import org.nd4j.autodiff.samediff.SameDiffFunctionDefinition; import org.nd4j.autodiff.validation.OpTestCase; import org.nd4j.autodiff.validation.OpValidation; import org.nd4j.autodiff.validation.TestCase; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.blas.params.MMulTranspose; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; @@ -52,8 +52,8 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Triple; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Triple; +import org.nd4j.common.util.ArrayUtil; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RandomOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RandomOpValidation.java index e6e8962ec..643fd31f2 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RandomOpValidation.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RandomOpValidation.java @@ -35,7 +35,7 @@ import org.nd4j.linalg.api.ops.random.impl.BinomialDistribution; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import org.nd4j.linalg.ops.transforms.Transforms; import java.util.ArrayList; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java index 58520bcbb..b8b5e05f4 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java @@ -17,7 +17,6 @@ package org.nd4j.autodiff.opvalidation; import lombok.extern.slf4j.Slf4j; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -48,10 +47,9 @@ import org.nd4j.linalg.checkutil.NDArrayCreationUtil; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.BooleanIndexing; -import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ShapeOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ShapeOpValidation.java index 73aae94bd..3f10b432c 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ShapeOpValidation.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ShapeOpValidation.java @@ -46,9 +46,9 @@ import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.primitives.Triple; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.primitives.Triple; +import org.nd4j.common.util.ArrayUtil; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/TransformOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/TransformOpValidation.java index a85f73643..c42b7f7a5 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/TransformOpValidation.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/TransformOpValidation.java @@ -31,7 +31,6 @@ import org.nd4j.autodiff.validation.OpTestCase; import org.nd4j.autodiff.validation.OpValidation; import org.nd4j.autodiff.validation.TestCase; import org.nd4j.enums.PadMode; -import org.nd4j.linalg.api.blas.params.MMulTranspose; import org.nd4j.enums.ImageResizeMethod; import org.nd4j.enums.PartitionMode; import org.nd4j.linalg.api.buffer.DataType; @@ -48,7 +47,6 @@ import org.nd4j.linalg.api.ops.impl.shape.MergeAvg; import org.nd4j.linalg.api.ops.impl.shape.MergeMax; import org.nd4j.linalg.api.ops.impl.shape.MergeMaxIndex; import org.nd4j.linalg.api.ops.impl.shape.tensorops.EmbeddingLookup; -import org.nd4j.linalg.api.ops.impl.transforms.Pad; import org.nd4j.linalg.api.ops.impl.transforms.clip.ClipByAvgNorm; import org.nd4j.linalg.api.ops.impl.transforms.custom.*; import org.nd4j.linalg.api.ops.impl.transforms.floating.RSqrt; @@ -58,13 +56,13 @@ import org.nd4j.linalg.api.ops.random.impl.BernoulliDistribution; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.function.Function; +import org.nd4j.common.function.Function; import org.nd4j.linalg.indexing.BooleanIndexing; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.indexing.conditions.Condition; import org.nd4j.linalg.indexing.conditions.Conditions; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.nativeblas.NativeOpsHolder; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java index 004aac209..2ab9d9c6b 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java @@ -5,13 +5,13 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.imports.TFGraphs.TFGraphTestZooModels; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.resources.Resources; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.resources.Resources; import java.io.File; import java.util.Collections; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java index beac2d677..546805e06 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java @@ -76,7 +76,7 @@ import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.learning.config.Adam; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.nativeblas.NativeOpsHolder; import org.nd4j.weightinit.impl.UniformInitScheme; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/FileReadWriteTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/FileReadWriteTests.java index 157fc5b46..6ca85630e 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/FileReadWriteTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/FileReadWriteTests.java @@ -35,7 +35,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/UIListenerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/UIListenerTest.java index b02a23771..e798decfb 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/UIListenerTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/UIListenerTest.java @@ -20,7 +20,7 @@ import org.nd4j.linalg.dataset.IrisDataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.learning.config.Adam; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.util.HashMap; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/CustomEvaluationTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/CustomEvaluationTest.java index 13a599651..445cfdfa6 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/CustomEvaluationTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/CustomEvaluationTest.java @@ -24,7 +24,7 @@ import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; public class CustomEvaluationTest extends BaseNd4jTest { diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/TestLegacyJsonLoading.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/TestLegacyJsonLoading.java index 3c8a160b3..1ae0ae967 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/TestLegacyJsonLoading.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/TestLegacyJsonLoading.java @@ -23,7 +23,7 @@ import org.nd4j.evaluation.classification.ROCMultiClass; import org.nd4j.evaluation.regression.RegressionEvaluation; import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/ExecutionTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/ExecutionTests.java index 8dcd94422..474c4bb3a 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/ExecutionTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/ExecutionTests.java @@ -30,7 +30,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.nativeblas.NativeOpsHolder; import java.util.Map; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/BERTGraphTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/BERTGraphTest.java index 08e4a959c..de716ba59 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/BERTGraphTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/BERTGraphTest.java @@ -34,8 +34,8 @@ import org.nd4j.linalg.dataset.api.MultiDataSet; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.learning.config.Adam; -import org.nd4j.resources.Downloader; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.resources.Downloader; +import org.nd4j.common.util.ArchiveUtils; import java.io.File; import java.net.URL; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/NodeReader.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/NodeReader.java index 2ce536732..1c436f2ed 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/NodeReader.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/NodeReader.java @@ -20,7 +20,7 @@ import lombok.NonNull; import lombok.val; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.nio.file.Files; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllHelper.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllHelper.java index f90fd0deb..1cc3baa13 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllHelper.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllHelper.java @@ -39,7 +39,7 @@ import org.nd4j.autodiff.samediff.internal.memory.ArrayCloseMemoryMgr; import org.nd4j.autodiff.samediff.internal.memory.CloseValidationMemoryMgr; import org.nd4j.autodiff.validation.OpValidation; import org.nd4j.autodiff.validation.TestCase; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.imports.TFGraphs.listener.OpExecOrderListener; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.imports.listeners.ExecPrintListener; @@ -50,17 +50,17 @@ import org.nd4j.linalg.api.ops.executioner.OpExecutioner; import org.nd4j.linalg.api.ops.impl.reduce.longer.MatchCondition; import org.nd4j.linalg.api.shape.options.ArrayOptionsHelper; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.BiFunction; +import org.nd4j.common.function.BiFunction; import org.nd4j.linalg.indexing.BooleanIndexing; import org.nd4j.linalg.indexing.conditions.Conditions; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.string.NDArrayStrings; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.nativeblas.NativeOpsHolder; -import org.nd4j.resources.strumpf.ResourceFile; -import org.nd4j.resources.strumpf.StrumpfResolver; +import org.nd4j.common.resources.strumpf.ResourceFile; +import org.nd4j.common.resources.strumpf.StrumpfResolver; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllLibnd4j.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllLibnd4j.java index 97be71ddb..9b6b0f372 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllLibnd4j.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllLibnd4j.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.executioner.OpExecutioner; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.nativeblas.NativeOpsHolder; import java.io.File; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java index 210c4b703..b76b45dcd 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.executioner.OpExecutioner; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestList.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestList.java index b0b344f64..52aed2d1c 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestList.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestList.java @@ -24,7 +24,7 @@ import org.junit.runners.Parameterized; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.executioner.OpExecutioner; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.nativeblas.NativeOpsHolder; import java.io.File; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java index 9b823cde7..d8550673e 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestZooModels.java @@ -30,14 +30,14 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.nd4j.OpValidationSuite; import org.nd4j.autodiff.samediff.SameDiff; -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.executioner.OpExecutioner; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.function.BiFunction; -import org.nd4j.resources.Downloader; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.function.BiFunction; +import org.nd4j.common.resources.Downloader; +import org.nd4j.common.util.ArchiveUtils; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/ValidateZooModelPredictions.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/ValidateZooModelPredictions.java index 8cad63ddd..2940b79ff 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/ValidateZooModelPredictions.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/ValidateZooModelPredictions.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TensorFlowImportTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TensorFlowImportTest.java index 2a0880906..45ecc80fc 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TensorFlowImportTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TensorFlowImportTest.java @@ -43,7 +43,7 @@ import org.nd4j.linalg.api.ops.impl.scalar.RectifiedLinear; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.util.HashUtil; import org.nd4j.nativeblas.NativeOpsHolder; import org.tensorflow.framework.GraphDef; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/BaseNd4jTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/BaseNd4jTest.java index 0c2cb7a95..7ede960be 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/BaseNd4jTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/BaseNd4jTest.java @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.junit.Before; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/LoneTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/LoneTest.java index 8fd5e3f78..b5210c779 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/LoneTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/LoneTest.java @@ -32,7 +32,7 @@ import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Collections; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/NDArrayTestsFortran.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/NDArrayTestsFortran.java index 59994ed68..ba1cd8eb2 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/NDArrayTestsFortran.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/NDArrayTestsFortran.java @@ -34,7 +34,7 @@ import org.nd4j.linalg.executors.ExecutorServiceProvider; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java index ba6c11f4f..d98c1b3bc 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java @@ -27,10 +27,8 @@ import org.junit.*; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.nd4j.enums.DataFormat; import org.nd4j.enums.WeightsFormat; import org.nd4j.imports.TFGraphs.NodeReader; -import org.nd4j.linalg.api.blas.BlasBufferUtil; import org.nd4j.linalg.api.blas.Level1; import org.nd4j.linalg.api.blas.params.GemmParams; import org.nd4j.linalg.api.blas.params.MMulTranspose; @@ -98,11 +96,11 @@ import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; import org.nd4j.linalg.indexing.SpecifiedIndex; import org.nd4j.linalg.indexing.conditions.Conditions; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; -import org.nd4j.linalg.util.MathUtils; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; +import org.nd4j.common.util.MathUtils; import java.io.*; import java.nio.ByteBuffer; @@ -110,7 +108,6 @@ import java.nio.ByteOrder; import java.nio.file.Files; import java.nio.file.Paths; import java.util.*; -import java.util.concurrent.CountDownLatch; import static org.junit.Assert.*; import static org.junit.Assert.assertArrayEquals; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonC.java index e8ce1202c..5843f6eb1 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonC.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonC.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.checkutil.CheckUtil; import org.nd4j.linalg.checkutil.NDArrayCreationUtil; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonFortran.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonFortran.java index df929bbae..b0388ae2c 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonFortran.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonFortran.java @@ -30,7 +30,7 @@ import org.nd4j.linalg.checkutil.CheckUtil; import org.nd4j.linalg.checkutil.NDArrayCreationUtil; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ShufflesTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ShufflesTests.java index bd10bd74d..54c982c13 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ShufflesTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ShufflesTests.java @@ -17,14 +17,13 @@ package org.nd4j.linalg; import lombok.val; -import org.apache.commons.lang3.RandomUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/TestEigen.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/TestEigen.java index 78a7d3519..9667ef170 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/TestEigen.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/TestEigen.java @@ -27,7 +27,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.eigen.Eigen; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import static org.junit.Assert.assertEquals; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ToStringTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ToStringTest.java index 4d6525fe0..0b4bae259 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ToStringTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ToStringTest.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; @RunWith(Parameterized.class) @Slf4j diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/activations/TestActivation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/activations/TestActivation.java index 1240c1213..1cf326591 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/activations/TestActivation.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/activations/TestActivation.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.databind.*; import java.util.ArrayList; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreation.java index 85126b306..4761a784d 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreation.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreation.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import org.nd4j.nativeblas.NativeOpsHolder; import java.util.Map; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreationUtil.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreationUtil.java index 1aba11f5e..16716083c 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreationUtil.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreationUtil.java @@ -22,8 +22,8 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.checkutil.NDArrayCreationUtil; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import static org.junit.Assert.assertArrayEquals; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DoubleDataBufferTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DoubleDataBufferTest.java index e39760d9b..0f1345e7c 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DoubleDataBufferTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DoubleDataBufferTest.java @@ -33,7 +33,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.executioner.OpExecutioner; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.util.SerializationUtils; import java.io.*; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/FloatDataBufferTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/FloatDataBufferTest.java index c9bc81dc1..9c5ec7a01 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/FloatDataBufferTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/FloatDataBufferTest.java @@ -32,7 +32,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.executioner.OpExecutioner; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.util.SerializationUtils; import java.io.*; import java.nio.ByteBuffer; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java index bad99afb4..5a5d13648 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.api.indexing; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.iter.NdIndexIterator; @@ -28,7 +28,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.*; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.Arrays; import java.util.Random; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxt.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxt.java index a44df5868..65334f226 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxt.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxt.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.checkutil.NDArrayCreationUtil; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/tad/TestTensorAlongDimension.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/tad/TestTensorAlongDimension.java index 985715cc8..a77703437 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/tad/TestTensorAlongDimension.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/tad/TestTensorAlongDimension.java @@ -27,7 +27,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.checkutil.NDArrayCreationUtil; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionPerformanceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionPerformanceTests.java index fa1487e3f..12ad97d35 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionPerformanceTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionPerformanceTests.java @@ -27,7 +27,7 @@ import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.util.SerializationUtils; import java.io.ByteArrayOutputStream; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTests.java index 569bb26a5..98567b270 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTests.java @@ -33,8 +33,8 @@ import org.nd4j.linalg.checkutil.NDArrayCreationUtil; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.INDArrayIndex; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import java.util.Arrays; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTestsC.java index cd7ef26b6..05e84384f 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTestsC.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTestsC.java @@ -34,7 +34,7 @@ import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/DeconvTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/DeconvTests.java index e76aa52db..cdaaf1be5 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/DeconvTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/DeconvTests.java @@ -10,7 +10,7 @@ import org.nd4j.linalg.api.ops.CustomOp; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.resources.Resources; +import org.nd4j.common.resources.Resources; import java.io.File; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/DataSetTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/DataSetTest.java index 816003009..359ca41c9 100755 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/DataSetTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/DataSetTest.java @@ -32,7 +32,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.util.FeatureUtil; import java.io.*; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/IrisUtils.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/IrisUtils.java index 0909e8fe5..313690fee 100755 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/IrisUtils.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/IrisUtils.java @@ -19,7 +19,7 @@ package org.nd4j.linalg.dataset; import org.apache.commons.io.IOUtils; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.IOException; import java.util.ArrayList; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/Nd4jTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/Nd4jTest.java index b81b052b9..440375f0a 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/Nd4jTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/Nd4jTest.java @@ -29,8 +29,8 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.rng.Random; import org.nd4j.linalg.checkutil.NDArrayCreationUtil; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.nativeblas.NativeOpsHolder; import java.io.File; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/inverse/TestInvertMatrices.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/inverse/TestInvertMatrices.java index d85544106..f9711ead1 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/inverse/TestInvertMatrices.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/inverse/TestInvertMatrices.java @@ -30,7 +30,7 @@ import org.nd4j.linalg.checkutil.CheckUtil; import org.nd4j.linalg.checkutil.NDArrayCreationUtil; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/OpsMappingTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/OpsMappingTests.java index 2c1c284bc..dd6a1e116 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/OpsMappingTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/OpsMappingTests.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.api.ops.impl.summarystats.Variance; import org.nd4j.linalg.api.ops.random.BaseRandomOp; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.nativeblas.NativeOpsHolder; import org.reflections.Reflections; import org.reflections.scanners.SubTypesScanner; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTestsC.java index 461d09092..66305b42a 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTestsC.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTestsC.java @@ -63,8 +63,8 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.primitives.Pair; +import org.nd4j.common.util.ArrayUtil; import java.util.ArrayList; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/OperationProfilerTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/OperationProfilerTests.java index 8fff93cad..57799ec2a 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/OperationProfilerTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/OperationProfilerTests.java @@ -37,7 +37,7 @@ import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.profiler.OpProfiler; import org.nd4j.linalg.profiler.ProfilerConfig; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RngValidationTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RngValidationTests.java index aee1ca994..e31760f3f 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RngValidationTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RngValidationTests.java @@ -21,7 +21,7 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.nd4j.OpValidationSuite; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; @@ -37,7 +37,7 @@ import org.nd4j.linalg.api.ops.random.impl.*; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.conditions.Conditions; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/NumpyFormatTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/NumpyFormatTests.java index 4a69e29b7..34f23d1eb 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/NumpyFormatTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/NumpyFormatTests.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; import java.io.File; import java.util.Map; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeBufferTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeBufferTests.java index bf91e089a..3df76a160 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeBufferTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeBufferTests.java @@ -25,7 +25,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import static org.junit.Assert.*; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTests.java index 7caacad7a..2cd146b8f 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTests.java @@ -27,7 +27,7 @@ import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Triple; +import org.nd4j.common.primitives.Triple; import java.util.ArrayList; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/StaticShapeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/StaticShapeTests.java index 28e61a9eb..b9013d940 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/StaticShapeTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/StaticShapeTests.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.checkutil.NDArrayCreationUtil; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/TADTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/TADTests.java index 2953e2677..7e6a3c37d 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/TADTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/TADTests.java @@ -28,7 +28,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTests.java index 30bdbfb37..f7e6be98f 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTests.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.Arrays; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTestsC.java index bad97296f..d06ff575c 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTestsC.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTestsC.java @@ -31,7 +31,7 @@ import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.indexing.INDArrayIndex; import org.nd4j.linalg.indexing.NDArrayIndex; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.Arrays; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java index 569168eef..550261d1d 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java @@ -29,7 +29,7 @@ import org.nd4j.linalg.api.ops.impl.reduce3.ManhattanDistance; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.List; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/DataSetUtilsTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/DataSetUtilsTest.java index d6454fa74..7d4034c14 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/DataSetUtilsTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/DataSetUtilsTest.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.tools.SIS; +import org.nd4j.common.tools.SIS; import static org.junit.Assert.assertTrue; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/NDArrayUtilTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/NDArrayUtilTest.java index daa80295f..25378f5b1 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/NDArrayUtilTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/NDArrayUtilTest.java @@ -19,6 +19,7 @@ package org.nd4j.linalg.util; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4jBackend; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/PreconditionsTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/PreconditionsTest.java index 87c81943e..681f2df86 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/PreconditionsTest.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/PreconditionsTest.java @@ -17,7 +17,7 @@ package org.nd4j.linalg.util; import org.junit.Test; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestArrayUtils.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestArrayUtils.java index 0f8568a4e..589f74621 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestArrayUtils.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestArrayUtils.java @@ -17,6 +17,7 @@ package org.nd4j.linalg.util; import org.junit.Test; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.linalg.BaseNd4jTest; import org.nd4j.linalg.factory.Nd4jBackend; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestCollections.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestCollections.java index 8344ccd34..7d24b1e0c 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestCollections.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestCollections.java @@ -18,7 +18,7 @@ package org.nd4j.linalg.util; import org.junit.Test; import org.nd4j.linalg.BaseNd4jTest; -import org.nd4j.linalg.collection.CompactHeapStringList; +import org.nd4j.common.collection.CompactHeapStringList; import org.nd4j.linalg.factory.Nd4jBackend; import java.util.*; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ValidationUtilTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ValidationUtilTests.java index e6c9a2323..7d68b52d8 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ValidationUtilTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ValidationUtilTests.java @@ -12,9 +12,9 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4jBackend; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.validation.Nd4jCommonValidator; -import org.nd4j.validation.ValidationResult; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.validation.Nd4jCommonValidator; +import org.nd4j.common.validation.ValidationResult; import java.io.BufferedOutputStream; import java.io.File; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/systeminfo/TestSystemInfo.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/systeminfo/TestSystemInfo.java index ddfffef17..8a01b590a 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/systeminfo/TestSystemInfo.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/systeminfo/TestSystemInfo.java @@ -17,8 +17,7 @@ package org.nd4j.systeminfo; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.systeminfo.SystemInfo; +import org.nd4j.common.tests.BaseND4JTest; public class TestSystemInfo extends BaseND4JTest { @Test diff --git a/nd4j/nd4j-common-tests/src/main/java/org/nd4j/AbstractAssertTestsClass.java b/nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/AbstractAssertTestsClass.java similarity index 98% rename from nd4j/nd4j-common-tests/src/main/java/org/nd4j/AbstractAssertTestsClass.java rename to nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/AbstractAssertTestsClass.java index f229069ae..5befedba3 100644 --- a/nd4j/nd4j-common-tests/src/main/java/org/nd4j/AbstractAssertTestsClass.java +++ b/nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/AbstractAssertTestsClass.java @@ -13,7 +13,7 @@ * * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j; +package org.nd4j.common.tests; import lombok.extern.slf4j.Slf4j; import org.junit.Test; @@ -51,7 +51,6 @@ public abstract class AbstractAssertTestsClass extends BaseND4JTest { @Test public void checkTestClasses(){ - Reflections reflections = new Reflections(new ConfigurationBuilder() .setUrls(ClasspathHelper.forPackage(getPackageName())) .setScanners(new MethodAnnotationsScanner())); diff --git a/nd4j/nd4j-common-tests/src/main/java/org/nd4j/BaseND4JTest.java b/nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/BaseND4JTest.java similarity index 98% rename from nd4j/nd4j-common-tests/src/main/java/org/nd4j/BaseND4JTest.java rename to nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/BaseND4JTest.java index 34dd0f832..54bad9876 100644 --- a/nd4j/nd4j-common-tests/src/main/java/org/nd4j/BaseND4JTest.java +++ b/nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/BaseND4JTest.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j; +package org.nd4j.common.tests; import ch.qos.logback.classic.LoggerContext; import lombok.extern.slf4j.Slf4j; @@ -23,8 +23,8 @@ import org.bytedeco.javacpp.Pointer; import org.junit.*; import org.junit.rules.TestName; import org.junit.rules.Timeout; -import org.nd4j.base.Preconditions; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.memory.MemoryWorkspace; import org.nd4j.linalg.api.ops.executioner.OpExecutioner; diff --git a/nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/ResourceUtils.java b/nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/ResourceUtils.java index 95c09c154..bafe94094 100644 --- a/nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/ResourceUtils.java +++ b/nd4j/nd4j-common-tests/src/main/java/org/nd4j/common/tests/ResourceUtils.java @@ -15,8 +15,8 @@ ******************************************************************************/ package org.nd4j.common.tests; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.resources.Resources; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.resources.Resources; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/base/Preconditions.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/base/Preconditions.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/base/Preconditions.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/base/Preconditions.java index 491d1b297..7019c5fcc 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/base/Preconditions.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/base/Preconditions.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.base; +package org.nd4j.common.base; import java.util.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/base/PreconditionsFormat.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/base/PreconditionsFormat.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/base/PreconditionsFormat.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/base/PreconditionsFormat.java index 82e6cc633..7e965489a 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/base/PreconditionsFormat.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/base/PreconditionsFormat.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.base; +package org.nd4j.common.base; import java.util.List; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/CompactHeapStringList.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/CompactHeapStringList.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/CompactHeapStringList.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/CompactHeapStringList.java index 1152842f1..7e36ac29e 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/CompactHeapStringList.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/CompactHeapStringList.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.collection; +package org.nd4j.common.collection; import java.util.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/IntArrayKeyMap.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/IntArrayKeyMap.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/IntArrayKeyMap.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/IntArrayKeyMap.java index 72409e3ca..f1215e7a2 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/IntArrayKeyMap.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/IntArrayKeyMap.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.collection; +package org.nd4j.common.collection; import org.nd4j.shade.guava.primitives.Ints; import lombok.Getter; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/IntArrayKeySet.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/IntArrayKeySet.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/IntArrayKeySet.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/IntArrayKeySet.java index 33da17a41..fa5fc531d 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/IntArrayKeySet.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/IntArrayKeySet.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.collection; +package org.nd4j.common.collection; import java.util.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/MultiDimensionalMap.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/MultiDimensionalMap.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/MultiDimensionalMap.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/MultiDimensionalMap.java index 6a621b4df..9cf229710 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/MultiDimensionalMap.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/MultiDimensionalMap.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.collection; +package org.nd4j.common.collection; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.Serializable; import java.util.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/MultiDimensionalSet.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/MultiDimensionalSet.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/MultiDimensionalSet.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/MultiDimensionalSet.java index aab419ada..56e7716be 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/collection/MultiDimensionalSet.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collection/MultiDimensionalSet.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.collection; +package org.nd4j.common.collection; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.*; import java.util.concurrent.ConcurrentSkipListSet; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/collections/WeakIdentityHashMap.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collections/WeakIdentityHashMap.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/collections/WeakIdentityHashMap.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/collections/WeakIdentityHashMap.java index c336befd7..258654471 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/collections/WeakIdentityHashMap.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/collections/WeakIdentityHashMap.java @@ -1,4 +1,4 @@ -package org.nd4j.collections; +package org.nd4j.common.collections; import lombok.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/config/ND4JEnvironmentVars.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/config/ND4JEnvironmentVars.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/config/ND4JEnvironmentVars.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/config/ND4JEnvironmentVars.java index c77f945d0..ed5783440 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/config/ND4JEnvironmentVars.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/config/ND4JEnvironmentVars.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.config; +package org.nd4j.common.config; public class ND4JEnvironmentVars { diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/config/ND4JSystemProperties.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/config/ND4JSystemProperties.java similarity index 91% rename from nd4j/nd4j-common/src/main/java/org/nd4j/config/ND4JSystemProperties.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/config/ND4JSystemProperties.java index 16c78923f..3e0a9a999 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/config/ND4JSystemProperties.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/config/ND4JSystemProperties.java @@ -14,7 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.config; +package org.nd4j.common.config; + +import org.nd4j.common.resources.Resources; +import org.nd4j.common.resources.strumpf.ResourceFile; +import org.nd4j.common.resources.strumpf.StrumpfResolver; import java.io.File; import java.net.URL; @@ -121,7 +125,7 @@ public class ND4JSystemProperties { public static final String AERON_TERM_BUFFER_PROP = "aeron.term.buffer.length"; /** - * Applicability: nd4j-common {@link org.nd4j.resources.Resources} class (and hence {@link org.nd4j.resources.strumpf.StrumpfResolver})
+ * Applicability: nd4j-common {@link Resources} class (and hence {@link StrumpfResolver})
* Description: When resolving resources from a Strumpf resource file (Example: {@code Resources.asFile("myFile.txt")} * where should the remote files be downloaded to?
* This is generally used for resolving test resources, but can be used for Strumpf resource files generally. @@ -129,23 +133,23 @@ public class ND4JSystemProperties { public static final String RESOURCES_CACHE_DIR = "org.nd4j.test.resources.cache.dir"; /** - * Applicability: nd4j-common {@link org.nd4j.resources.Resources} class (and hence {@link org.nd4j.resources.strumpf.StrumpfResolver})
+ * Applicability: nd4j-common {@link Resources} class (and hence {@link StrumpfResolver})
* Description: When resolving resources from a Strumpf resource file (Example: {@code Resources.asFile("myFile.txt")} * what should be the connection timeout, as used by {@link org.apache.commons.io.FileUtils#copyURLToFile(URL, File, int, int)}
- * Default: {@link org.nd4j.resources.strumpf.ResourceFile#DEFAULT_CONNECTION_TIMEOUT} + * Default: {@link ResourceFile#DEFAULT_CONNECTION_TIMEOUT} */ public static final String RESOURCES_CONNECTION_TIMEOUT = "org.nd4j.resources.download.connectiontimeout"; /** - * Applicability: nd4j-common {@link org.nd4j.resources.Resources} class (and hence {@link org.nd4j.resources.strumpf.StrumpfResolver})
+ * Applicability: nd4j-common {@link Resources} class (and hence {@link StrumpfResolver})
* Description: When resolving resources from a Strumpf resource file (Example: {@code Resources.asFile("myFile.txt")} * what should be the connection timeout, as used by {@link org.apache.commons.io.FileUtils#copyURLToFile(URL, File, int, int)}
- * Default: {@link org.nd4j.resources.strumpf.ResourceFile#DEFAULT_READ_TIMEOUT} + * Default: {@link ResourceFile#DEFAULT_READ_TIMEOUT} */ public static final String RESOURCES_READ_TIMEOUT = "org.nd4j.resources.download.readtimeout"; /** - * Applicability: nd4j-common {@link org.nd4j.resources.Resources} class (and hence {@link org.nd4j.resources.strumpf.StrumpfResolver})
+ * Applicability: nd4j-common {@link Resources} class (and hence {@link StrumpfResolver})
* Description: When resolving resources, what local directories should be checked (in addition to the classpath) for files? * This is optional. Multiple directories may be specified, using comma-separated paths */ diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/BiConsumer.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/BiConsumer.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/BiConsumer.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/function/BiConsumer.java index a83596088..167f4c160 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/BiConsumer.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/BiConsumer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; /** * BiConsumer is an operation that accepts two arguments and returns no result. diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/BiFunction.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/BiFunction.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/BiFunction.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/function/BiFunction.java index 6de7af5dd..3365303bf 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/BiFunction.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/BiFunction.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; /** * A function that accepts two arguments and returns a result diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/BiPredicate.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/BiPredicate.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/BiPredicate.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/function/BiPredicate.java index 9f3e3ba2a..344fa5319 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/BiPredicate.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/BiPredicate.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; /** * A predicate (boolean valued function) with two arguments. diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Consumer.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Consumer.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Consumer.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Consumer.java index e3848580d..911c5819e 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Consumer.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Consumer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; /** * A function that accepts a single input and returns no result diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Function.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Function.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Function.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Function.java index defc2ec8e..ea6103dd3 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Function.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Function.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; /** * A Function accepts one argument and returns a result diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/FunctionalUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/FunctionalUtils.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/FunctionalUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/function/FunctionalUtils.java index e359e24bb..95ea6f21e 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/FunctionalUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/FunctionalUtils.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.HashMap; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Predicate.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Predicate.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Predicate.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Predicate.java index 156dddd64..35aca1bc2 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Predicate.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Predicate.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; /** * A boolean valued function of a single input argument diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Supplier.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Supplier.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Supplier.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Supplier.java index 80b6a7b45..12696cce5 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/Supplier.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/Supplier.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; /** * A supplier of results with no input arguments diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/UnaryOperator.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/UnaryOperator.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/UnaryOperator.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/function/UnaryOperator.java index c004bd014..a18c0f068 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/function/UnaryOperator.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/function/UnaryOperator.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; /** * A specialization of {@link Function} where the input and return types are the same diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/jackson/objectmapper/holder/ObjectMapperHolder.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/holder/ObjectMapperHolder.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/jackson/objectmapper/holder/ObjectMapperHolder.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/holder/ObjectMapperHolder.java index b0f5a6224..2a0dba43c 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/jackson/objectmapper/holder/ObjectMapperHolder.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/holder/ObjectMapperHolder.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.jackson.objectmapper.holder; +package org.nd4j.common.holder; import org.nd4j.shade.jackson.annotation.JsonAutoDetect; import org.nd4j.shade.jackson.annotation.JsonInclude; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/AbstractFileResolvingResource.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/AbstractFileResolvingResource.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/AbstractFileResolvingResource.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/AbstractFileResolvingResource.java index b6dcc6bf8..01adf1f3f 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/AbstractFileResolvingResource.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/AbstractFileResolvingResource.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/AbstractResource.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/AbstractResource.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/AbstractResource.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/AbstractResource.java index c53883c44..f9c90475d 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/AbstractResource.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/AbstractResource.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.io.File; import java.io.FileNotFoundException; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/Assert.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/Assert.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/Assert.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/Assert.java index 0a9398ac5..ad078a74f 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/Assert.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/Assert.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.util.Collection; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ClassPathResource.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ClassPathResource.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ClassPathResource.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ClassPathResource.java index 5f8f1766a..93c37051d 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ClassPathResource.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ClassPathResource.java @@ -14,17 +14,15 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; -import org.apache.commons.compress.compressors.FileNameUtil; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.io.*; import java.net.MalformedURLException; -import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Files; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ClassUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ClassUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ClassUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ClassUtils.java index 135fb8c5d..8ea3d2e0c 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ClassUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ClassUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.beans.Introspector; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/CollectionUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/CollectionUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/CollectionUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/CollectionUtils.java index ab202a2cb..c2d3e48bb 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/CollectionUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/CollectionUtils.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; -import org.nd4j.linalg.util.MultiValueMap; +import org.nd4j.common.util.MultiValueMap; import java.io.Serializable; import java.util.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/InputStreamSource.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/InputStreamSource.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/InputStreamSource.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/InputStreamSource.java index b6f504ddf..877e2e8c2 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/InputStreamSource.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/InputStreamSource.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.io.IOException; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ObjectUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ObjectUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ObjectUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ObjectUtils.java index a0576e378..f0f0bf0cf 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ObjectUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ObjectUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ReflectionUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ReflectionUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ReflectionUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ReflectionUtils.java index 6cb3413e5..4c78819b9 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ReflectionUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ReflectionUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.lang.reflect.*; import java.sql.SQLException; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/Resource.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/Resource.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/Resource.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/Resource.java index 44cc6925e..cf9d25767 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/Resource.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/Resource.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.io.File; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ResourceUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ResourceUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ResourceUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ResourceUtils.java index 1c8edc7a3..198da03cf 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/ResourceUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/ResourceUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.io.File; import java.io.FileNotFoundException; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/StringUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/StringUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/StringUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/StringUtils.java index 1f45a3021..1f5c86907 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/StringUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/StringUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.util.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/VfsResource.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/VfsResource.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/VfsResource.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/VfsResource.java index c776c8b61..196b644dc 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/VfsResource.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/VfsResource.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/VfsUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/VfsUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/VfsUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/io/VfsUtils.java index a5412643a..33988eab1 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/io/VfsUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/io/VfsUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/FileBatch.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/FileBatch.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/FileBatch.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/FileBatch.java index c6437a8bf..2649ecf83 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/FileBatch.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/FileBatch.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.api.loader; +package org.nd4j.common.loader; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/Loader.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/Loader.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/Loader.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/Loader.java index 44c9540d1..f7502946d 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/Loader.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/Loader.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.api.loader; +package org.nd4j.common.loader; import java.io.IOException; import java.io.Serializable; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/LocalFileSource.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/LocalFileSource.java similarity index 94% rename from nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/LocalFileSource.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/LocalFileSource.java index 1142588d5..3e13d8c97 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/LocalFileSource.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/LocalFileSource.java @@ -14,11 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.api.loader; +package org.nd4j.common.loader; import lombok.AllArgsConstructor; import lombok.Getter; -import org.nd4j.api.loader.Source; import java.io.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/LocalFileSourceFactory.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/LocalFileSourceFactory.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/LocalFileSourceFactory.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/LocalFileSourceFactory.java index 67bc39097..2e6bd33bd 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/LocalFileSourceFactory.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/LocalFileSourceFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.api.loader; +package org.nd4j.common.loader; public class LocalFileSourceFactory implements SourceFactory { @Override diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/Source.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/Source.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/Source.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/Source.java index 55570bb54..f80437c9c 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/Source.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/Source.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.api.loader; +package org.nd4j.common.loader; import java.io.IOException; import java.io.InputStream; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/SourceFactory.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/SourceFactory.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/SourceFactory.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/SourceFactory.java index 18565b356..533bd2691 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/api/loader/SourceFactory.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/loader/SourceFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.api.loader; +package org.nd4j.common.loader; import java.io.Serializable; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Atomic.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Atomic.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Atomic.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Atomic.java index ca7a27f81..24101da13 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Atomic.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Atomic.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.NoArgsConstructor; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/AtomicBoolean.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/AtomicBoolean.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/AtomicBoolean.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/AtomicBoolean.java index a681dad3a..a45c2f593 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/AtomicBoolean.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/AtomicBoolean.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; public class AtomicBoolean extends java.util.concurrent.atomic.AtomicBoolean { diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/AtomicDouble.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/AtomicDouble.java similarity index 91% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/AtomicDouble.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/AtomicDouble.java index e17fec5ce..d9747ab91 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/AtomicDouble.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/AtomicDouble.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; -import org.nd4j.linalg.primitives.serde.JsonDeserializerAtomicDouble; -import org.nd4j.linalg.primitives.serde.JsonSerializerAtomicDouble; +import org.nd4j.common.primitives.serde.JsonDeserializerAtomicDouble; +import org.nd4j.common.primitives.serde.JsonSerializerAtomicDouble; import org.nd4j.shade.jackson.annotation.JsonProperty; import org.nd4j.shade.jackson.databind.annotation.JsonDeserialize; import org.nd4j.shade.jackson.databind.annotation.JsonSerialize; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Counter.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Counter.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Counter.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Counter.java index ccc5e4e06..d3f23ec1e 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Counter.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Counter.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import java.io.Serializable; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/CounterMap.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/CounterMap.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/CounterMap.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/CounterMap.java index e94e25fdf..b4521c869 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/CounterMap.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/CounterMap.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.EqualsAndHashCode; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/ImmutablePair.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/ImmutablePair.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/ImmutablePair.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/ImmutablePair.java index 0806bb421..d7093d8ee 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/ImmutablePair.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/ImmutablePair.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/ImmutableQuad.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/ImmutableQuad.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/ImmutableQuad.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/ImmutableQuad.java index b2c1f201d..c5f7ccb16 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/ImmutableQuad.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/ImmutableQuad.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/ImmutableTriple.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/ImmutableTriple.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/ImmutableTriple.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/ImmutableTriple.java index d03686b92..d85bc2153 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/ImmutableTriple.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/ImmutableTriple.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Optional.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Optional.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Optional.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Optional.java index 81a272604..1a2bd1860 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Optional.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Optional.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.EqualsAndHashCode; import lombok.NonNull; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Pair.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Pair.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Pair.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Pair.java index 31976080d..84633d22a 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Pair.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Pair.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.AllArgsConstructor; import lombok.Builder; @@ -23,7 +23,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Arrays; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; /** * Simple pair implementation diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Quad.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Quad.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Quad.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Quad.java index a46a3dee1..7304f8ff2 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Quad.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Quad.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/SynchronizedObject.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/SynchronizedObject.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/SynchronizedObject.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/SynchronizedObject.java index fc213bfd0..22f014975 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/SynchronizedObject.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/SynchronizedObject.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import java.io.Serializable; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Triple.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Triple.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Triple.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Triple.java index 1d00d2916..ee9cdbc13 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/Triple.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/Triple.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonDeserializerAtomicBoolean.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonDeserializerAtomicBoolean.java similarity index 91% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonDeserializerAtomicBoolean.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonDeserializerAtomicBoolean.java index c894a3c78..35a9f1855 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonDeserializerAtomicBoolean.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonDeserializerAtomicBoolean.java @@ -14,10 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives.serde; +package org.nd4j.common.primitives.serde; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.AtomicDouble; +import org.nd4j.common.primitives.AtomicBoolean; import org.nd4j.shade.jackson.core.JsonParser; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.databind.DeserializationContext; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonDeserializerAtomicDouble.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonDeserializerAtomicDouble.java similarity index 94% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonDeserializerAtomicDouble.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonDeserializerAtomicDouble.java index 70f50d414..87cd894d1 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonDeserializerAtomicDouble.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonDeserializerAtomicDouble.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives.serde; +package org.nd4j.common.primitives.serde; -import org.nd4j.linalg.primitives.AtomicDouble; +import org.nd4j.common.primitives.AtomicDouble; import org.nd4j.shade.jackson.core.JsonParser; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.databind.DeserializationContext; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonSerializerAtomicBoolean.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonSerializerAtomicBoolean.java similarity index 90% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonSerializerAtomicBoolean.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonSerializerAtomicBoolean.java index d4235e443..69068d727 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonSerializerAtomicBoolean.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonSerializerAtomicBoolean.java @@ -14,10 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives.serde; +package org.nd4j.common.primitives.serde; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.AtomicDouble; +import org.nd4j.common.primitives.AtomicBoolean; import org.nd4j.shade.jackson.core.JsonGenerator; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.databind.JsonSerializer; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonSerializerAtomicDouble.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonSerializerAtomicDouble.java similarity index 93% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonSerializerAtomicDouble.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonSerializerAtomicDouble.java index 5dbd06504..23e86283b 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/primitives/serde/JsonSerializerAtomicDouble.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/primitives/serde/JsonSerializerAtomicDouble.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives.serde; +package org.nd4j.common.primitives.serde; -import org.nd4j.linalg.primitives.AtomicDouble; +import org.nd4j.common.primitives.AtomicDouble; import org.nd4j.shade.jackson.core.JsonGenerator; import org.nd4j.shade.jackson.core.JsonProcessingException; import org.nd4j.shade.jackson.databind.JsonSerializer; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/Downloader.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/Downloader.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/resources/Downloader.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/Downloader.java index 19352fc7c..230cb1f44 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/Downloader.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/Downloader.java @@ -14,13 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.resources; +package org.nd4j.common.resources; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.util.ArchiveUtils; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/Resolver.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/Resolver.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/resources/Resolver.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/Resolver.java index c25b7d123..b88597c87 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/Resolver.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/Resolver.java @@ -1,4 +1,4 @@ -package org.nd4j.resources; +package org.nd4j.common.resources; import java.io.File; import java.io.InputStream; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/Resources.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/Resources.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/resources/Resources.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/Resources.java index 14088f7c3..32b0d25e0 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/Resources.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/Resources.java @@ -1,7 +1,7 @@ -package org.nd4j.resources; +package org.nd4j.common.resources; import lombok.NonNull; -import org.nd4j.resources.strumpf.StrumpfResolver; +import org.nd4j.common.resources.strumpf.StrumpfResolver; import java.io.File; import java.io.InputStream; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/strumpf/ResourceFile.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/strumpf/ResourceFile.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/resources/strumpf/ResourceFile.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/strumpf/ResourceFile.java index 6a69bd3b9..aebb754d4 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/strumpf/ResourceFile.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/strumpf/ResourceFile.java @@ -1,6 +1,6 @@ -package org.nd4j.resources.strumpf; +package org.nd4j.common.resources.strumpf; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.shade.guava.io.Files; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +11,7 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.shade.jackson.annotation.JsonIgnoreProperties; import org.nd4j.shade.jackson.databind.DeserializationFeature; import org.nd4j.shade.jackson.databind.MapperFeature; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/strumpf/StrumpfResolver.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/strumpf/StrumpfResolver.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/resources/strumpf/StrumpfResolver.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/strumpf/StrumpfResolver.java index 07ab95676..bdf92db2e 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/resources/strumpf/StrumpfResolver.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/resources/strumpf/StrumpfResolver.java @@ -1,11 +1,11 @@ -package org.nd4j.resources.strumpf; +package org.nd4j.common.resources.strumpf; import lombok.NonNull; import org.apache.commons.io.FileUtils; -import org.nd4j.config.ND4JEnvironmentVars; -import org.nd4j.config.ND4JSystemProperties; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.resources.Resolver; +import org.nd4j.common.config.ND4JEnvironmentVars; +import org.nd4j.common.config.ND4JSystemProperties; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.resources.Resolver; import java.io.*; import java.nio.file.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/BTools.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/BTools.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/tools/BTools.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/BTools.java index 5a2a54bd5..3797aa3aa 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/BTools.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/BTools.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/InfoLine.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/InfoLine.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/tools/InfoLine.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/InfoLine.java index dea124fae..0c42a7ea9 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/InfoLine.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/InfoLine.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import java.util.ArrayList; import java.util.List; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/InfoValues.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/InfoValues.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/tools/InfoValues.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/InfoValues.java index b9eb509e9..1c90d4d09 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/InfoValues.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/InfoValues.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import java.util.ArrayList; import java.util.List; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/PropertyParser.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/PropertyParser.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/tools/PropertyParser.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/PropertyParser.java index 839a05f88..48ff27722 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/PropertyParser.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/PropertyParser.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import java.util.Properties; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/SIS.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/SIS.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/tools/SIS.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/SIS.java index 9a9a96bf1..b687f20f1 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/tools/SIS.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/tools/SIS.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import java.io.BufferedWriter; import java.io.File; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/AbstractNumber.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/AbstractNumber.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/AbstractNumber.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/AbstractNumber.java index 116c13109..1b18410f0 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/AbstractNumber.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/AbstractNumber.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; /** * @author bogachenko diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/util/ArchiveUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ArchiveUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/util/ArchiveUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ArchiveUtils.java index 9883ee5c3..d9c602b09 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/util/ArchiveUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ArchiveUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.util; +package org.nd4j.common.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.archivers.ArchiveEntry; @@ -23,7 +23,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.io.*; import java.util.ArrayList; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/ArrayUtil.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ArrayUtil.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/ArrayUtil.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ArrayUtil.java index cead401b3..1bdac9793 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/ArrayUtil.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ArrayUtil.java @@ -14,13 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import org.nd4j.shade.guava.primitives.Ints; import org.nd4j.shade.guava.primitives.Longs; import lombok.val; import org.apache.commons.lang3.RandomUtils; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Bernoulli.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Bernoulli.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Bernoulli.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Bernoulli.java index 942003552..39edabe9a 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Bernoulli.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Bernoulli.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; /* * To change this template, choose Tools | Templates and open the template in the editor. diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Factorial.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Factorial.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Factorial.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Factorial.java index cbd01ed73..8e8ab189a 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Factorial.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Factorial.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; /** * diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/util/Index.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Index.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/util/Index.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Index.java index f130bbda1..fca9aea7b 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/util/Index.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Index.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.util; +package org.nd4j.common.util; import java.io.Serializable; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/InputStreamUtil.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/InputStreamUtil.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/InputStreamUtil.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/InputStreamUtil.java index 038db88bc..98daab389 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/InputStreamUtil.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/InputStreamUtil.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import java.io.BufferedInputStream; import java.io.FileInputStream; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/LinkedMultiValueMap.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/LinkedMultiValueMap.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/LinkedMultiValueMap.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/LinkedMultiValueMap.java index facc88b18..544d054af 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/LinkedMultiValueMap.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/LinkedMultiValueMap.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import java.io.Serializable; import java.util.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/MathUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/MathUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/MathUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/MathUtils.java index 51ef18253..21e37d658 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/MathUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/MathUtils.java @@ -14,13 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import org.apache.commons.math3.random.RandomGenerator; import org.apache.commons.math3.util.FastMath; -import org.nd4j.linalg.primitives.Counter; -import org.nd4j.util.SetUtils; +import org.nd4j.common.primitives.Counter; import java.util.ArrayList; import java.util.List; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/MultiValueMap.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/MultiValueMap.java similarity index 97% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/MultiValueMap.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/MultiValueMap.java index 6f577f8fa..c36bdda48 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/MultiValueMap.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/MultiValueMap.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import java.util.List; import java.util.Map; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/ND4JFileUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ND4JFileUtils.java similarity index 96% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/ND4JFileUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ND4JFileUtils.java index 9a66bccdd..b66c21a39 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/ND4JFileUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ND4JFileUtils.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.config.ND4JSystemProperties; import java.io.File; import java.io.IOException; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/NioUtil.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/NioUtil.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/NioUtil.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/NioUtil.java index a88126a7f..79d30d80f 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/NioUtil.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/NioUtil.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import java.nio.*; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/util/OneTimeLogger.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/OneTimeLogger.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/util/OneTimeLogger.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/OneTimeLogger.java index da3b2b54a..2f1af293b 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/util/OneTimeLogger.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/OneTimeLogger.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.util; +package org.nd4j.common.util; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Paths.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Paths.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Paths.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Paths.java index a813d9260..837f770d7 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Paths.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Paths.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import org.apache.commons.io.FileUtils; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Rational.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Rational.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Rational.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Rational.java index 002f313b6..f0fbf3b03 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/Rational.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/Rational.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; /* * To change this template, choose Tools | Templates and open the template in the editor. */ diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/util/ReflectionUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ReflectionUtils.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/util/ReflectionUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ReflectionUtils.java index 7b7772008..b8870d77f 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/util/ReflectionUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/ReflectionUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.util; +package org.nd4j.common.util; import java.io.PrintWriter; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/SerializationUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/SerializationUtils.java old mode 100755 new mode 100644 similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/SerializationUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/SerializationUtils.java index 25a074b91..4e2af6eb4 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/SerializationUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/SerializationUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import org.apache.commons.io.FileUtils; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/util/SetUtils.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/SetUtils.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/util/SetUtils.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/SetUtils.java index bd5f9b025..d722bb113 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/util/SetUtils.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/SetUtils.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.util; +package org.nd4j.common.util; import java.util.Collection; import java.util.HashSet; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/SynchronizedTable.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/SynchronizedTable.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/SynchronizedTable.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/util/SynchronizedTable.java index 0c4377ea9..d3337fc21 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/linalg/util/SynchronizedTable.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/util/SynchronizedTable.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import org.nd4j.shade.guava.collect.Table; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/validation/Nd4jCommonValidator.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/validation/Nd4jCommonValidator.java similarity index 99% rename from nd4j/nd4j-common/src/main/java/org/nd4j/validation/Nd4jCommonValidator.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/validation/Nd4jCommonValidator.java index fe276914b..ff36db830 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/validation/Nd4jCommonValidator.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/validation/Nd4jCommonValidator.java @@ -1,4 +1,4 @@ -package org.nd4j.validation; +package org.nd4j.common.validation; import lombok.NonNull; import org.apache.commons.io.FileUtils; diff --git a/nd4j/nd4j-common/src/main/java/org/nd4j/validation/ValidationResult.java b/nd4j/nd4j-common/src/main/java/org/nd4j/common/validation/ValidationResult.java similarity index 98% rename from nd4j/nd4j-common/src/main/java/org/nd4j/validation/ValidationResult.java rename to nd4j/nd4j-common/src/main/java/org/nd4j/common/validation/ValidationResult.java index 6a86d493f..8a66383a9 100644 --- a/nd4j/nd4j-common/src/main/java/org/nd4j/validation/ValidationResult.java +++ b/nd4j/nd4j-common/src/main/java/org/nd4j/common/validation/ValidationResult.java @@ -1,4 +1,4 @@ -package org.nd4j.validation; +package org.nd4j.common.validation; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/base/TestPreconditions.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/base/TestPreconditions.java similarity index 99% rename from nd4j/nd4j-common/src/test/java/org/nd4j/base/TestPreconditions.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/base/TestPreconditions.java index 8019b553c..53aaa3e9c 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/base/TestPreconditions.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/base/TestPreconditions.java @@ -14,9 +14,10 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.base; +package org.nd4j.common.base; import org.junit.Test; +import org.nd4j.common.base.Preconditions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/function/FunctionalUtilsTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/function/FunctionalUtilsTest.java similarity index 95% rename from nd4j/nd4j-common/src/test/java/org/nd4j/linalg/function/FunctionalUtilsTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/function/FunctionalUtilsTest.java index ef653c7a3..1023a5772 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/function/FunctionalUtilsTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/function/FunctionalUtilsTest.java @@ -14,10 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.function; +package org.nd4j.common.function; import org.junit.Test; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.function.FunctionalUtils; +import org.nd4j.common.primitives.Pair; import java.util.*; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/io/ClassPathResourceTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/io/ClassPathResourceTest.java similarity index 95% rename from nd4j/nd4j-common/src/test/java/org/nd4j/linalg/io/ClassPathResourceTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/io/ClassPathResourceTest.java index d3b9cd064..1fd9ab95a 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/io/ClassPathResourceTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/io/ClassPathResourceTest.java @@ -14,11 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.io; +package org.nd4j.common.io; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.nd4j.common.io.ClassPathResource; import java.io.File; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/api/loader/TestFileBatch.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/loader/TestFileBatch.java similarity index 97% rename from nd4j/nd4j-common/src/test/java/org/nd4j/api/loader/TestFileBatch.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/loader/TestFileBatch.java index 431082c09..fba85d83c 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/api/loader/TestFileBatch.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/loader/TestFileBatch.java @@ -14,12 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.api.loader; +package org.nd4j.common.loader; import org.apache.commons.io.FileUtils; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.nd4j.common.loader.FileBatch; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/primitives/AtomicTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/primitives/AtomicTest.java similarity index 94% rename from nd4j/nd4j-common/src/test/java/org/nd4j/linalg/primitives/AtomicTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/primitives/AtomicTest.java index d473d7eab..90a9563bc 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/primitives/AtomicTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/primitives/AtomicTest.java @@ -14,11 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.val; import org.junit.Test; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.primitives.Atomic; +import org.nd4j.common.util.SerializationUtils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/primitives/CounterMapTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/primitives/CounterMapTest.java similarity index 96% rename from nd4j/nd4j-common/src/test/java/org/nd4j/linalg/primitives/CounterMapTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/primitives/CounterMapTest.java index 74eaa930f..b9fc1eae9 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/primitives/CounterMapTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/primitives/CounterMapTest.java @@ -14,9 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import org.junit.Test; +import org.nd4j.common.primitives.CounterMap; +import org.nd4j.common.primitives.Pair; import java.util.Iterator; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/primitives/CounterTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/primitives/CounterTest.java similarity index 97% rename from nd4j/nd4j-common/src/test/java/org/nd4j/linalg/primitives/CounterTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/primitives/CounterTest.java index 2d8a76af5..08c28deb5 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/primitives/CounterTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/primitives/CounterTest.java @@ -14,10 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.primitives; +package org.nd4j.common.primitives; import lombok.extern.slf4j.Slf4j; import org.junit.Test; +import org.nd4j.common.primitives.Counter; import java.util.List; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/resources/TestArchiveUtils.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/resources/TestArchiveUtils.java similarity index 95% rename from nd4j/nd4j-common/src/test/java/org/nd4j/resources/TestArchiveUtils.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/resources/TestArchiveUtils.java index 9a36d7fe3..e2586c458 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/resources/TestArchiveUtils.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/resources/TestArchiveUtils.java @@ -1,10 +1,10 @@ -package org.nd4j.resources; +package org.nd4j.common.resources; import org.apache.commons.io.FileUtils; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.util.ArchiveUtils; +import org.nd4j.common.util.ArchiveUtils; import java.io.File; import java.io.FileInputStream; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/resources/TestStrumpf.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/resources/TestStrumpf.java similarity index 93% rename from nd4j/nd4j-common/src/test/java/org/nd4j/resources/TestStrumpf.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/resources/TestStrumpf.java index 3a72a7245..21e12336a 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/resources/TestStrumpf.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/resources/TestStrumpf.java @@ -1,4 +1,4 @@ -package org.nd4j.resources; +package org.nd4j.common.resources; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -6,9 +6,9 @@ import org.apache.commons.io.LineIterator; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.nd4j.config.ND4JSystemProperties; -import org.nd4j.resources.strumpf.ResourceFile; -import org.nd4j.resources.strumpf.StrumpfResolver; +import org.nd4j.common.config.ND4JSystemProperties; +import org.nd4j.common.resources.Resources; +import org.nd4j.common.resources.strumpf.StrumpfResolver; import java.io.BufferedReader; import java.io.File; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/BToolsTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/BToolsTest.java similarity index 98% rename from nd4j/nd4j-common/src/test/java/org/nd4j/tools/BToolsTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/BToolsTest.java index b52197885..3ca05916b 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/BToolsTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/BToolsTest.java @@ -14,9 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import org.junit.Test; +import org.nd4j.common.tools.BTools; + import static org.junit.Assert.*; /** diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/InfoLineTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/InfoLineTest.java similarity index 93% rename from nd4j/nd4j-common/src/test/java/org/nd4j/tools/InfoLineTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/InfoLineTest.java index d987d8e66..41080a335 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/InfoLineTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/InfoLineTest.java @@ -14,9 +14,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import org.junit.Test; +import org.nd4j.common.tools.InfoLine; +import org.nd4j.common.tools.InfoValues; + import static org.junit.Assert.*; /** diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/InfoValuesTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/InfoValuesTest.java similarity index 96% rename from nd4j/nd4j-common/src/test/java/org/nd4j/tools/InfoValuesTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/InfoValuesTest.java index c4022a675..ad3d3a5de 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/InfoValuesTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/InfoValuesTest.java @@ -14,9 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import org.junit.Test; +import org.nd4j.common.tools.InfoValues; + import static org.junit.Assert.*; /** diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/PropertyParserTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/PropertyParserTest.java similarity index 99% rename from nd4j/nd4j-common/src/test/java/org/nd4j/tools/PropertyParserTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/PropertyParserTest.java index 629163a08..623c5efba 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/PropertyParserTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/PropertyParserTest.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import java.util.Properties; import org.junit.After; @@ -24,6 +24,7 @@ import static org.junit.Assert.fail; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nd4j.common.tools.PropertyParser; /** * Tests for PropertyParser diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/SISTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/SISTest.java similarity index 96% rename from nd4j/nd4j-common/src/test/java/org/nd4j/tools/SISTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/SISTest.java index 0b26e2e08..e2f9e00c4 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/tools/SISTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/tools/SISTest.java @@ -14,12 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.tools; +package org.nd4j.common.tools; import org.junit.After; import org.junit.Test; import org.junit.Rule; import org.junit.rules.TemporaryFolder; +import org.nd4j.common.tools.SIS; import static org.junit.Assert.*; diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/util/ArrayUtilTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/util/ArrayUtilTest.java similarity index 95% rename from nd4j/nd4j-common/src/test/java/org/nd4j/linalg/util/ArrayUtilTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/util/ArrayUtilTest.java index cf010ee31..04eb54a1b 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/linalg/util/ArrayUtilTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/util/ArrayUtilTest.java @@ -14,12 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.linalg.util; +package org.nd4j.common.util; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import org.junit.Test; +import org.nd4j.common.util.ArrayUtil; public class ArrayUtilTest { diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/util/OneTimeLoggerTest.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/util/OneTimeLoggerTest.java similarity index 94% rename from nd4j/nd4j-common/src/test/java/org/nd4j/util/OneTimeLoggerTest.java rename to nd4j/nd4j-common/src/test/java/org/nd4j/common/util/OneTimeLoggerTest.java index eb6a63647..03cc48bbd 100644 --- a/nd4j/nd4j-common/src/test/java/org/nd4j/util/OneTimeLoggerTest.java +++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/util/OneTimeLoggerTest.java @@ -14,10 +14,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.util; +package org.nd4j.common.util; import lombok.extern.slf4j.Slf4j; import org.junit.Test; +import org.nd4j.common.util.OneTimeLogger; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/nd4j/nd4j-jdbc/nd4j-jdbc-hsql/src/test/java/org/nd4j/jdbc/hsql/HSqlLoaderTest.java b/nd4j/nd4j-jdbc/nd4j-jdbc-hsql/src/test/java/org/nd4j/jdbc/hsql/HSqlLoaderTest.java index a546e8da9..b019a2748 100644 --- a/nd4j/nd4j-jdbc/nd4j-jdbc-hsql/src/test/java/org/nd4j/jdbc/hsql/HSqlLoaderTest.java +++ b/nd4j/nd4j-jdbc/nd4j-jdbc-hsql/src/test/java/org/nd4j/jdbc/hsql/HSqlLoaderTest.java @@ -21,7 +21,7 @@ import org.hsqldb.jdbc.JDBCDataSource; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-jdbc/nd4j-jdbc-mysql/src/test/java/org/nd4j/jdbc/mysql/MysqlLoaderTest.java b/nd4j/nd4j-jdbc/nd4j-jdbc-mysql/src/test/java/org/nd4j/jdbc/mysql/MysqlLoaderTest.java index 59aea4ac0..f5f924235 100644 --- a/nd4j/nd4j-jdbc/nd4j-jdbc-mysql/src/test/java/org/nd4j/jdbc/mysql/MysqlLoaderTest.java +++ b/nd4j/nd4j-jdbc/nd4j-jdbc-mysql/src/test/java/org/nd4j/jdbc/mysql/MysqlLoaderTest.java @@ -19,7 +19,7 @@ package org.nd4j.jdbc.mysql; import com.mchange.v2.c3p0.ComboPooledDataSource; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/pom.xml b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/pom.xml index ccabf1b76..5b237f65c 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/pom.xml +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/pom.xml @@ -80,22 +80,67 @@ testresources - + + + + nd4j-testresources + + + + nd4j-tests-cpu + + false + org.nd4j nd4j-native ${project.version} - test - - - org.nd4j - nd4j-native - ${project.version} - ${javacpp.platform} - test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + src/test/java + + *.java + **/*.java + + -Ddtype=float -Xmx8g + + + + + + + + + nd4j-tests-cuda + + false + + + + org.nd4j + nd4j-cuda-10.2 + ${project.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/background/RemoteParameterServerClientTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/background/RemoteParameterServerClientTests.java index d94b1384a..906629425 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/background/RemoteParameterServerClientTests.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/background/RemoteParameterServerClientTests.java @@ -24,8 +24,9 @@ import org.agrona.CloseHelper; import org.agrona.concurrent.BusySpinIdleStrategy; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.AeronUtil; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; @@ -90,7 +91,7 @@ public class RemoteParameterServerClientTests extends BaseND4JTest { CloseHelper.close(aeron); } - @Test(timeout = 60000L) + @Test(timeout = 60000L) @Ignore //AB 20200425 https://github.com/eclipse/deeplearning4j/issues/8882 public void remoteTests() throws Exception { if (masterStatus.get() != 0 || slaveStatus.get() != 0) throw new IllegalStateException("Master or slave failed to start. Exiting"); diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientPartialTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientPartialTest.java index 3846d6c2d..32fef5c46 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientPartialTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientPartialTest.java @@ -24,7 +24,7 @@ import org.agrona.concurrent.BusySpinIdleStrategy; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.AeronUtil; import org.nd4j.aeron.ipc.NDArrayMessage; import org.nd4j.linalg.api.ndarray.INDArray; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientTest.java index 6aeaadb90..4425265bb 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientTest.java @@ -21,7 +21,7 @@ import io.aeron.driver.MediaDriver; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.AeronUtil; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml index bfab849da..f1c168c33 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml @@ -91,15 +91,67 @@ testresources - + + + + nd4j-testresources + + + + nd4j-tests-cpu + + false + org.nd4j nd4j-native ${project.version} - test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + src/test/java + + *.java + **/*.java + + -Ddtype=float -Xmx8g + + + + + + + + + nd4j-tests-cuda + + false + + + + org.nd4j + nd4j-cuda-10.2 + ${project.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/VoidParameterServer.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/VoidParameterServer.java index 26e46949f..a295ff8b8 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/VoidParameterServer.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/VoidParameterServer.java @@ -20,8 +20,8 @@ import lombok.Getter; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.nd4j.config.ND4JEnvironmentVars; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.config.ND4JEnvironmentVars; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; @@ -36,7 +36,6 @@ import org.nd4j.parameterserver.distributed.messages.*; import org.nd4j.parameterserver.distributed.messages.requests.*; import org.nd4j.parameterserver.distributed.training.TrainingDriver; import org.nd4j.parameterserver.distributed.training.impl.SkipGramTrainer; -import org.nd4j.parameterserver.distributed.transport.MulticastTransport; import org.nd4j.parameterserver.distributed.transport.RoutedTransport; import org.nd4j.parameterserver.distributed.transport.Transport; import org.nd4j.parameterserver.distributed.util.NetworkOrganizer; @@ -45,7 +44,6 @@ import java.net.InterfaceAddress; import java.net.NetworkInterface; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/logic/completion/FrameCompletionHandler.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/logic/completion/FrameCompletionHandler.java index ff7c0846b..22619f726 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/logic/completion/FrameCompletionHandler.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/logic/completion/FrameCompletionHandler.java @@ -18,10 +18,8 @@ package org.nd4j.parameterserver.distributed.logic.completion; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.nd4j.linalg.primitives.Pair; import java.util.Map; -import java.util.Queue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/BaseVoidMessage.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/BaseVoidMessage.java index 257c56952..d1276fe8a 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/BaseVoidMessage.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/BaseVoidMessage.java @@ -18,7 +18,7 @@ package org.nd4j.parameterserver.distributed.messages; import lombok.*; import org.agrona.concurrent.UnsafeBuffer; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.enums.NodeRole; import org.nd4j.parameterserver.distributed.logic.completion.Clipboard; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/Frame.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/Frame.java index 51f8d437e..e78e0143f 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/Frame.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/Frame.java @@ -22,7 +22,7 @@ import lombok.NonNull; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.agrona.concurrent.UnsafeBuffer; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.enums.NodeRole; import org.nd4j.parameterserver.distributed.logic.completion.Clipboard; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/aggregations/BaseAggregation.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/aggregations/BaseAggregation.java index 32aad302b..ff29dda01 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/aggregations/BaseAggregation.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/messages/aggregations/BaseAggregation.java @@ -24,7 +24,7 @@ import org.agrona.concurrent.UnsafeBuffer; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.messages.BaseVoidMessage; import org.nd4j.parameterserver.distributed.messages.VoidAggregation; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/transport/RoutedTransport.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/transport/RoutedTransport.java index 1b420d6a4..9f18c4281 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/transport/RoutedTransport.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/transport/RoutedTransport.java @@ -27,7 +27,7 @@ import lombok.extern.slf4j.Slf4j; import org.agrona.CloseHelper; import org.agrona.DirectBuffer; import org.nd4j.aeron.ipc.AeronUtil; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.util.HashUtil; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/ModelParameterServer.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/ModelParameterServer.java index 8dde24ea2..f011c0d7b 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/ModelParameterServer.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/ModelParameterServer.java @@ -24,10 +24,9 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Atomic; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Atomic; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.primitives.Pair; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.v2.enums.PropagationMode; import org.nd4j.parameterserver.distributed.v2.messages.impl.GradientsUpdateMessage; @@ -42,13 +41,11 @@ import org.nd4j.parameterserver.distributed.v2.transport.UpdaterParametersProvid import org.nd4j.parameterserver.distributed.v2.transport.UpdatesHandler; import org.nd4j.parameterserver.distributed.v2.transport.impl.StaticPortSupplier; import org.nd4j.parameterserver.distributed.v2.util.AbstractSubscriber; -import org.nd4j.parameterserver.distributed.v2.util.MeshOrganizer; import org.nd4j.parameterserver.distributed.v2.util.UpdaterParametersHolder; import org.reactivestreams.Subscriber; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/FileChunksTracker.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/FileChunksTracker.java index 9b37d9bb9..ad4d2f57b 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/FileChunksTracker.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/FileChunksTracker.java @@ -21,9 +21,9 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.util.ND4JFileUtils; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.util.ND4JFileUtils; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.v2.chunks.ChunksTracker; import org.nd4j.parameterserver.distributed.v2.chunks.VoidChunk; import org.nd4j.parameterserver.distributed.v2.messages.VoidMessage; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/InmemoryChunksTracker.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/InmemoryChunksTracker.java index e1d9c9488..da41f9d77 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/InmemoryChunksTracker.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/InmemoryChunksTracker.java @@ -21,8 +21,8 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.v2.chunks.ChunksTracker; import org.nd4j.parameterserver.distributed.v2.chunks.VoidChunk; import org.nd4j.parameterserver.distributed.v2.messages.VoidMessage; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/messages/VoidMessage.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/messages/VoidMessage.java index 42a4eec77..f030269f9 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/messages/VoidMessage.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/messages/VoidMessage.java @@ -17,6 +17,7 @@ package org.nd4j.parameterserver.distributed.v2.messages; import org.agrona.concurrent.UnsafeBuffer; +import org.nd4j.common.util.SerializationUtils; import java.io.ByteArrayInputStream; import java.io.Serializable; @@ -51,10 +52,10 @@ public interface VoidMessage extends Serializable { * @return */ default UnsafeBuffer asUnsafeBuffer() { - return new UnsafeBuffer(org.nd4j.linalg.util.SerializationUtils.toByteArray(this)); + return new UnsafeBuffer(SerializationUtils.toByteArray(this)); } static VoidMessage fromBytes(byte[] bytes) { - return org.nd4j.linalg.util.SerializationUtils.readObject(new ByteArrayInputStream(bytes)); + return SerializationUtils.readObject(new ByteArrayInputStream(bytes)); } } diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/messages/impl/base/BaseVoidMessage.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/messages/impl/base/BaseVoidMessage.java index 6d0cc3f18..e5b380b2c 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/messages/impl/base/BaseVoidMessage.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/messages/impl/base/BaseVoidMessage.java @@ -19,8 +19,6 @@ package org.nd4j.parameterserver.distributed.v2.messages.impl.base; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.agrona.concurrent.UnsafeBuffer; -import org.nd4j.linalg.util.SerializationUtils; import org.nd4j.parameterserver.distributed.v2.messages.VoidMessage; @NoArgsConstructor diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/AeronUdpTransport.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/AeronUdpTransport.java index 70228b987..ed993af6e 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/AeronUdpTransport.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/AeronUdpTransport.java @@ -31,8 +31,8 @@ import lombok.val; import org.agrona.DirectBuffer; import org.agrona.concurrent.SleepingIdleStrategy; import org.nd4j.aeron.ipc.AeronUtil; -import org.nd4j.base.Preconditions; -import org.nd4j.config.ND4JSystemProperties; +import org.nd4j.common.base.Preconditions; +import org.nd4j.common.config.ND4JSystemProperties; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.util.HashUtil; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/BaseTransport.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/BaseTransport.java index 34bceb6c2..e85196b03 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/BaseTransport.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/BaseTransport.java @@ -21,12 +21,11 @@ import io.reactivex.functions.Consumer; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Atomic; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.primitives.Optional; +import org.nd4j.common.primitives.Atomic; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.primitives.Optional; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.v2.enums.MeshBuildMode; import org.nd4j.parameterserver.distributed.v2.chunks.VoidChunk; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/DelayedDummyTransport.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/DelayedDummyTransport.java index abb51cd4d..5156a5d44 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/DelayedDummyTransport.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/DelayedDummyTransport.java @@ -20,7 +20,7 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.commons.lang3.RandomUtils; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.v2.messages.VoidMessage; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/EnvironmentVarPortSupplier.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/EnvironmentVarPortSupplier.java index fd924523c..4f56310e6 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/EnvironmentVarPortSupplier.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/EnvironmentVarPortSupplier.java @@ -17,7 +17,7 @@ package org.nd4j.parameterserver.distributed.v2.transport.impl; import lombok.*; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.parameterserver.distributed.v2.transport.PortSupplier; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/StaticPortSupplier.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/StaticPortSupplier.java index 9c0658371..53465dc91 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/StaticPortSupplier.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/transport/impl/StaticPortSupplier.java @@ -17,7 +17,7 @@ package org.nd4j.parameterserver.distributed.v2.transport.impl; import lombok.*; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.parameterserver.distributed.v2.transport.PortSupplier; /** diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/util/MeshOrganizer.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/util/MeshOrganizer.java index 38b479a3a..79326b51d 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/util/MeshOrganizer.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/util/MeshOrganizer.java @@ -18,8 +18,8 @@ package org.nd4j.parameterserver.distributed.v2.util; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.nd4j.linalg.primitives.Atomic; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.primitives.Atomic; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.v2.enums.MeshBuildMode; import org.nd4j.parameterserver.distributed.enums.NodeStatus; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/util/MessageSplitter.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/util/MessageSplitter.java index 6de35de33..fb8fe3754 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/util/MessageSplitter.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/distributed/v2/util/MessageSplitter.java @@ -19,15 +19,15 @@ package org.nd4j.parameterserver.distributed.v2.util; import lombok.NonNull; import lombok.val; import org.nd4j.linalg.exception.ND4JIllegalStateException; -import org.nd4j.linalg.primitives.AtomicBoolean; -import org.nd4j.linalg.util.ND4JFileUtils; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.primitives.AtomicBoolean; +import org.nd4j.common.util.ND4JFileUtils; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.v2.chunks.ChunksTracker; import org.nd4j.parameterserver.distributed.v2.chunks.impl.FileChunksTracker; import org.nd4j.parameterserver.distributed.v2.chunks.VoidChunk; import org.nd4j.parameterserver.distributed.v2.chunks.impl.InmemoryChunksTracker; import org.nd4j.parameterserver.distributed.v2.messages.VoidMessage; -import org.nd4j.linalg.primitives.Optional; +import org.nd4j.common.primitives.Optional; import java.io.*; import java.util.ArrayList; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/VoidParameterServerStressTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/VoidParameterServerStressTest.java index b1d159c1d..bfd603636 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/VoidParameterServerStressTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/VoidParameterServerStressTest.java @@ -22,11 +22,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.rng.Random; -import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.ops.transforms.Transforms; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.enums.NodeRole; import org.nd4j.parameterserver.distributed.logic.sequence.BasicSequenceProvider; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/VoidParameterServerTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/VoidParameterServerTest.java index 57c79e3ba..c0d1c563a 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/VoidParameterServerTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/VoidParameterServerTest.java @@ -21,7 +21,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/conf/VoidConfigurationTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/conf/VoidConfigurationTest.java index 0cb4b254a..3156d5da7 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/conf/VoidConfigurationTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/conf/VoidConfigurationTest.java @@ -16,11 +16,10 @@ package org.nd4j.parameterserver.distributed.conf; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.exception.ND4JIllegalStateException; import static org.junit.Assert.*; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/ClipboardTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/ClipboardTest.java index 26b9da8eb..586aed753 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/ClipboardTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/ClipboardTest.java @@ -17,21 +17,16 @@ package org.nd4j.parameterserver.distributed.logic; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.RandomUtils; import org.junit.*; import org.junit.rules.Timeout; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.api.ndarray.INDArray; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; import org.nd4j.parameterserver.distributed.logic.completion.Clipboard; import org.nd4j.parameterserver.distributed.messages.aggregations.InitializationAggregation; import org.nd4j.parameterserver.distributed.messages.aggregations.VectorAggregation; import org.nd4j.parameterserver.distributed.messages.VoidAggregation; import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; import static org.junit.Assert.*; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/FrameCompletionHandlerTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/FrameCompletionHandlerTest.java index 5c9694995..198672ada 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/FrameCompletionHandlerTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/FrameCompletionHandlerTest.java @@ -21,7 +21,7 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.parameterserver.distributed.logic.completion.FrameCompletionHandler; import static org.junit.Assert.*; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/routing/InterleavedRouterTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/routing/InterleavedRouterTest.java index 607ee96e9..cf52d165e 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/routing/InterleavedRouterTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/logic/routing/InterleavedRouterTest.java @@ -21,8 +21,7 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.io.StringUtils; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.util.HashUtil; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.messages.VoidMessage; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/FrameTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/FrameTest.java index 0e46bb179..57031559f 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/FrameTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/FrameTest.java @@ -20,7 +20,7 @@ import org.agrona.concurrent.UnsafeBuffer; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.enums.NodeRole; import org.nd4j.parameterserver.distributed.logic.completion.Clipboard; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/VoidMessageTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/VoidMessageTest.java index d23ecd047..94f1a6e44 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/VoidMessageTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/VoidMessageTest.java @@ -20,7 +20,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.parameterserver.distributed.messages.requests.SkipGramRequestMessage; import static org.junit.Assert.*; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/aggregations/VoidAggregationTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/aggregations/VoidAggregationTest.java index 698ab6dc1..c8484a0da 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/aggregations/VoidAggregationTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/messages/aggregations/VoidAggregationTest.java @@ -19,7 +19,7 @@ package org.nd4j.parameterserver.distributed.messages.aggregations; import lombok.extern.slf4j.Slf4j; import org.junit.*; import org.junit.rules.Timeout; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/transport/RoutedTransportTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/transport/RoutedTransportTest.java index 661c74196..cd7cb919a 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/transport/RoutedTransportTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/transport/RoutedTransportTest.java @@ -20,7 +20,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.enums.NodeRole; import org.nd4j.parameterserver.distributed.logic.ClientRouter; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/util/NetworkOrganizerTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/util/NetworkOrganizerTest.java index c7ace4db5..d21564bef 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/util/NetworkOrganizerTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/util/NetworkOrganizerTest.java @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomUtils; import org.junit.*; import org.junit.rules.Timeout; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import java.util.*; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/DelayedModelParameterServerTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/DelayedModelParameterServerTest.java index 20831d47c..2f53e1eba 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/DelayedModelParameterServerTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/DelayedModelParameterServerTest.java @@ -23,10 +23,10 @@ import org.apache.commons.lang3.RandomUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.AtomicBoolean; +import org.nd4j.common.primitives.AtomicBoolean; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.v2.enums.MeshBuildMode; import org.nd4j.parameterserver.distributed.v2.messages.impl.GradientsUpdateMessage; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/ModelParameterServerTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/ModelParameterServerTest.java index c6be1b9c9..420c50229 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/ModelParameterServerTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/ModelParameterServerTest.java @@ -20,10 +20,10 @@ import io.reactivex.functions.Consumer; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.AtomicBoolean; +import org.nd4j.common.primitives.AtomicBoolean; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; import org.nd4j.parameterserver.distributed.v2.enums.MeshBuildMode; import org.nd4j.parameterserver.distributed.v2.messages.pairs.params.ModelParametersMessage; @@ -31,14 +31,10 @@ import org.nd4j.parameterserver.distributed.v2.messages.pairs.params.ModelParame import org.nd4j.parameterserver.distributed.v2.messages.pairs.params.UpdaterParametersMessage; import org.nd4j.parameterserver.distributed.v2.messages.pairs.params.UpdaterParametersRequest; import org.nd4j.parameterserver.distributed.v2.transport.UpdaterParametersProvider; -import org.nd4j.parameterserver.distributed.v2.transport.UpdatesHandler; -import org.nd4j.parameterserver.distributed.v2.transport.impl.DelayedDummyTransport; import org.nd4j.parameterserver.distributed.v2.transport.impl.DummyTransport; import org.nd4j.parameterserver.distributed.v2.util.AbstractSubscriber; import org.nd4j.parameterserver.distributed.v2.util.AbstractUpdatesHandler; import org.nd4j.parameterserver.distributed.v2.util.MeshOrganizer; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; import java.util.ArrayList; import java.util.concurrent.LinkedTransferQueue; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/FileChunksTrackerTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/FileChunksTrackerTest.java index 0d48d5358..736719c1d 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/FileChunksTrackerTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/FileChunksTrackerTest.java @@ -19,10 +19,9 @@ package org.nd4j.parameterserver.distributed.v2.chunks.impl; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.parameterserver.distributed.v2.chunks.VoidChunk; -import org.nd4j.parameterserver.distributed.v2.chunks.impl.FileChunksTracker; import org.nd4j.parameterserver.distributed.v2.messages.impl.GradientsUpdateMessage; import org.nd4j.parameterserver.distributed.v2.util.MessageSplitter; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/InmemoryChunksTrackerTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/InmemoryChunksTrackerTest.java index 3a2430ed1..28798cd36 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/InmemoryChunksTrackerTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/chunks/impl/InmemoryChunksTrackerTest.java @@ -18,7 +18,7 @@ package org.nd4j.parameterserver.distributed.v2.chunks.impl; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.parameterserver.distributed.v2.chunks.VoidChunk; import org.nd4j.parameterserver.distributed.v2.messages.impl.GradientsUpdateMessage; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/messages/VoidMessageTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/messages/VoidMessageTest.java index 2b08b0c62..5719baabe 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/messages/VoidMessageTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/messages/VoidMessageTest.java @@ -19,8 +19,8 @@ package org.nd4j.parameterserver.distributed.v2.messages; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.v2.messages.pairs.handshake.HandshakeRequest; import static org.junit.Assert.*; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/messages/history/HashHistoryHolderTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/messages/history/HashHistoryHolderTest.java index c6999e469..ee90e7b52 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/messages/history/HashHistoryHolderTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/messages/history/HashHistoryHolderTest.java @@ -19,7 +19,7 @@ package org.nd4j.parameterserver.distributed.v2.messages.history; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import static org.junit.Assert.*; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/transport/impl/AeronUdpTransportTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/transport/impl/AeronUdpTransportTest.java index bd780e0ef..8d417e8c3 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/transport/impl/AeronUdpTransportTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/transport/impl/AeronUdpTransportTest.java @@ -18,11 +18,9 @@ package org.nd4j.parameterserver.distributed.v2.transport.impl; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.parameterserver.distributed.conf.VoidConfiguration; -import org.nd4j.parameterserver.distributed.v2.messages.pairs.ping.PingMessage; import static org.junit.Assert.*; @@ -31,6 +29,11 @@ public class AeronUdpTransportTest extends BaseND4JTest { private static final String IP = "127.0.0.1"; private static final int ROOT_PORT = 40781; + @Override + public long getTimeoutMilliseconds() { + return 240_000L; + } + @Test //@Ignore public void testBasic_Connection_1() throws Exception { diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/transport/impl/DummyTransportTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/transport/impl/DummyTransportTest.java index ba34f974f..bbd5f9074 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/transport/impl/DummyTransportTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/transport/impl/DummyTransportTest.java @@ -19,10 +19,9 @@ package org.nd4j.parameterserver.distributed.v2.transport.impl; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.parameterserver.distributed.v2.enums.PropagationMode; -import org.nd4j.parameterserver.distributed.v2.messages.VoidMessage; import org.nd4j.parameterserver.distributed.v2.messages.impl.GradientsUpdateMessage; import org.nd4j.parameterserver.distributed.v2.messages.pairs.handshake.HandshakeRequest; import org.nd4j.parameterserver.distributed.v2.messages.pairs.handshake.HandshakeResponse; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/util/MeshOrganizerTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/util/MeshOrganizerTest.java index 72487bf2a..0d92d30b5 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/util/MeshOrganizerTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/util/MeshOrganizerTest.java @@ -19,8 +19,8 @@ package org.nd4j.parameterserver.distributed.v2.util; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; -import org.nd4j.linalg.util.SerializationUtils; +import org.nd4j.common.tests.BaseND4JTest; +import org.nd4j.common.util.SerializationUtils; import org.nd4j.parameterserver.distributed.v2.enums.MeshBuildMode; import java.io.ByteArrayInputStream; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/util/MessageSplitterTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/util/MessageSplitterTest.java index 71761291e..3d38c8f46 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/util/MessageSplitterTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/distributed/v2/util/MessageSplitterTest.java @@ -19,10 +19,10 @@ package org.nd4j.parameterserver.distributed.v2.util; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Atomic; -import org.nd4j.linalg.primitives.Optional; +import org.nd4j.common.primitives.Atomic; +import org.nd4j.common.primitives.Optional; import org.nd4j.parameterserver.distributed.v2.messages.impl.GradientsUpdateMessage; import java.util.ArrayList; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/node/ParameterServerNodeTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/node/ParameterServerNodeTest.java index 52e84efd3..089ecbdc7 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/node/ParameterServerNodeTest.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/node/ParameterServerNodeTest.java @@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.AeronUtil; import org.nd4j.aeron.ipc.NDArrayMessage; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-rocksdb-storage/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-rocksdb-storage/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java index 170e1583f..10d4249f0 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-rocksdb-storage/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-rocksdb-storage/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java @@ -17,7 +17,7 @@ package org.nd4j.parameterserver.updater.storage; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.NDArrayMessage; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StatusServerTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StatusServerTests.java index 23ee67d78..ff2f818ec 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StatusServerTests.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StatusServerTests.java @@ -17,7 +17,7 @@ package org.nd4j.parameterserver.status.play; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import play.server.Server; /** diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StorageTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StorageTests.java index 1ad1e478e..0e8184922 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StorageTests.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StorageTests.java @@ -17,7 +17,7 @@ package org.nd4j.parameterserver.status.play; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.parameterserver.model.SubscriberState; import static junit.framework.TestCase.assertEquals; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/pom.xml b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/pom.xml index 4c60d83e2..d96eb02f4 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/pom.xml +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/pom.xml @@ -70,22 +70,67 @@ testresources - + + + + nd4j-testresources + + + + nd4j-tests-cpu + + false + org.nd4j nd4j-native ${project.version} - test - - - org.nd4j - nd4j-native - ${project.version} - ${javacpp.platform} - test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + src/test/java + + *.java + **/*.java + + -Ddtype=float -Xmx8g + + + + + + + + + nd4j-tests-cuda + + false + + + + org.nd4j + nd4j-cuda-10.2 + ${project.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/main/java/org/nd4j/parameterserver/ParameterServerSubscriber.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/main/java/org/nd4j/parameterserver/ParameterServerSubscriber.java index 57b1fb545..2641369de 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/main/java/org/nd4j/parameterserver/ParameterServerSubscriber.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/main/java/org/nd4j/parameterserver/ParameterServerSubscriber.java @@ -40,9 +40,9 @@ import org.nd4j.aeron.ipc.NDArrayCallback; import org.nd4j.aeron.ipc.NDArrayHolder; import org.nd4j.aeron.ipc.response.AeronNDArrayResponder; import org.nd4j.aeron.ndarrayholder.InMemoryNDArrayHolder; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.parameterserver.model.MasterConnectionInfo; import org.nd4j.parameterserver.model.ServerState; import org.nd4j.parameterserver.model.SlaveConnectionInfo; @@ -60,7 +60,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/ParameterServerUpdaterTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/ParameterServerUpdaterTests.java index 58627405b..2049a3a2d 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/ParameterServerUpdaterTests.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/ParameterServerUpdaterTests.java @@ -17,7 +17,7 @@ package org.nd4j.parameterserver.updater; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.NDArrayMessage; import org.nd4j.aeron.ndarrayholder.InMemoryNDArrayHolder; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java index d666f7cb4..f4678b2d7 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java @@ -17,7 +17,7 @@ package org.nd4j.parameterserver.updater.storage; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.NDArrayMessage; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/graph/GraphInferenceGrpcClient.java b/nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/remote/grpc/GraphInferenceGrpcClient.java similarity index 96% rename from nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/graph/GraphInferenceGrpcClient.java rename to nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/remote/grpc/GraphInferenceGrpcClient.java index b1ea7e76d..eb1a3d416 100644 --- a/nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/graph/GraphInferenceGrpcClient.java +++ b/nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/remote/grpc/GraphInferenceGrpcClient.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.graph; +package org.nd4j.remote.grpc; import com.google.flatbuffers.FlatBufferBuilder; import io.grpc.ManagedChannel; @@ -27,11 +27,15 @@ import org.nd4j.autodiff.execution.input.OperandsAdapter; import org.nd4j.autodiff.execution.input.Operands; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.autodiff.samediff.serde.FlatBuffersMapper; -import org.nd4j.graph.grpc.GraphInferenceServerGrpc; +import org.nd4j.graph.FlatDropRequest; +import org.nd4j.graph.FlatInferenceRequest; +import org.nd4j.graph.FlatVariable; +import org.nd4j.graph.IntPair; +import org.nd4j.remote.grpc.grpc.GraphInferenceServerGrpc; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.util.ArrayList; import java.util.concurrent.TimeUnit; diff --git a/nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/graph/grpc/GraphInferenceServerGrpc.java b/nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/remote/grpc/grpc/GraphInferenceServerGrpc.java similarity index 97% rename from nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/graph/grpc/GraphInferenceServerGrpc.java rename to nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/remote/grpc/grpc/GraphInferenceServerGrpc.java index 20cffe496..050477595 100644 --- a/nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/graph/grpc/GraphInferenceServerGrpc.java +++ b/nd4j/nd4j-remote/nd4j-grpc-client/src/main/java/org/nd4j/remote/grpc/grpc/GraphInferenceServerGrpc.java @@ -2,24 +2,17 @@ //If you make any local changes, they will be lost //source: graph.fbs -package org.nd4j.graph.grpc; +package org.nd4j.remote.grpc.grpc; import com.google.flatbuffers.grpc.FlatbuffersUtils; import java.nio.ByteBuffer; import static io.grpc.MethodDescriptor.generateFullMethodName; -import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall; -import static io.grpc.stub.ClientCalls.asyncClientStreamingCall; -import static io.grpc.stub.ClientCalls.asyncServerStreamingCall; import static io.grpc.stub.ClientCalls.asyncUnaryCall; import static io.grpc.stub.ClientCalls.blockingServerStreamingCall; import static io.grpc.stub.ClientCalls.blockingUnaryCall; import static io.grpc.stub.ClientCalls.futureUnaryCall; -import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall; -import static io.grpc.stub.ServerCalls.asyncClientStreamingCall; -import static io.grpc.stub.ServerCalls.asyncServerStreamingCall; import static io.grpc.stub.ServerCalls.asyncUnaryCall; -import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; /** diff --git a/nd4j/nd4j-remote/nd4j-grpc-client/src/test/java/org/nd4j/graph/GraphInferenceGrpcClientTest.java b/nd4j/nd4j-remote/nd4j-grpc-client/src/test/java/org/nd4j/graph/GraphInferenceGrpcClientTest.java index bbd6e8cf7..1bbefd384 100644 --- a/nd4j/nd4j-remote/nd4j-grpc-client/src/test/java/org/nd4j/graph/GraphInferenceGrpcClientTest.java +++ b/nd4j/nd4j-remote/nd4j-grpc-client/src/test/java/org/nd4j/graph/GraphInferenceGrpcClientTest.java @@ -21,13 +21,14 @@ import lombok.val; import org.apache.commons.lang3.RandomUtils; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.autodiff.execution.conf.ExecutorConfiguration; import org.nd4j.autodiff.execution.conf.OutputMode; import org.nd4j.autodiff.execution.input.Operands; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.remote.grpc.GraphInferenceGrpcClient; import static org.junit.Assert.*; diff --git a/nd4j/nd4j-remote/nd4j-json-client/pom.xml b/nd4j/nd4j-remote/nd4j-json-client/pom.xml index d1ceeeda9..e1a661c8b 100644 --- a/nd4j/nd4j-remote/nd4j-json-client/pom.xml +++ b/nd4j/nd4j-remote/nd4j-json-client/pom.xml @@ -49,22 +49,67 @@ testresources - + + + + nd4j-testresources + + + + nd4j-tests-cpu + + false + org.nd4j nd4j-native ${project.version} - test - - - org.nd4j - nd4j-native - ${project.version} - ${javacpp.platform} - test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + src/test/java + + *.java + **/*.java + + -Ddtype=float -Xmx8g + + + + + + + + + nd4j-tests-cuda + + false + + + + org.nd4j + nd4j-cuda-10.2 + ${project.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + diff --git a/nd4j/nd4j-remote/nd4j-json-server/src/main/java/org/nd4j/remote/SameDiffJsonModelServer.java b/nd4j/nd4j-remote/nd4j-json-server/src/main/java/org/nd4j/remote/SameDiffJsonModelServer.java index c15ca5565..828cc5f23 100644 --- a/nd4j/nd4j-remote/nd4j-json-server/src/main/java/org/nd4j/remote/SameDiffJsonModelServer.java +++ b/nd4j/nd4j-remote/nd4j-json-server/src/main/java/org/nd4j/remote/SameDiffJsonModelServer.java @@ -23,7 +23,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.nd4j.adapters.InputAdapter; import org.nd4j.adapters.OutputAdapter; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.MultiDataSet; import org.nd4j.remote.clients.serde.BinaryDeserializer; diff --git a/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/SameDiffJsonModelServerTest.java b/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/SameDiffJsonModelServerTest.java index 1abbff6b3..e810e5e3c 100644 --- a/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/SameDiffJsonModelServerTest.java +++ b/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/SameDiffJsonModelServerTest.java @@ -19,7 +19,7 @@ package org.nd4j.remote; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.remote.clients.JsonRemoteInference; diff --git a/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/SameDiffServletTest.java b/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/SameDiffServletTest.java index 9a7b94272..7d8104013 100644 --- a/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/SameDiffServletTest.java +++ b/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/SameDiffServletTest.java @@ -7,7 +7,7 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.MultiDataSet; diff --git a/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/serde/BasicSerdeTests.java b/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/serde/BasicSerdeTests.java index 8332918b6..2db54054c 100644 --- a/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/serde/BasicSerdeTests.java +++ b/nd4j/nd4j-remote/nd4j-json-server/src/test/java/org/nd4j/remote/serde/BasicSerdeTests.java @@ -2,7 +2,7 @@ package org.nd4j.remote.serde; import lombok.val; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.remote.clients.serde.impl.*; import static org.junit.Assert.assertArrayEquals; diff --git a/nd4j/nd4j-serde/nd4j-aeron/src/main/java/org/nd4j/aeron/ipc/AeronNDArraySerde.java b/nd4j/nd4j-serde/nd4j-aeron/src/main/java/org/nd4j/aeron/ipc/AeronNDArraySerde.java index 7f247e4e1..131fc7b77 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/src/main/java/org/nd4j/aeron/ipc/AeronNDArraySerde.java +++ b/nd4j/nd4j-serde/nd4j-aeron/src/main/java/org/nd4j/aeron/ipc/AeronNDArraySerde.java @@ -18,7 +18,7 @@ package org.nd4j.aeron.ipc; import org.agrona.DirectBuffer; import org.agrona.concurrent.UnsafeBuffer; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.serde.binary.BinarySerde; diff --git a/nd4j/nd4j-serde/nd4j-aeron/src/main/java/org/nd4j/aeron/ipc/NDArrayMessage.java b/nd4j/nd4j-serde/nd4j-aeron/src/main/java/org/nd4j/aeron/ipc/NDArrayMessage.java index 469bf805b..383ccd98d 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/src/main/java/org/nd4j/aeron/ipc/NDArrayMessage.java +++ b/nd4j/nd4j-serde/nd4j-aeron/src/main/java/org/nd4j/aeron/ipc/NDArrayMessage.java @@ -22,7 +22,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.agrona.DirectBuffer; import org.agrona.concurrent.UnsafeBuffer; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.aeron.ipc.chunk.NDArrayMessageChunk; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/AeronNDArraySerdeTest.java b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/AeronNDArraySerdeTest.java index 78145eb8a..31d519b6a 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/AeronNDArraySerdeTest.java +++ b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/AeronNDArraySerdeTest.java @@ -20,7 +20,7 @@ import org.agrona.concurrent.UnsafeBuffer; import org.apache.commons.lang3.time.StopWatch; import org.junit.Ignore; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/LargeNdArrayIpcTest.java b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/LargeNdArrayIpcTest.java index bb572a348..c67c6d9dc 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/LargeNdArrayIpcTest.java +++ b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/LargeNdArrayIpcTest.java @@ -23,7 +23,7 @@ import org.agrona.CloseHelper; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/NDArrayMessageTest.java b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/NDArrayMessageTest.java index be0572c93..c9894f6a6 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/NDArrayMessageTest.java +++ b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/NDArrayMessageTest.java @@ -18,7 +18,7 @@ package org.nd4j.aeron.ipc; import org.agrona.DirectBuffer; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/NdArrayIpcTest.java b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/NdArrayIpcTest.java index ad8b8c16e..c57141630 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/NdArrayIpcTest.java +++ b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/NdArrayIpcTest.java @@ -22,7 +22,7 @@ import org.agrona.CloseHelper; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; import org.slf4j.Logger; diff --git a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/chunk/ChunkAccumulatorTests.java b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/chunk/ChunkAccumulatorTests.java index d856b8f95..26f1f51e5 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/chunk/ChunkAccumulatorTests.java +++ b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/chunk/ChunkAccumulatorTests.java @@ -17,7 +17,7 @@ package org.nd4j.aeron.ipc.chunk; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.NDArrayMessage; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/chunk/NDArrayMessageChunkTests.java b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/chunk/NDArrayMessageChunkTests.java index 314ed0243..f2110c045 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/chunk/NDArrayMessageChunkTests.java +++ b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/chunk/NDArrayMessageChunkTests.java @@ -18,7 +18,7 @@ package org.nd4j.aeron.ipc.chunk; import org.agrona.DirectBuffer; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.NDArrayMessage; import org.nd4j.aeron.util.BufferUtil; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/response/AeronNDArrayResponseTest.java b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/response/AeronNDArrayResponseTest.java index b1df7d193..6a8b84c97 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/response/AeronNDArrayResponseTest.java +++ b/nd4j/nd4j-serde/nd4j-aeron/src/test/java/org/nd4j/aeron/ipc/response/AeronNDArrayResponseTest.java @@ -24,7 +24,7 @@ import org.agrona.CloseHelper; import org.agrona.concurrent.BusySpinIdleStrategy; import org.junit.Before; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.aeron.ipc.*; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-serde/nd4j-arrow/src/main/java/org/nd4j/arrow/ArrowSerde.java b/nd4j/nd4j-serde/nd4j-arrow/src/main/java/org/nd4j/arrow/ArrowSerde.java index 2c05ab918..7d125b0eb 100644 --- a/nd4j/nd4j-serde/nd4j-arrow/src/main/java/org/nd4j/arrow/ArrowSerde.java +++ b/nd4j/nd4j-serde/nd4j-arrow/src/main/java/org/nd4j/arrow/ArrowSerde.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; /** * Conversion to and from arrow {@link Tensor} diff --git a/nd4j/nd4j-serde/nd4j-arrow/src/test/java/org/nd4j/arrow/ArrowSerdeTest.java b/nd4j/nd4j-serde/nd4j-arrow/src/test/java/org/nd4j/arrow/ArrowSerdeTest.java index eee1521bd..2a1d2fb22 100644 --- a/nd4j/nd4j-serde/nd4j-arrow/src/test/java/org/nd4j/arrow/ArrowSerdeTest.java +++ b/nd4j/nd4j-serde/nd4j-arrow/src/test/java/org/nd4j/arrow/ArrowSerdeTest.java @@ -18,7 +18,7 @@ package org.nd4j.arrow; import org.apache.arrow.flatbuf.Tensor; import org.junit.Test; -import org.nd4j.BaseND4JTest; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/Nd4jRegistrator.java b/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/kryo/Nd4jRegistrator.java similarity index 89% rename from nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/Nd4jRegistrator.java rename to nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/kryo/Nd4jRegistrator.java index 32ee0035b..297929947 100644 --- a/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/Nd4jRegistrator.java +++ b/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/kryo/Nd4jRegistrator.java @@ -14,21 +14,21 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j; +package org.nd4j.kryo; import com.esotericsoftware.kryo.Kryo; import de.javakaffee.kryoserializers.SynchronizedCollectionsSerializer; import de.javakaffee.kryoserializers.UnmodifiableCollectionsSerializer; import org.apache.spark.serializer.KryoRegistrator; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.AtomicDouble; -import org.nd4j.primitives.AtomicDoubleSerializer; +import org.nd4j.common.primitives.AtomicDouble; +import org.nd4j.kryo.primitives.AtomicDoubleSerializer; /** * Spark KryoRegistrator for using Nd4j with Spark + Kryo * Use via: * sparkConf.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer"); - * sparkConf.set("spark.kryo.registrator", "org.nd4j.Nd4jRegistrator"); + * sparkConf.set("spark.kryo.registrator", "org.nd4j.kryo.Nd4jRegistrator"); * * @author Alex Black */ diff --git a/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/Nd4jSerializer.java b/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/kryo/Nd4jSerializer.java similarity index 99% rename from nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/Nd4jSerializer.java rename to nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/kryo/Nd4jSerializer.java index e3e2a447b..01698e9f2 100644 --- a/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/Nd4jSerializer.java +++ b/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/kryo/Nd4jSerializer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j; +package org.nd4j.kryo; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; diff --git a/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/primitives/AtomicDoubleSerializer.java b/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/kryo/primitives/AtomicDoubleSerializer.java similarity index 94% rename from nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/primitives/AtomicDoubleSerializer.java rename to nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/kryo/primitives/AtomicDoubleSerializer.java index 93f5e5a7d..15b365a4f 100644 --- a/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/primitives/AtomicDoubleSerializer.java +++ b/nd4j/nd4j-serde/nd4j-kryo/src/main/java/org/nd4j/kryo/primitives/AtomicDoubleSerializer.java @@ -14,13 +14,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.nd4j.primitives; +package org.nd4j.kryo.primitives; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import org.nd4j.linalg.primitives.AtomicDouble; +import org.nd4j.common.primitives.AtomicDouble; /** * Serializer for AtomicDouble (needs a serializer due to long field being transient...) diff --git a/nd4j/nd4j-serde/nd4j-kryo/src/test/java/org/nd4j/TestNd4jKryoSerialization.java b/nd4j/nd4j-serde/nd4j-kryo/src/test/java/org/nd4j/TestNd4jKryoSerialization.java index 44db9d95f..53524d5df 100644 --- a/nd4j/nd4j-serde/nd4j-kryo/src/test/java/org/nd4j/TestNd4jKryoSerialization.java +++ b/nd4j/nd4j-serde/nd4j-kryo/src/test/java/org/nd4j/TestNd4jKryoSerialization.java @@ -26,10 +26,11 @@ import org.apache.spark.serializer.SerializerInstance; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.nd4j.common.primitives.*; +import org.nd4j.common.tests.BaseND4JTest; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.primitives.*; import scala.Tuple2; import java.nio.ByteBuffer; @@ -54,7 +55,7 @@ public class TestNd4jKryoSerialization extends BaseND4JTest { sparkConf.setAppName("Iris"); sparkConf.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer"); - sparkConf.set("spark.kryo.registrator", "org.nd4j.Nd4jRegistrator"); + sparkConf.set("spark.kryo.registrator", "org.nd4j.kryo.Nd4jRegistrator"); sc = new JavaSparkContext(sparkConf); } diff --git a/nd4j/nd4j-tensorflow/src/main/java/org/nd4j/tensorflow/conversion/TensorflowConversion.java b/nd4j/nd4j-tensorflow/src/main/java/org/nd4j/tensorflow/conversion/TensorflowConversion.java index 5204a00c1..ed33a2b8a 100644 --- a/nd4j/nd4j-tensorflow/src/main/java/org/nd4j/tensorflow/conversion/TensorflowConversion.java +++ b/nd4j/nd4j-tensorflow/src/main/java/org/nd4j/tensorflow/conversion/TensorflowConversion.java @@ -26,7 +26,7 @@ import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.compression.CompressedDataBuffer; import org.nd4j.linalg.compression.CompressionDescriptor; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.util.ArrayUtil; +import org.nd4j.common.util.ArrayUtil; import org.nd4j.tensorflow.conversion.graphrunner.SavedModelConfig; import org.tensorflow.framework.MetaGraphDef; import org.tensorflow.framework.SignatureDef; diff --git a/nd4j/nd4j-tensorflow/src/main/java/org/nd4j/tensorflow/conversion/graphrunner/GraphRunner.java b/nd4j/nd4j-tensorflow/src/main/java/org/nd4j/tensorflow/conversion/graphrunner/GraphRunner.java index f3cc72135..bfbdbd62d 100644 --- a/nd4j/nd4j-tensorflow/src/main/java/org/nd4j/tensorflow/conversion/graphrunner/GraphRunner.java +++ b/nd4j/nd4j-tensorflow/src/main/java/org/nd4j/tensorflow/conversion/graphrunner/GraphRunner.java @@ -18,11 +18,10 @@ package org.nd4j.tensorflow.conversion.graphrunner; import lombok.*; import org.apache.commons.io.FileUtils; -import org.nd4j.base.Preconditions; -import org.nd4j.linalg.api.buffer.DataType; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.factory.Nd4j; -import org.nd4j.linalg.io.ClassPathResource; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.io.ClassPathResource; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.protobuf.ByteString; import org.nd4j.shade.protobuf.InvalidProtocolBufferException; import org.nd4j.shade.protobuf.util.JsonFormat; diff --git a/nd4s/src/main/scala/org/nd4s/Implicits.scala b/nd4s/src/main/scala/org/nd4s/Implicits.scala index 35df5a0cb..e9c99f8c8 100644 --- a/nd4s/src/main/scala/org/nd4s/Implicits.scala +++ b/nd4s/src/main/scala/org/nd4s/Implicits.scala @@ -15,6 +15,7 @@ ******************************************************************************/ package org.nd4s +import org.nd4j.common.primitives.{ Pair, Triple } import org.nd4j.linalg.api.buffer.DataType import org.nd4j.linalg.api.ndarray.INDArray import org.nd4j.linalg.factory.Nd4j @@ -350,22 +351,22 @@ object Implicits { lazy val i = new ImaginaryNumber[Integer](1) - implicit class Pair2Tuple[T, U](a: org.nd4j.linalg.primitives.Pair[T, U]) { + implicit class Pair2Tuple[T, U](a: Pair[T, U]) { def asScala: (T, U) = (a.getFirst, a.getSecond) } - implicit class Triple2Tuple[T, U, V](a: org.nd4j.linalg.primitives.Triple[T, U, V]) { + implicit class Triple2Tuple[T, U, V](a: Triple[T, U, V]) { def asScala: (T, U, V) = (a.getFirst, a.getSecond, a.getThird) } implicit class Tuple2Pair[T, U](a: (T, U)) { - def toPair: org.nd4j.linalg.primitives.Pair[T, U] = - new org.nd4j.linalg.primitives.Pair(a._1, a._2) + def toPair: Pair[T, U] = + new Pair(a._1, a._2) } implicit class Tuple2Triple[T, U, V](a: (T, U, V)) { - def toTriple: org.nd4j.linalg.primitives.Triple[T, U, V] = - new org.nd4j.linalg.primitives.Triple(a._1, a._2, a._3) + def toTriple: Triple[T, U, V] = + new Triple(a._1, a._2, a._3) } } diff --git a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/agent/Agent.java b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/agent/Agent.java index 1b4a2699d..999f12e8c 100644 --- a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/agent/Agent.java +++ b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/agent/Agent.java @@ -10,7 +10,7 @@ import org.deeplearning4j.rl4j.environment.StepResult; import org.deeplearning4j.rl4j.observation.Observation; import org.deeplearning4j.rl4j.observation.transform.TransformProcess; import org.deeplearning4j.rl4j.policy.IPolicy; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.Map; diff --git a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/network/ac/ActorCriticLoss.java b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/network/ac/ActorCriticLoss.java index 239c47c0a..ae4d45fb2 100644 --- a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/network/ac/ActorCriticLoss.java +++ b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/network/ac/ActorCriticLoss.java @@ -23,7 +23,7 @@ import org.nd4j.linalg.lossfunctions.ILossFunction; import org.nd4j.linalg.lossfunctions.LossUtil; import org.nd4j.linalg.lossfunctions.impl.LossMCXENT; import org.nd4j.linalg.ops.transforms.Transforms; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import org.nd4j.shade.jackson.annotation.JsonInclude; /** diff --git a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/TransformProcess.java b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/TransformProcess.java index 53bc01421..7878b0f54 100644 --- a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/TransformProcess.java +++ b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/TransformProcess.java @@ -18,7 +18,7 @@ package org.deeplearning4j.rl4j.observation.transform; import org.apache.commons.lang3.NotImplementedException; import org.deeplearning4j.rl4j.helper.INDArrayHelper; import org.deeplearning4j.rl4j.observation.Observation; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.api.DataSet; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; diff --git a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/filter/UniformSkippingFilter.java b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/filter/UniformSkippingFilter.java index 0b31752d4..dd4d98d15 100644 --- a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/filter/UniformSkippingFilter.java +++ b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/filter/UniformSkippingFilter.java @@ -16,7 +16,7 @@ package org.deeplearning4j.rl4j.observation.transform.filter; import org.deeplearning4j.rl4j.observation.transform.FilterOperation; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import java.util.Map; /** diff --git a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/operation/SimpleNormalizationTransform.java b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/operation/SimpleNormalizationTransform.java index 592a1f86d..34683a39a 100644 --- a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/operation/SimpleNormalizationTransform.java +++ b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/operation/SimpleNormalizationTransform.java @@ -16,7 +16,7 @@ package org.deeplearning4j.rl4j.observation.transform.operation; import org.datavec.api.transform.Operation; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; public class SimpleNormalizationTransform implements Operation { diff --git a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/operation/historymerge/CircularFifoStore.java b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/operation/historymerge/CircularFifoStore.java index 5b00bba3c..de8749fb0 100644 --- a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/operation/historymerge/CircularFifoStore.java +++ b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/observation/transform/operation/historymerge/CircularFifoStore.java @@ -17,7 +17,7 @@ package org.deeplearning4j.rl4j.observation.transform.operation.historymerge; import org.apache.commons.collections4.queue.CircularFifoQueue; import org.deeplearning4j.rl4j.observation.transform.operation.HistoryMergeTransform; -import org.nd4j.base.Preconditions; +import org.nd4j.common.base.Preconditions; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.factory.Nd4j; diff --git a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/util/DataManager.java b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/util/DataManager.java index 0caa29453..61e41c2f6 100644 --- a/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/util/DataManager.java +++ b/rl4j/rl4j-core/src/main/java/org/deeplearning4j/rl4j/util/DataManager.java @@ -30,7 +30,7 @@ import org.deeplearning4j.rl4j.network.ac.IActorCritic; import org.deeplearning4j.rl4j.network.dqn.DQN; import org.deeplearning4j.rl4j.network.dqn.IDQN; import org.deeplearning4j.util.ModelSerializer; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.BufferedOutputStream; import java.io.BufferedReader; diff --git a/rl4j/rl4j-core/src/test/java/org/deeplearning4j/rl4j/support/MockDQN.java b/rl4j/rl4j-core/src/test/java/org/deeplearning4j/rl4j/support/MockDQN.java index 6f20d82ca..1462d2779 100644 --- a/rl4j/rl4j-core/src/test/java/org/deeplearning4j/rl4j/support/MockDQN.java +++ b/rl4j/rl4j-core/src/test/java/org/deeplearning4j/rl4j/support/MockDQN.java @@ -6,7 +6,7 @@ import org.deeplearning4j.rl4j.network.NeuralNet; import org.deeplearning4j.rl4j.network.dqn.IDQN; import org.deeplearning4j.rl4j.observation.Observation; import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.primitives.Pair; +import org.nd4j.common.primitives.Pair; import java.io.IOException; import java.io.OutputStream; diff --git a/scalnet/src/test/scala/org/deeplearning4j/scalnet/examples/dl4j/feedforward/IrisCSVExample.scala b/scalnet/src/test/scala/org/deeplearning4j/scalnet/examples/dl4j/feedforward/IrisCSVExample.scala index 5f6670364..43eb74f88 100644 --- a/scalnet/src/test/scala/org/deeplearning4j/scalnet/examples/dl4j/feedforward/IrisCSVExample.scala +++ b/scalnet/src/test/scala/org/deeplearning4j/scalnet/examples/dl4j/feedforward/IrisCSVExample.scala @@ -26,10 +26,10 @@ import org.deeplearning4j.optimize.listeners.ScoreIterationListener import org.deeplearning4j.scalnet.layers.core.Dense import org.deeplearning4j.scalnet.logging.Logging import org.deeplearning4j.scalnet.models.NeuralNet +import org.nd4j.common.io.ClassPathResource import org.nd4j.linalg.activations.Activation import org.nd4j.linalg.dataset.api.iterator.DataSetIterator import org.nd4j.linalg.dataset.{ DataSet, SplitTestAndTrain } -import org.nd4j.linalg.io.ClassPathResource import org.nd4j.linalg.learning.config.Adam import org.nd4j.linalg.lossfunctions.LossFunctions.LossFunction