Merge pull request #919 from NiklasGustafsson/x64

Detect 32-bit process and throw an exception.

RELEASENOTES.md

@@ -10,6 +10,7 @@ Fixing misspelling of 'DetachFromDisposeScope,' deprecating the old spelling.<br
 Adding allow_tf32<br/>
 Adding overloads of Module.save() and Module.load() taking a 'Stream' argument.<br/>
 Adding torch.softmax() and Tensor.softmax() as aliases for torch.special.softmax()<br/>
+Adding torch.from_file()<br/>
 
 __Fixed Bugs__:
 

src/Native/LibTorchSharp/THSTensor.h

@@ -1010,6 +1010,8 @@ EXPORT_API(Tensor) THSTensor_randperm(const Generator gen, const int64_t n, cons
 
 EXPORT_API(Tensor) THSTensor_randperm_out(const Generator gen, const int64_t n, const Tensor out);
 
+EXPORT_API(Tensor) THSTensor_from_file(const char* filename, const int8_t shared, const int64_t size, const int8_t scalar_type, const int device_type, const int device_index, const bool requires_grad);
+
 EXPORT_API(Tensor) THSTensor_ravel(const Tensor tensor);
 
 EXPORT_API(Tensor) THSTensor_real(const Tensor tensor);

src/Native/LibTorchSharp/THSTensorFactories.cpp

@@ -152,6 +152,19 @@ Tensor THSTensor_logspace(const double start, const double end, const int64_t st
     CATCH_TENSOR(torch::logspace(start, end, steps, base, options));
 }
 
+
+Tensor THSTensor_from_file(const char* filename, const int8_t shared, const int64_t size, const int8_t scalar_type, const int device_type, const int device_index, const bool requires_grad)
+{
+    auto options = at::TensorOptions()
+        .dtype(at::ScalarType(scalar_type))
+        .device(c10::Device((c10::DeviceType)device_type, (c10::DeviceIndex)device_index))
+        .requires_grad(requires_grad);
+
+    c10::optional<bool> sh = shared == -1 ? c10::optional<bool>() : (shared == 1);
+    c10::optional<int64_t> sz = size == -1 ? c10::optional<int64_t>() : size;
+    CATCH_TENSOR(torch::from_file(filename, sh, sz, options));
+}
+
 Tensor THSTensor_new(
     void* data,
     void (*deleter)(void*),

src/TorchSharp/PInvoke/LibTorchSharp.THSTensor.cs

@@ -1325,6 +1325,9 @@ internal static extern IntPtr THSTensor_upsample_nearest3d(IntPtr input,
         [DllImport("LibTorchSharp")]
         internal static extern IntPtr THSTensor_randn(IntPtr generator, IntPtr psizes, int length, sbyte scalarType, int deviceType, int deviceIndex, [MarshalAs(UnmanagedType.U1)] bool requires_grad);
 
+        [DllImport("LibTorchSharp")]
+        internal static extern IntPtr THSTensor_from_file(byte[] filename, sbyte shared, long size, sbyte scalarType, int deviceType, int deviceIndex, [MarshalAs(UnmanagedType.U1)] bool requires_grad);
+
         [DllImport("LibTorchSharp")]
         internal static extern IntPtr THSTensor_complex(IntPtr real, IntPtr imag);
 

src/TorchSharp/Tensor/Tensor.Factories.cs

@@ -7,9 +7,12 @@
 using System.Runtime.InteropServices;
 using System.Diagnostics.Contracts;
 using static TorchSharp.PInvoke.LibTorchSharp;
+using System.Text;
 
 namespace TorchSharp
 {
+    using Utils;
+
     public static partial class torch
     {
         /// <summary>
@@ -2812,6 +2815,19 @@ public static Tensor polar(Tensor abs, Tensor angle)
             return new Tensor(res);
         }
 
+        public static Tensor from_file(string filename, bool? shared = null, long? size = 0, ScalarType? dtype = null, Device? device = null, bool requires_grad = false)
+        {
+            device = InitializeDevice(device);
+            if (!dtype.HasValue) {
+                // Determine the element type dynamically.
+                dtype = get_default_dtype();
+            }
+
+            var handle = THSTensor_from_file(StringEncoder.GetNullTerminatedUTF8ByteArray(filename), (sbyte)(!shared.HasValue ? -1 : shared.Value ? 1 : 0), size.HasValue ? size.Value : -1, (sbyte)dtype, (int)device.type, device.index, requires_grad);
+            if (handle == IntPtr.Zero) { CheckForErrors(); }
+            return new Tensor(handle);
+        }
+
         /// <summary>
         /// Create a one-dimensional tensor of size steps whose values are evenly spaced from start to end, inclusive.
         /// </summary>

src/TorchSharp/Torch.cs

@@ -80,6 +80,10 @@ internal static bool TryLoadNativeLibraryByName(string name, Assembly assembly,
 
         private static void LoadNativeBackend(bool useCudaBackend, out StringBuilder trace)
         {
+            if (!System.Environment.Is64BitProcess) {
+                throw new NotSupportedException("TorchSharp only supports 64-bit processes.");
+            }
+
             var alreadyLoaded = useCudaBackend ? nativeBackendCudaLoaded : nativeBackendLoaded;
             trace = new StringBuilder();
             if (!alreadyLoaded) {

src/TorchSharp/Utils/StringEncoder.cs

@@ -0,0 +1,17 @@
+using System.Text;
+
+namespace TorchSharp.Utils
+{
+    internal static class StringEncoder
+    {
+        private static readonly Encoding s_utfEncoding = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: false);
+
+        internal static byte[] GetNullTerminatedUTF8ByteArray(string input)
+        {
+            var bytes = new byte[s_utfEncoding.GetMaxByteCount(input.Length)+1];
+            var len = s_utfEncoding.GetBytes(input, 0, input.Length, bytes, 0);
+            bytes[len] = 0;
+            return bytes;
+        }
+    }
+}

test/TorchSharpTest/TestTorchTensor.cs

@@ -9255,5 +9255,14 @@ public void TestMeshGrid()
             Assert.NotNull(result);
             Assert.Equal(shifts.Length, result.Length);
         }
+
+        [Fact]
+        public void TestFromFile()
+        {
+            var location = "tensor_åöä_ασδφεες_አስድፋስድፍ.dat";
+            if (File.Exists(location)) File.Delete(location);
+            var t = torch.from_file(location, true, 256 * 16);
+            Assert.True(File.Exists(location));
+        }
     }
 }