NDArray.FromMultiDimArray<T>: Fixed #367

Author: Nucs

src/NumSharp.Core/Casting/NdArrayFromMultiDimArr.cs

@@ -25,38 +25,46 @@ public partial class NDArray
         /// <summary>
         ///     Creates an NDArray out of given array of type <typeparamref name="T"/>
         /// </summary>
-        /// <param name="dotNetArray"></param>
-        public static NDArray FromMultiDimArray<T>(Array dotNetArray)
+        /// <param name="ndarray"></param>
+        public static NDArray FromMultiDimArray<T>(Array ndarray, bool copy = true) where T : unmanaged
         {
-            if (dotNetArray.GetType().GetElementType().IsArray)
-                throw new Exception("Jagged arrays are not allowed here!");
+            if (ndarray.GetType().GetElementType().IsArray)
+                throw new Exception("Given array is a jagged array.");
 
-            switch (dotNetArray.Rank)
+            switch (ndarray.Rank)
             {
                 case 1:
-                    return np.array((T[])dotNetArray);
+                    return np.array((T[])ndarray, copy);
                 case 2:
-                    return np.array((T[,])dotNetArray);
+                    return np.array((T[,])ndarray, copy);
                 case 3:
-                    return np.array((T[,,])dotNetArray);
+                    return np.array((T[,,])ndarray, copy);
                 case 4:
-                    return np.array((T[,,,])dotNetArray);
+                    return np.array((T[,,,])ndarray, copy);
                 case 5:
-                    return np.array((T[,,,,])dotNetArray);
+                    return np.array((T[,,,,])ndarray, copy);
                 case 6:
-                    return np.array((T[,,,,,])dotNetArray);
+                    return np.array((T[,,,,,])ndarray, copy);
                 case 7:
-                    return np.array((T[,,,,,,])dotNetArray);
+                    return np.array((T[,,,,,,])ndarray, copy);
                 case 8:
-                    return np.array((T[,,,,,,,])dotNetArray);
+                    return np.array((T[,,,,,,,])ndarray, copy);
                 case 9:
-                    return np.array((T[,,,,,,,,])dotNetArray);
+                    return np.array((T[,,,,,,,,])ndarray, copy);
                 case 10:
-                    return np.array((T[,,,,,,,,,])dotNetArray);
+                    return np.array((T[,,,,,,,,,])ndarray, copy);
                 case 11:
-                    return np.array((T[,,,,,,,,,,])dotNetArray);
+                    return np.array((T[,,,,,,,,,,])ndarray, copy);
                 case 12:
-                    return np.array((T[,,,,,,,,,,,])dotNetArray);
+                    return np.array((T[,,,,,,,,,,,])ndarray, copy);
+                case 13:
+                    return np.array((T[,,,,,,,,,,,,])ndarray, copy);
+                case 14:
+                    return np.array((T[,,,,,,,,,,,,,])ndarray, copy); 
+                case 15:
+                    return np.array((T[,,,,,,,,,,,,,,])ndarray, copy);
+                case 16:
+                    return np.array((T[,,,,,,,,,,,,,,,])ndarray, copy);
             }
 
             throw new NotImplementedException("FromMultiDimArray<T>(Array dotNetArray)");

src/NumSharp.Core/Creation/np.array.cs

@@ -15,7 +15,6 @@ namespace NumSharp
 {
     public static partial class np
     {
-
         /// <summary>
         ///     Wraps given <paramref name="nd"/> in an alias. If <paramref name="copy"/> is true then returns a clone.
         /// </summary>
@@ -111,7 +110,7 @@ public static NDArray array<T>(IEnumerable<T> data, int size) where T : unmanage
                 using (var enumerator = data.GetEnumerator())
                 {
                     Func<bool> next = enumerator.MoveNext;
-                    
+
                     var addr = slice.Address;
                     for (int i = 0; i < size && next(); i++)
                     {
@@ -348,7 +347,7 @@ public static NDArray array<T>(T[][][][][] data) where T : unmanaged
 #if _REGEN
         %l = "data.GetLength("
         %r = ")"
-        %foreach range(1,15)%
+        %foreach range(1,16)%
 
         /// <summary>
         ///     Creates an <see cref="NDArray"/> from given <paramref name="data"/>.
@@ -655,6 +654,25 @@ public static NDArray array<T>(T[,,,,,,,,,,,,,,] data, bool copy = true) where T
 
             return new NDArray(ArraySlice.FromArray(data, copy), new Shape(data.GetLength(0), data.GetLength(1), data.GetLength(2), data.GetLength(3), data.GetLength(4), data.GetLength(5), data.GetLength(6), data.GetLength(7), data.GetLength(8), data.GetLength(9), data.GetLength(10), data.GetLength(11), data.GetLength(12), data.GetLength(13), data.GetLength(14)));
         }
+
+        /// <summary>
+        ///     Creates an <see cref="NDArray"/> from given <paramref name="data"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of given array, must be compliant to numpy's supported dtypes.</typeparam>
+        /// <param name="data">The array to create <see cref="NDArray"/> from.</param>
+        /// <param name="copy">
+        ///     If true then the array will be copied to a newly allocated memory.<br></br>
+        ///     If false then the array will be pinned by calling <see cref="GCHandle.Alloc(object)"/>.
+        /// </param>
+        /// <returns>An <see cref="NDArray"/> with the data and shape of the given array.</returns>
+        /// <remarks>https://docs.scipy.org/doc/numpy/reference/generated/numpy.array.html</remarks>
+        public static NDArray array<T>(T[,,,,,,,,,,,,,,,] data, bool copy = true) where T : unmanaged
+        {
+            if (data == null)
+                throw new ArgumentNullException(nameof(data));
+
+            return new NDArray(ArraySlice.FromArray(data, copy), new Shape(data.GetLength(0), data.GetLength(1), data.GetLength(2), data.GetLength(3), data.GetLength(4), data.GetLength(5), data.GetLength(6), data.GetLength(7), data.GetLength(8), data.GetLength(9), data.GetLength(10), data.GetLength(11), data.GetLength(12), data.GetLength(13), data.GetLength(14), data.GetLength(15)));
+        }
 #endif
     }
 }