fix(csharp/Tensor.NET): fix bugs of mean, slice, tensorlayout.

Author: SanftMonster

csharp/Tensor.NET/Statistics/Mean.cs

@@ -48,19 +48,19 @@ private unsafe static void MeanInternal<T>(Tensor<T> src, Tensor<double> dst, bo
             }
         }
         private static TensorLayout DeduceLayout(TensorLayout src, int[] axes){
-            var res = new TensorLayout(src.Shape, DType.Float64);
+            var res = new TensorLayout(src as TensorShape, DType.Float64);
             foreach(var dim in axes){
                 res.Shape[dim] = 1;
             }
             return res;
         }
         private static TensorLayout DeduceLayout(TensorLayout src, int axis){
-            var res = new TensorLayout(src.Shape, DType.Float64);
+            var res = new TensorLayout(src as TensorShape, DType.Float64);
             res.Shape[axis] = 1;
             return res;
         }
         private static TensorLayout DeduceLayout(TensorLayout src){
-            var res = new TensorLayout(src.Shape, DType.Float64);
+            var res = new TensorLayout(src as TensorShape, DType.Float64);
             res.Shape.AsSpan().Fill(1);
             return res;
         }

csharp/Tensor.NET/Tensor.NET.csproj

@@ -6,27 +6,22 @@
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageId>Tensor.NET</PackageId>
-    <Version>0.0.8</Version>
+    <Version>0.1.0</Version>
     <Authors>AsakusaRinne</Authors>
     <Company>Null</Company>
     <Description>
-      This is a test version, please do not download and use.
+      A lightweight and high-performance tensor library which provides numpy-like operations but .NET style interfaces. It supports generic tensor, Linq, C# native slices and so on. It is young so that it may may lack some features or have some BUGs. Please tell us on github or via email, thank you!
+
+      Github repository: https://github.com/AsakusaRinne/Tensor.NET
+
+      Email: AsakusaRinne@gmail.com
     </Description>
+    <PackageLicenseExpression>Apache2.0</PackageLicenseExpression>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
-        <!-- <Content Include="./CppLibrary/libnumnet.dll">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-            <Pack>true</Pack>
-            <PackagePath>lib\$(TargetFramework)</PackagePath>
-        </Content>
-        <Content Include="./CppLibrary/libnumnet_core_base.dll">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-            <Pack>true</Pack>
-            <PackagePath>lib\$(TargetFramework)</PackagePath>
-        </Content>
-        <Content Include="./CppLibrary/libnumnet_core_op.dll">
+        <Content Include="./CppLibrary/libnumnet.dll">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
             <Pack>true</Pack>
             <PackagePath>lib\$(TargetFramework)</PackagePath>
@@ -40,7 +35,7 @@
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
             <Pack>true</Pack>
             <PackagePath>lib\$(TargetFramework)</PackagePath>
-        </Content> -->
+        </Content>
         <Content Include="libnumnet.so">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
             <PackageCopyToOutput>true</PackageCopyToOutput>

csharp/Tensor.NET/Tensor/Common/OnElemOperation.cs

@@ -1,6 +1,6 @@
 
 namespace Tensornet.Common{
-    public static class OnElemOperation{
+    internal static class OnElemOperation{
         public static Tensor<TResult> Execute<TInput, TResult>(Tensor<TInput> inp, Func<TInput, TResult> operation) 
             where TInput : struct, IEquatable<TInput>, IConvertible 
             where TResult : struct, IEquatable<TResult>, IConvertible{

csharp/Tensor.NET/Tensor/Common/Slice.cs

@@ -2,9 +2,9 @@
 
 namespace Tensornet{
     public struct Slice{
-        public int Begin{ get; set; }
-        public int End{ get; set; }
-        public int Step{ get; set; }
+        public int Begin{ get; internal set; }
+        public int End{ get; internal set; }
+        public int Step{ get; internal set; }
         public Slice(int dim){
             Begin = dim;
             End = dim;
@@ -16,8 +16,17 @@ public Slice(int begin, int end, int step = 1){
             Step = step;
         }
         public Slice(Range range){
-            Begin = range.Start.IsFromEnd ? -range.Start.Value : range.Start.Value;
+            Begin = range.Start.IsFromEnd? -range.Start.Value : range.Start.Value;
             End = range.End.IsFromEnd ? -range.End.Value : range.End.Value;
+            if(Begin == 0 && range.Start.IsFromEnd){
+                Step = 1;
+                return;
+            }
+            if(End == 0 && range.End.IsFromEnd){
+                End = Begin - 1;
+                Step = -1;
+                return;
+            }
             Step = 1;
         }
         public Slice(Index index){
@@ -46,6 +55,10 @@ internal TensorLayout ApplySlice(Slice s, int axis){
             if(axis >= res.NDim){
                 throw new InvalidArgumentException($"Axis to slice exceeds the limit. The axis is {axis}, the limit is {res.NDim - 1}.");
             }
+            if(s.End + 1 == s.Begin && s.Step == -1){
+                s.End = Shape[axis];
+                s.Step = 1;
+            }
             int axisDim = res.Shape[axis];
             int begin = s.Begin;
             int end = s.End;

csharp/Tensor.NET/Tensor/Tensor.cs

@@ -40,7 +40,7 @@ internal Tensor(T value){
         internal int IndicesToPosition(params int[] indices){
             if(indices.Length != TLayout.NDim){
                 throw new InvalidArgumentException($"Index does not have same dims with tensor, " + 
-                    "the index is {indices.Length} dims but the tensor is {TLayout.NDim}.");
+                    $"the index is {indices.Length} dims but the tensor is {TLayout.NDim}.");
             }
             int res = 0;
             for (int i = 0; i < TLayout.NDim; i++) {
@@ -65,7 +65,7 @@ public T this[params int[] indices]{
         }
 
         public Tensor<T> ToContiguousTensor(){
-            Tensor<T> res = new Tensor<T>(new TensorLayout(TLayout.Shape, TLayout.DType));
+            Tensor<T> res = new Tensor<T>(new TensorLayout(TLayout as TensorShape, TLayout.DType));
             this.CopyTo(res);
             return res;
         }