| @@ -196,11 +196,11 @@ namespace Tensorflow | |||||
| _create_op_helper(op, true); | _create_op_helper(op, true); | ||||
| Console.Write($"create_op: {op_type} '{node_def.Name}'"); | |||||
| /*Console.Write($"create_op: {op_type} '{node_def.Name}'"); | |||||
| Console.Write($", inputs: {(inputs.Length == 0 ? "empty" : String.Join(", ", inputs.Select(x => x.name)))}"); | Console.Write($", inputs: {(inputs.Length == 0 ? "empty" : String.Join(", ", inputs.Select(x => x.name)))}"); | ||||
| Console.Write($", control_inputs: {(control_inputs.Length == 0 ? "empty" : String.Join(", ", control_inputs.Select(x => x.name)))}"); | Console.Write($", control_inputs: {(control_inputs.Length == 0 ? "empty" : String.Join(", ", control_inputs.Select(x => x.name)))}"); | ||||
| Console.Write($", outputs: {(op.outputs.Length == 0 ? "empty" : String.Join(", ", op.outputs.Select(x => x.name)))}"); | Console.Write($", outputs: {(op.outputs.Length == 0 ? "empty" : String.Join(", ", op.outputs.Select(x => x.name)))}"); | ||||
| Console.WriteLine(); | |||||
| Console.WriteLine();*/ | |||||
| return op; | return op; | ||||
| } | } | ||||
| @@ -62,26 +62,29 @@ namespace Tensorflow | |||||
| switch (subfeed_val) | switch (subfeed_val) | ||||
| { | { | ||||
| case IntPtr pointer: | |||||
| feed_dict_tensor[subfeed_t] = pointer; | |||||
| case IntPtr val: | |||||
| feed_dict_tensor[subfeed_t] = val; | |||||
| break; | break; | ||||
| case NDArray nd: | |||||
| feed_dict_tensor[subfeed_t] = nd; | |||||
| case NDArray val: | |||||
| feed_dict_tensor[subfeed_t] = val; | |||||
| break; | break; | ||||
| case float floatVal: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)floatVal; | |||||
| case float val: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)val; | |||||
| break; | break; | ||||
| case double doubleVal: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)doubleVal; | |||||
| case double val: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)val; | |||||
| break; | break; | ||||
| case int intVal: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)intVal; | |||||
| case short val: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)val; | |||||
| break; | break; | ||||
| case string str: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)str; | |||||
| case int val: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)val; | |||||
| break; | break; | ||||
| case byte[] bytes: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)bytes; | |||||
| case string val: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)val; | |||||
| break; | |||||
| case byte[] val: | |||||
| feed_dict_tensor[subfeed_t] = (NDArray)val; | |||||
| break; | break; | ||||
| default: | default: | ||||
| Console.WriteLine($"can't handle data type of subfeed_val"); | Console.WriteLine($"can't handle data type of subfeed_val"); | ||||
| @@ -4,7 +4,7 @@ | |||||
| <TargetFramework>netstandard2.0</TargetFramework> | <TargetFramework>netstandard2.0</TargetFramework> | ||||
| <AssemblyName>TensorFlow.NET</AssemblyName> | <AssemblyName>TensorFlow.NET</AssemblyName> | ||||
| <RootNamespace>Tensorflow</RootNamespace> | <RootNamespace>Tensorflow</RootNamespace> | ||||
| <Version>0.4.1</Version> | |||||
| <Version>0.4.2</Version> | |||||
| <Authors>Haiping Chen</Authors> | <Authors>Haiping Chen</Authors> | ||||
| <Company>SciSharp STACK</Company> | <Company>SciSharp STACK</Company> | ||||
| <GeneratePackageOnBuild>true</GeneratePackageOnBuild> | <GeneratePackageOnBuild>true</GeneratePackageOnBuild> | ||||
| @@ -16,11 +16,11 @@ | |||||
| <PackageTags>TensorFlow, NumSharp, SciSharp, MachineLearning, TensorFlow.NET</PackageTags> | <PackageTags>TensorFlow, NumSharp, SciSharp, MachineLearning, TensorFlow.NET</PackageTags> | ||||
| <Description>Google's TensorFlow binding in .NET Standard. | <Description>Google's TensorFlow binding in .NET Standard. | ||||
| Docs: https://tensorflownet.readthedocs.io</Description> | Docs: https://tensorflownet.readthedocs.io</Description> | ||||
| <AssemblyVersion>0.4.1.0</AssemblyVersion> | |||||
| <AssemblyVersion>0.4.2.0</AssemblyVersion> | |||||
| <PackageReleaseNotes>Added ConfigProto to control CPU and GPU resource. | <PackageReleaseNotes>Added ConfigProto to control CPU and GPU resource. | ||||
| Fixed import name scope issue.</PackageReleaseNotes> | Fixed import name scope issue.</PackageReleaseNotes> | ||||
| <LangVersion>7.2</LangVersion> | <LangVersion>7.2</LangVersion> | ||||
| <FileVersion>0.4.1.0</FileVersion> | |||||
| <FileVersion>0.4.2.0</FileVersion> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||||