Browse Source

Fixing TF_String for jpeg_encode

pull/481/head
Matthew Moloney 5 years ago
parent
commit
f6737ff950
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      src/TensorFlowNET.Core/Sessions/BaseSession.cs
  2. +2
    -2
      test/TensorFlowNET.UnitTest/SessionTest.cs

+ 2
- 2
src/TensorFlowNET.Core/Sessions/BaseSession.cs View File

@@ -278,8 +278,8 @@ namespace Tensorflow
ret = NDArray.Scalar(*(bool*) srcAddress); ret = NDArray.Scalar(*(bool*) srcAddress);
break; break;
case TF_DataType.TF_STRING: case TF_DataType.TF_STRING:
using (var reader = new CodedInputStream(new IntPtr(srcAddress).Stream(8, (long) tensor.bytesize)))
ret = NDArray.FromString(reader.ReadString());
using (var reader = new CodedInputStream(new IntPtr(srcAddress).Stream(8, (long)tensor.bytesize)))
ret = new NDArray(reader.ReadBytes().ToByteArray());
break; break;
case TF_DataType.TF_UINT8: case TF_DataType.TF_UINT8:
ret = NDArray.Scalar(*(byte*) srcAddress); ret = NDArray.Scalar(*(byte*) srcAddress);


+ 2
- 2
test/TensorFlowNET.UnitTest/SessionTest.cs View File

@@ -109,7 +109,7 @@ namespace TensorFlowNET.UnitTest
var c = tf.strings.substr(a, 4, 8); var c = tf.strings.substr(a, 4, 8);
using (var sess = tf.Session()) using (var sess = tf.Session())
{ {
var result = (string) c.eval(sess);
var result = System.Text.UTF8Encoding.UTF8.GetString((byte[]) c.eval(sess));
Console.WriteLine(result); Console.WriteLine(result);
result.Should().Be("heythere"); result.Should().Be("heythere");
} }
@@ -126,7 +126,7 @@ namespace TensorFlowNET.UnitTest
var c = tf.strings.substr(a, 0, size - 5000); var c = tf.strings.substr(a, 0, size - 5000);
using (var sess = tf.Session()) using (var sess = tf.Session())
{ {
var result = (string) c.eval(sess);
var result = System.Text.UTF8Encoding.UTF8.GetString((byte[]) c.eval(sess));
Console.WriteLine((string) result); Console.WriteLine((string) result);
result.Should().HaveLength(size - 5000).And.ContainAll("a"); result.Should().HaveLength(size - 5000).And.ContainAll("a");
} }


Loading…
Cancel
Save