From 6c8f82935656d9fb3acee3b45f97be6f4140cbe9 Mon Sep 17 00:00:00 2001 From: Eli Belash Date: Thu, 12 Sep 2019 00:57:45 +0300 Subject: [PATCH] Upgraded NumSharp to 0.20.2 --- src/TensorFlowHub/TensorFlowHub.csproj | 2 +- .../TensorFlowNET.Core.csproj | 2 +- src/TensorFlowNET.Core/Tensors/Tensor.cs | 32 +++++++++---------- src/TensorFlowNET.Core/Tensors/dtypes.cs | 1 + 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/TensorFlowHub/TensorFlowHub.csproj b/src/TensorFlowHub/TensorFlowHub.csproj index 45501233..d6339667 100644 --- a/src/TensorFlowHub/TensorFlowHub.csproj +++ b/src/TensorFlowHub/TensorFlowHub.csproj @@ -17,6 +17,6 @@ https://avatars3.githubusercontent.com/u/44989469?s=200&v=4 - + \ No newline at end of file diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj index 823c02b6..d2d5d1b4 100644 --- a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj +++ b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj @@ -62,7 +62,7 @@ Docs: https://tensorflownet.readthedocs.io - + diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.cs b/src/TensorFlowNET.Core/Tensors/Tensor.cs index a4e156c1..fdd807da 100644 --- a/src/TensorFlowNET.Core/Tensors/Tensor.cs +++ b/src/TensorFlowNET.Core/Tensors/Tensor.cs @@ -261,31 +261,31 @@ namespace Tensorflow switch (dtype.as_numpy_dtype().GetTypeCode()) { %foreach supported_dtypes,supported_dtypes_lowercase% - case NPTypeCode.#1: return new T[] {Converts.ChangeType(*(#2*) buffer, NPTypeCode.#1)}; + case NPTypeCode.#1: return new T[] {Converts.ChangeType(*(#2*) buffer)}; % - case NPTypeCode.String: return new T[] {Converts.ChangeType((string)this, NPTypeCode.String)}; + case NPTypeCode.String: return new T[] {Converts.ChangeType((string)this)}; default: throw new NotSupportedException(); } #endregion #else #region Compute - switch (dtype.as_numpy_dtype()?.GetTypeCode()) + switch (dtype.as_numpy_dtype().GetTypeCode()) { - case NPTypeCode.Boolean: return new T[] {Converts.ChangeType(*(bool*) buffer, NPTypeCode.Boolean)}; - case NPTypeCode.Byte: return new T[] {Converts.ChangeType(*(byte*) buffer, NPTypeCode.Byte)}; - case NPTypeCode.Int16: return new T[] {Converts.ChangeType(*(short*) buffer, NPTypeCode.Int16)}; - case NPTypeCode.UInt16: return new T[] {Converts.ChangeType(*(ushort*) buffer, NPTypeCode.UInt16)}; - case NPTypeCode.Int32: return new T[] {Converts.ChangeType(*(int*) buffer, NPTypeCode.Int32)}; - case NPTypeCode.UInt32: return new T[] {Converts.ChangeType(*(uint*) buffer, NPTypeCode.UInt32)}; - case NPTypeCode.Int64: return new T[] {Converts.ChangeType(*(long*) buffer, NPTypeCode.Int64)}; - case NPTypeCode.UInt64: return new T[] {Converts.ChangeType(*(ulong*) buffer, NPTypeCode.UInt64)}; - case NPTypeCode.Char: return new T[] {Converts.ChangeType(*(char*) buffer, NPTypeCode.Char)}; - case NPTypeCode.Double: return new T[] {Converts.ChangeType(*(double*) buffer, NPTypeCode.Double)}; - case NPTypeCode.Single: return new T[] {Converts.ChangeType(*(float*) buffer, NPTypeCode.Single)}; - case NPTypeCode.String: return new T[] {Converts.ChangeType((string)this, NPTypeCode.String)}; + case NPTypeCode.Boolean: return new T[] {Converts.ChangeType(*(bool*) buffer)}; + case NPTypeCode.Byte: return new T[] {Converts.ChangeType(*(byte*) buffer)}; + case NPTypeCode.Int16: return new T[] {Converts.ChangeType(*(short*) buffer)}; + case NPTypeCode.UInt16: return new T[] {Converts.ChangeType(*(ushort*) buffer)}; + case NPTypeCode.Int32: return new T[] {Converts.ChangeType(*(int*) buffer)}; + case NPTypeCode.UInt32: return new T[] {Converts.ChangeType(*(uint*) buffer)}; + case NPTypeCode.Int64: return new T[] {Converts.ChangeType(*(long*) buffer)}; + case NPTypeCode.UInt64: return new T[] {Converts.ChangeType(*(ulong*) buffer)}; + case NPTypeCode.Char: return new T[] {Converts.ChangeType(*(char*) buffer)}; + case NPTypeCode.Double: return new T[] {Converts.ChangeType(*(double*) buffer)}; + case NPTypeCode.Single: return new T[] {Converts.ChangeType(*(float*) buffer)}; + case NPTypeCode.String: return new T[] {Converts.ChangeType((string)this)}; default: - throw new NotSupportedException(); + throw new NotSupportedException(); } #endregion #endif diff --git a/src/TensorFlowNET.Core/Tensors/dtypes.cs b/src/TensorFlowNET.Core/Tensors/dtypes.cs index 69ce7d79..41d9009c 100644 --- a/src/TensorFlowNET.Core/Tensors/dtypes.cs +++ b/src/TensorFlowNET.Core/Tensors/dtypes.cs @@ -16,6 +16,7 @@ using System; using System.Numerics; +using NumSharp; using NumSharp.Backends; namespace Tensorflow