From 62e96c97246622fb28a8f828261aeee578acfc35 Mon Sep 17 00:00:00 2001 From: Alex Black Date: Fri, 30 Aug 2019 20:39:43 +1000 Subject: [PATCH] Guava Function -> nd4j-common Function (#203) Signed-off-by: Alex Black --- .../src/main/java/org/nd4j/linalg/dataset/DataSet.java | 3 --- .../src/main/java/org/nd4j/linalg/dataset/api/DataSet.java | 2 -- .../java/org/nd4j/linalg/indexing/conditions/Condition.java | 2 +- .../main/java/org/nd4j/linalg/indexing/functions/Identity.java | 3 ++- .../java/org/nd4j/linalg/indexing/functions/StableNumber.java | 2 +- .../main/java/org/nd4j/linalg/indexing/functions/Value.java | 3 +-- .../src/main/java/org/nd4j/linalg/indexing/functions/Zero.java | 2 +- 7 files changed, 6 insertions(+), 11 deletions(-) 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 7b208f4f2..cb354c2d1 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 @@ -16,7 +16,6 @@ package org.nd4j.linalg.dataset; -import org.nd4j.shade.guava.base.Function; import org.nd4j.shade.guava.collect.Lists; import lombok.extern.slf4j.Slf4j; 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.preprocessor.NormalizerStandardize; 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.util.ArrayUtil; import org.nd4j.linalg.util.FeatureUtil; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/DataSet.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/DataSet.java index 7358da385..5f6731c26 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/DataSet.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/dataset/api/DataSet.java @@ -16,12 +16,10 @@ 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.rng.Random; import org.nd4j.linalg.dataset.SplitTestAndTrain; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; -import org.nd4j.linalg.indexing.conditions.Condition; import java.io.File; import java.io.InputStream; 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 3b4245fef..6c7093cab 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.shade.guava.base.Function; +import org.nd4j.linalg.function.Function; /** * Condition for boolean indexing 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 0413e2505..6c19cef2d 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 @@ -16,7 +16,8 @@ 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. 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 e044dcda8..483542a9a 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 @@ -17,8 +17,8 @@ package org.nd4j.linalg.indexing.functions; -import org.nd4j.shade.guava.base.Function; import org.nd4j.linalg.factory.Nd4j; +import org.nd4j.linalg.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 8a6a6436f..5562bbb35 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,8 +16,7 @@ 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. 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 9bcb3c463..b8b53c2d1 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.shade.guava.base.Function; +import org.nd4j.linalg.function.Function; /** * Created by agibsonccc on 10/8/14.