Browse Source

fix: resolve conflict.

tags/v0.110.0-LSTM-Model
Yaohui Liu 2 years ago
parent
commit
ae8fe840e4
2 changed files with 11 additions and 3 deletions
  1. +3
    -1
      src/TensorFlowNET.Core/APIs/c_api.cs
  2. +8
    -2
      src/TensorFlowNET.Core/ops.cs

+ 3
- 1
src/TensorFlowNET.Core/APIs/c_api.cs View File

@@ -53,8 +53,10 @@ namespace Tensorflow

public unsafe static byte[] ByteStringPiece(Buffer? handle)
{
if(handle is null){
if (handle is null)
{
return new byte[0];
}
var data = handle.ToArray();
return data;
}


+ 8
- 2
src/TensorFlowNET.Core/ops.cs View File

@@ -576,8 +576,14 @@ namespace Tensorflow
public static HandleData get_resource_handle_data(Tensor graph_op)
{
var handle_data = c_api.TFC_GetHandleShapeAndType(graph_op.graph.c_graph, graph_op._as_tf_output());
var handle_str = c_api.ByteStringPiece(handle_data.DangerousGetHandle() == IntPtr.Zero ? null : new Buffer(handle_data));
return HandleData.Parser.ParseFrom(handle_str);
try{
var handle_str = c_api.ByteStringPiece(handle_data.DangerousGetHandle() == IntPtr.Zero ? null : new Buffer(handle_data));
return HandleData.Parser.ParseFrom(handle_str);
}
catch(Exception){
var handle_str = c_api.ByteStringPieceFromNativeString(handle_data.DangerousGetHandle());
return HandleData.Parser.ParseFrom(handle_str);
}
}

public static void dismantle_graph(Graph graph)


Loading…
Cancel
Save