From dfec54242dcffe29e669838da13bc9578756e5de Mon Sep 17 00:00:00 2001
From: Robert Altena <Rob@ra-ai.com>
Date: Fri, 2 Aug 2019 14:13:00 +0900
Subject: [PATCH] createUninitializedDetached refactoring. (#94)

* wip

* update interface, add null implementations.

* Breaking one test in a weird way.

Signed-off-by: Robert Altena <Rob@Ra-ai.com>

* createUninitializedDetached refactored.

Signed-off-by: Robert Altena <Rob@Ra-ai.com>
---
 .../nn/layers/ocnn/OCNNOutputLayer.java       |  2 +-
 .../nd4j/linalg/factory/NDArrayFactory.java   | 15 +++++-----
 .../java/org/nd4j/linalg/factory/Nd4j.java    | 30 +++++++++----------
 .../cpu/nativecpu/CpuNDArrayFactory.java      | 13 ++------
 .../nativecpu/CpuSparseNDArrayFactory.java    |  7 +----
 .../linalg/workspace/BasicWorkspaceTests.java |  2 +-
 6 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/ocnn/OCNNOutputLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/ocnn/OCNNOutputLayer.java
index b8296e43d..04d3345ed 100644
--- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/ocnn/OCNNOutputLayer.java
+++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/ocnn/OCNNOutputLayer.java
@@ -135,7 +135,7 @@ public class OCNNOutputLayer extends BaseOutputLayer<org.deeplearning4j.nn.conf.
         if(conf.getLastEpochSinceRUpdated() == 0 && epochCount == 0) {
             INDArray currentR = doOutput(false,workspaceMgr);
             if(window == null) {
-                window = Nd4j.createUninitializedDetached(conf.getWindowSize()).assign(0.0);
+                window = Nd4j.createUninitializedDetached(preOut.dataType(), conf.getWindowSize()).assign(0.0);
             }
 
             if(batchWindowSizeIndex < window.length() - currentR.length()) {
diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/NDArrayFactory.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/NDArrayFactory.java
index 2bb1890a9..f71bc855f 100644
--- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/NDArrayFactory.java
+++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/factory/NDArrayFactory.java
@@ -1094,16 +1094,15 @@ public interface NDArrayFactory {
     INDArray createUninitialized(long[] shape, char ordering);
 
     INDArray createUninitialized(DataType dataType, long[] shape, char ordering, MemoryWorkspace workspace);
-
+    
     /**
-     * Cretes uninitialized INDArray detached from any (if any) workspace
-     * @param shape
-     * @param ordering
-     * @return
+     * Create an uninitialized ndArray. Detached from workspace.
+     * @param dataType data type. Exceptions will be thrown for UTF8, COMPRESSED and UNKNOWN data types.
+     * @param ordering  Fortran 'f' or C/C++ 'c' ordering.
+     * @param shape the shape of the array.
+     * @return the created detached array.
      */
-    INDArray createUninitializedDetached(int[] shape, char ordering);
-
-    INDArray createUninitializedDetached(long[] shape, char ordering);
+    INDArray createUninitializedDetached(DataType dataType, char ordering, long... shape);
 
     /**
      *
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 c54f515eb..5c8275ef3 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
@@ -4907,17 +4907,6 @@ public class Nd4j {
         return INSTANCE.createUninitialized(shape, ordering);
     }
 
-    /**
-     * See {@link #createUninitialized(long[], char)}
-     */
-    public static INDArray createUninitializedDetached(int[] shape, char ordering) {
-        if (shape.length == 0)
-            return scalar(dataType(), 0.0);
-
-        checkShapeValues(shape);
-        return INSTANCE.createUninitializedDetached(shape, ordering);
-    }
-
     /**
      * See {@link #createUninitialized(long[])}
      */
@@ -4963,13 +4952,24 @@ public class Nd4j {
     }
 
     /**
-     * See {@link #createUninitialized(long)}
+     * Create an uninitialized ndArray. Detached from workspace.
+     * @param dataType data type. Exceptions will be thrown for UTF8, COMPRESSED and UNKNOWN data types.
+     * @param ordering  Fortran 'f' or C/C++ 'c' ordering.
+     * @param shape the shape of the array.
+     * @return the created detached array.
      */
-    public static INDArray createUninitializedDetached(int length) {
-        long[] shape = new long[] {length};
-        return INSTANCE.createUninitializedDetached(shape, order());
+    public static INDArray createUninitializedDetached(DataType dataType, char ordering, long... shape){
+        return INSTANCE.createUninitializedDetached(dataType, ordering, shape);
     }
 
+    /**
+     * See {@link #createUninitializedDetached(DataType, char, long...)} with default ordering.
+     */
+    public static INDArray createUninitializedDetached(DataType dataType, long... shape){
+        return createUninitializedDetached(dataType, order(), shape);
+    }
+
+
     ////////////////////// OTHER ///////////////////////////////
 
     /**
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 0a7987492..28c0b12b3 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
@@ -199,19 +199,10 @@ public class CpuNDArrayFactory extends BaseNativeNDArrayFactory {
     }
 
     @Override
-    public INDArray createUninitializedDetached(int[] shape, char ordering) {
+    public INDArray createUninitializedDetached(DataType dataType, char ordering, long... shape){
         MemoryWorkspace workspace = Nd4j.getMemoryManager().getCurrentWorkspace();
         Nd4j.getMemoryManager().setCurrentWorkspace(null);
-        INDArray ret = new NDArray(shape, Nd4j.getStrides(shape, ordering), 0, ordering, false);
-        Nd4j.getMemoryManager().setCurrentWorkspace(workspace);
-        return ret;
-    }
-
-    @Override
-    public INDArray createUninitializedDetached(long[] shape, char ordering) {
-        MemoryWorkspace workspace = Nd4j.getMemoryManager().getCurrentWorkspace();
-        Nd4j.getMemoryManager().setCurrentWorkspace(null);
-        INDArray ret = new NDArray(shape, Nd4j.getStrides(shape, ordering), 0, ordering, false);
+        INDArray ret = new NDArray(dataType, shape, Nd4j.getStrides(shape, ordering), 0, ordering, false);
         Nd4j.getMemoryManager().setCurrentWorkspace(workspace);
         return ret;
     }
diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuSparseNDArrayFactory.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuSparseNDArrayFactory.java
index 3c8a843cf..c95e76c54 100644
--- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuSparseNDArrayFactory.java
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuSparseNDArrayFactory.java
@@ -222,7 +222,7 @@ public class CpuSparseNDArrayFactory extends BaseSparseNDArrayFactory {
     }
 
     @Override
-    public INDArray createUninitializedDetached(long[] shape, char ordering) {
+    public INDArray createUninitializedDetached(DataType dataType, char ordering, long... shape){
         return null;
     }
 
@@ -427,11 +427,6 @@ public class CpuSparseNDArrayFactory extends BaseSparseNDArrayFactory {
         return null;
     }
 
-    @Override
-    public INDArray createUninitializedDetached(int[] shape, char ordering) {
-        return null;
-    }
-
     @Override
     public INDArray create(DataBuffer data, int[] newShape, int[] newStride, long offset, char ordering) {
         return null;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/BasicWorkspaceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/BasicWorkspaceTests.java
index ff26d7b1b..fee72b2d3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/BasicWorkspaceTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/BasicWorkspaceTests.java
@@ -312,7 +312,7 @@ public class BasicWorkspaceTests extends BaseNd4jTest {
 
             INDArray array1 = Nd4j.create(new double[] {1f, 2f, 3f, 4f, 5f});
 
-            INDArray array2 = Nd4j.createUninitializedDetached(5);
+            INDArray array2 = Nd4j.createUninitializedDetached(DOUBLE, 5);
 
             array2.assign(array1);