Guava Function -> nd4j-common Function (#203)

Signed-off-by: Alex Black <blacka101@gmail.com>
master
Alex Black 2019-08-30 20:39:43 +10:00 committed by GitHub
parent 1003428a18
commit 62e96c9724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 11 deletions

View File

@ -16,7 +16,6 @@
package org.nd4j.linalg.dataset; package org.nd4j.linalg.dataset;
import org.nd4j.shade.guava.base.Function;
import org.nd4j.shade.guava.collect.Lists; import org.nd4j.shade.guava.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nd4j.base.Preconditions; import org.nd4j.base.Preconditions;
@ -26,8 +25,6 @@ import org.nd4j.linalg.dataset.api.MultiDataSet;
import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
import org.nd4j.linalg.dataset.api.preprocessor.NormalizerStandardize; import org.nd4j.linalg.dataset.api.preprocessor.NormalizerStandardize;
import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4j;
import org.nd4j.linalg.indexing.BooleanIndexing;
import org.nd4j.linalg.indexing.conditions.Condition;
import org.nd4j.linalg.primitives.Pair; import org.nd4j.linalg.primitives.Pair;
import org.nd4j.linalg.util.ArrayUtil; import org.nd4j.linalg.util.ArrayUtil;
import org.nd4j.linalg.util.FeatureUtil; import org.nd4j.linalg.util.FeatureUtil;

View File

@ -16,12 +16,10 @@
package org.nd4j.linalg.dataset.api; package org.nd4j.linalg.dataset.api;
import org.nd4j.shade.guava.base.Function;
import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ndarray.INDArray;
import org.nd4j.linalg.api.rng.Random; import org.nd4j.linalg.api.rng.Random;
import org.nd4j.linalg.dataset.SplitTestAndTrain; import org.nd4j.linalg.dataset.SplitTestAndTrain;
import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
import org.nd4j.linalg.indexing.conditions.Condition;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;

View File

@ -16,7 +16,7 @@
package org.nd4j.linalg.indexing.conditions; package org.nd4j.linalg.indexing.conditions;
import org.nd4j.shade.guava.base.Function; import org.nd4j.linalg.function.Function;
/** /**
* Condition for boolean indexing * Condition for boolean indexing

View File

@ -16,7 +16,8 @@
package org.nd4j.linalg.indexing.functions; package org.nd4j.linalg.indexing.functions;
import org.nd4j.shade.guava.base.Function;
import org.nd4j.linalg.function.Function;
/** /**
* Created by agibsonccc on 10/8/14. * Created by agibsonccc on 10/8/14.

View File

@ -17,8 +17,8 @@
package org.nd4j.linalg.indexing.functions; package org.nd4j.linalg.indexing.functions;
import org.nd4j.shade.guava.base.Function;
import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.factory.Nd4j;
import org.nd4j.linalg.function.Function;
/** /**
* Returns a stable number based on infinity * Returns a stable number based on infinity

View File

@ -16,8 +16,7 @@
package org.nd4j.linalg.indexing.functions; package org.nd4j.linalg.indexing.functions;
import org.nd4j.linalg.function.Function;
import org.nd4j.shade.guava.base.Function;
/** /**
* Created by agibsonccc on 10/8/14. * Created by agibsonccc on 10/8/14.

View File

@ -16,7 +16,7 @@
package org.nd4j.linalg.indexing.functions; package org.nd4j.linalg.indexing.functions;
import org.nd4j.shade.guava.base.Function; import org.nd4j.linalg.function.Function;
/** /**
* Created by agibsonccc on 10/8/14. * Created by agibsonccc on 10/8/14.