Merge pull request #8899 from KonduitAI/master

Latest development updates

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;

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. <br>

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;
 

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

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.

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;
 

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 <i>mutation rate</i> probability.

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.*;
 

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.*;
 
 /**

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;
 

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;

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;

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;

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.*;
 

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;
 

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;
 

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;

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.*;
 

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.*;

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

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

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.core.storage.Persistable;
-import org.deeplearning4j.api.storage.StatsStorageRouter;
+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;

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.core.storage.Persistable;
-import org.deeplearning4j.api.storage.StatsStorage;
+import org.deeplearning4j.core.storage.StatsStorage;
-import org.deeplearning4j.api.storage.StatsStorageEvent;
+import org.deeplearning4j.core.storage.StatsStorageEvent;
-import org.deeplearning4j.api.storage.StatsStorageListener;
+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
  *

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.*;

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;

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.common.function.Function;
-import org.nd4j.linalg.function.Function;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;

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.common.base.Preconditions;
-import org.nd4j.linalg.primitives.Triple;
+import org.nd4j.common.primitives.Triple;
 
 import java.io.*;
 import java.net.URI;

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;

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;

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;

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;

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.common.loader.FileBatch;
-import org.nd4j.base.Preconditions;
+import org.nd4j.common.base.Preconditions;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;

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.common.loader.FileBatch;
-import org.nd4j.base.Preconditions;
+import org.nd4j.common.base.Preconditions;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;

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;
 

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.common.base.Preconditions;
-import org.nd4j.linalg.collection.CompactHeapStringList;
+import org.nd4j.common.collection.CompactHeapStringList;
-import org.nd4j.linalg.util.MathUtils;
+import org.nd4j.common.util.MathUtils;
 
 import java.io.*;
 import java.net.URI;

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.common.function.Function;
-import org.nd4j.linalg.util.MathUtils;
+import org.nd4j.common.util.MathUtils;
 
 import java.io.InputStream;
 import java.io.OutputStream;

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;

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.common.base.Preconditions;
-import org.nd4j.linalg.function.Function;
+import org.nd4j.common.function.Function;
 
 import java.io.*;
 import java.net.URI;

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

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;

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;

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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.common.function.Consumer;
-import org.nd4j.linalg.function.Supplier;
+import org.nd4j.common.function.Supplier;
 
 import java.io.Serializable;
 

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;

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;
 

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;
 

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) {

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;

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;

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.common.tests.AbstractAssertTestsClass;
-import org.nd4j.BaseND4JTest;
+import org.nd4j.common.tests.BaseND4JTest;
 
 import java.util.*;
 

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;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.api.ops.impl.controlflow.compat.BaseCompatOp;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 
 import java.util.ArrayList;
 import java.util.List;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 
 import java.io.File;
 import java.io.IOException;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+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, ",");

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 
 import java.util.LinkedList;
 import java.util.List;

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.common.tests.BaseND4JTest;
-import org.nd4j.api.loader.FileBatch;
+import org.nd4j.common.loader.FileBatch;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 
 import java.net.URI;
 import java.util.ArrayList;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 import org.nd4j.shade.jackson.core.JsonFactory;
 import org.nd4j.shade.jackson.databind.ObjectMapper;
 

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+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;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 
 import java.io.IOException;
 import java.util.*;

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.nd4j.common.tests.BaseND4JTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileInputStream;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 
 import java.io.File;
 import java.util.ArrayList;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 
 import java.io.IOException;
 import java.util.*;

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;

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 
 import static org.junit.Assert.assertEquals;
 

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 import org.nd4j.shade.jackson.core.JsonFactory;
 import org.nd4j.shade.jackson.databind.ObjectMapper;
 

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.io.ClassPathResource;
+import org.nd4j.common.io.ClassPathResource;
 
 import java.util.ArrayList;
 import java.util.Arrays;

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;

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;

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;

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;

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;
 

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.common.tests.BaseND4JTest;
-import org.nd4j.linalg.function.Function;
+import org.nd4j.common.function.Function;
 
 import java.io.File;
 import java.io.FileInputStream;

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;

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;

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.*;
 

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.*;
 

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;

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;

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.*;

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;

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;

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.*;
 

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;

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;
 

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;
 

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;