Browse Source

Rename SaveableObject to MySaveableObject.

tags/v0.20
Oceania2018 5 years ago
parent
commit
9bb603d59b
6 changed files with 16 additions and 16 deletions
  1. +4
    -4
      src/TensorFlowNET.Core/Training/Saving/BaseSaverBuilder.cs
  2. +2
    -2
      src/TensorFlowNET.Core/Training/Saving/ISaverBuilder.cs
  3. +1
    -1
      src/TensorFlowNET.Core/Training/Saving/ReferenceVariableSaveable.cs
  4. +1
    -1
      src/TensorFlowNET.Core/Training/Saving/ResourceVariableSaveable.cs
  5. +4
    -4
      src/TensorFlowNET.Core/Training/Saving/SaveableObject.cs
  6. +4
    -4
      src/TensorFlowNET.Core/Training/Saving/saveable_object_util.py.cs

+ 4
- 4
src/TensorFlowNET.Core/Training/Saving/BaseSaverBuilder.cs View File

@@ -37,7 +37,7 @@ namespace Tensorflow
/// <param name="filename_tensor"></param>
/// <param name="saveables"></param>
/// <returns></returns>
public virtual Operation save_op(Tensor filename_tensor, SaveableObject[] saveables)
public virtual Operation save_op(Tensor filename_tensor, MySaveableObject[] saveables)
{
var tensor_names = new List<string>();
var tensors = new List<Tensor>();
@@ -63,7 +63,7 @@ namespace Tensorflow
}
}

public virtual Tensor[] bulk_restore(Tensor filename_tensor, SaveableObject[] saveables, int preferred_shard, bool restore_sequentially)
public virtual Tensor[] bulk_restore(Tensor filename_tensor, MySaveableObject[] saveables, int preferred_shard, bool restore_sequentially)
{
var names = new List<string>();
var slices = new List<string>();
@@ -182,7 +182,7 @@ namespace Tensorflow
});
}

public Tensor _AddSaveOps(Tensor filename_tensor, SaveableObject[] saveables)
public Tensor _AddSaveOps(Tensor filename_tensor, MySaveableObject[] saveables)
{
var save = save_op(filename_tensor, saveables);
return control_flow_ops.with_dependencies(new Operation[] { save }, filename_tensor);
@@ -199,7 +199,7 @@ namespace Tensorflow
/// <param name="name"></param>
/// <returns>An Operation that restores the variables.</returns>
public Operation _AddRestoreOps(Tensor filename_tensor,
SaveableObject[] saveables,
MySaveableObject[] saveables,
bool restore_sequentially,
bool reshape,
int preferred_shard = -1,


+ 2
- 2
src/TensorFlowNET.Core/Training/Saving/ISaverBuilder.cs View File

@@ -18,9 +18,9 @@ namespace Tensorflow
{
public interface ISaverBuilder
{
Operation save_op(Tensor filename_tensor, SaveableObject[] saveables);
Operation save_op(Tensor filename_tensor, MySaveableObject[] saveables);

Tensor[] bulk_restore(Tensor filename_tensor, SaveableObject[] saveables, int preferred_shard, bool restore_sequentially);
Tensor[] bulk_restore(Tensor filename_tensor, MySaveableObject[] saveables, int preferred_shard, bool restore_sequentially);

SaverDef _build_internal(IVariableV1[] names_to_saveables,
bool reshape = false,


+ 1
- 1
src/TensorFlowNET.Core/Training/Saving/ReferenceVariableSaveable.cs View File

@@ -16,7 +16,7 @@

namespace Tensorflow
{
public class ReferenceVariableSaveable : SaveableObject
public class ReferenceVariableSaveable : MySaveableObject
{
private SaveSpec _spec;



+ 1
- 1
src/TensorFlowNET.Core/Training/Saving/ResourceVariableSaveable.cs View File

@@ -16,7 +16,7 @@

namespace Tensorflow
{
public class ResourceVariableSaveable : SaveableObject
public class ResourceVariableSaveable : MySaveableObject
{
string _var_device;
int[] _var_shape;


+ 4
- 4
src/TensorFlowNET.Core/Training/Saving/SaveableObject.cs View File

@@ -16,24 +16,24 @@

namespace Tensorflow
{
public class SaveableObject
public class MySaveableObject
{
public Tensor op;
public SaveSpec[] specs;
public string name;
public string device;

public SaveableObject()
public MySaveableObject()
{

}

public SaveableObject(Tensor var, string slice_spec, string name)
public MySaveableObject(Tensor var, string slice_spec, string name)
{

}

public SaveableObject(Tensor op, SaveSpec[] specs, string name)
public MySaveableObject(Tensor op, SaveSpec[] specs, string name)
{
this.op = op;
this.specs = specs;


+ 4
- 4
src/TensorFlowNET.Core/Training/Saving/saveable_object_util.py.cs View File

@@ -28,10 +28,10 @@ namespace Tensorflow
/// </summary>
/// <param name="names_to_saveables"></param>
/// <returns></returns>
public static SaveableObject[] validate_and_slice_inputs(IVariableV1[] names_to_saveables)
public static MySaveableObject[] validate_and_slice_inputs(IVariableV1[] names_to_saveables)
{
var names_to_saveables_dict = op_list_to_dict(names_to_saveables);
var saveables = new List<SaveableObject>();
var saveables = new List<MySaveableObject>();
var seen_ops = new List<Tensor>();

foreach (var (name, op) in enumerate(names_to_saveables_dict))
@@ -42,7 +42,7 @@ namespace Tensorflow
return saveables.ToArray();
}

private static void _add_saveable<T>(List<T> saveables, List<Tensor> seen_ops, T saveable) where T : SaveableObject
private static void _add_saveable<T>(List<T> saveables, List<Tensor> seen_ops, T saveable) where T : MySaveableObject
{
if (seen_ops.Contains(saveable.op))
throw new ValueError($"The same saveable will be restored with two names: {saveable.name}");
@@ -57,7 +57,7 @@ namespace Tensorflow
/// <param name="op"></param>
/// <param name="name"></param>
/// <returns></returns>
public static IEnumerable<SaveableObject> saveable_objects_for_op(Tensor op, string name)
public static IEnumerable<MySaveableObject> saveable_objects_for_op(Tensor op, string name)
{
if (false)
{


Loading…
Cancel
Save