Merge pull request dotnet#26 from interesaaat/LibTorchSharpFirstTest

move mul and pow to scalar. Few other fixes.

Author: interesaaat

Examples/MNIST.cs

@@ -103,7 +103,7 @@ private static void Train(
 
                     if (batchId % _logInterval == 0)
                     {
-                        Console.WriteLine($"\rTrain: epoch {epoch} [{batchId * batchSize} / {size}] Loss: {output.DataItem<float>()}");
+                        Console.WriteLine($"\rTrain: epoch {epoch} [{batchId * batchSize} / {size}] Loss: {output.Item<float>()}");
                     }
 
                     batchId++;
@@ -130,11 +130,11 @@ private static void Test(
                 using (var prediction = model.Forward(data))
                 using (var output = loss(prediction, target))
                 {
-                    testLoss += output.DataItem<float>();
+                    testLoss += output.Item<float>();
 
                     var pred = output.Argmax(1);
 
-                    correct += pred.Eq(target).Sum().DataItem<int>(); // Memory leak here
+                    correct += pred.Eq(target).Sum().Item<int>(); // Memory leak here
 
                     data.Dispose();
                     target.Dispose();

Test/TorchSharp/TorchSharp.cs

@@ -292,7 +292,20 @@ public void ScoreModelCheckOutput()
         }
 
         [TestMethod]
-        public void CreateLinear()
+        public void TestTensorToScalarMultiplication()
+        {
+            using (var tensor = FloatTensor.Ones(new long[] { 2, 2 }))
+            {
+                var neg = tensor * (-1).ToScalar();
+                foreach (var val in neg.Data<float>())
+                {
+                    Assert.AreEqual(val, -1.0);
+                }
+            }
+        }
+
+        [TestMethod]
+        public void TestCreateLinear()
         {
             var lin = NN.Module.Linear(1000, 100);
             Assert.IsNotNull(lin);
@@ -613,7 +626,7 @@ public void TestMul()
         {
             var x = FloatTensor.Ones(new long[] { 100, 100 });
 
-            var y = x.Mul(0.5f);
+            var y = x.Mul(0.5f.ToScalar());
 
             var ydata = y.Data<float>();
             var xdata = x.Data<float>();
@@ -683,7 +696,7 @@ public void TestTraining()
             var x = FloatTensor.RandomN(new long[] { 64, 1000 }, device: "cpu:0");
             var y = FloatTensor.RandomN(new long[] { 64, 10 }, device: "cpu:0");
 
-            float learning_rate = 0.00004f;
+            Scalar learning_rate = 0.00004f.ToScalar();
             float prevLoss = float.MaxValue;
             var loss = NN.LossFunction.MSE(NN.Reduction.Sum);
 

TorchSharp/Tensor/TorchTensor.cs

@@ -540,11 +540,11 @@ public void MulInPlace(TorchTensor target)
         }
 
         [DllImport("libTorchSharp")]
-        extern static IntPtr THSTensor_mulS(IntPtr src, float scalar);
+        extern static IntPtr THSTensor_mulS(IntPtr src, IntPtr scalar);
 
-        public TorchTensor Mul(float scalar)
+        public TorchTensor Mul(Scalar scalar)
         {
-            return new TorchTensor(THSTensor_mulS(handle, scalar));
+            return new TorchTensor(THSTensor_mulS(handle, scalar.Handle));
         }
 
         [DllImport("libTorchSharp")]
@@ -556,11 +556,11 @@ public TorchTensor Norm(int dimension, bool KeepDimension = false)
         }
 
         [DllImport("libTorchSharp")]
-        extern static IntPtr THSTensor_pow(IntPtr src, float scalar);
+        extern static IntPtr THSTensor_pow(IntPtr src, IntPtr scalar);
 
-        public TorchTensor Pow(float scalar)
+        public TorchTensor Pow(Scalar scalar)
         {
-            return new TorchTensor(THSTensor_pow(handle, scalar));
+            return new TorchTensor(THSTensor_pow(handle, scalar.Handle));
         }
 
         [DllImport("libTorchSharp")]
@@ -621,6 +621,11 @@ public TorchTensor Sum(long[] dimensions, bool keepDimension = false)
             return left.Mul(right);
         }
 
+        public static TorchTensor operator *(TorchTensor left, Scalar right)
+        {
+            return left.Mul(right);
+        }
+
         public static TorchTensor operator -(TorchTensor left, TorchTensor right)
         {
             return left.Sub(right);

TorchSharp/Torch.cs

@@ -4,8 +4,6 @@
 
 namespace TorchSharp
 {
-    using Debug = System.Diagnostics.Debug;
-
     public static class Torch
     {
         [DllImport("libTorchSharp")]