Skip to content

Commit 2a42097

Browse files
cbovarcbovar
authored
Merge pull request #146 from cbovar/Upgrade_Framework
Upgrade framework
2 parents 24588a5 + 79691e2 commit 2a42097

File tree

202 files changed

+136152
-5577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+136152
-5577
lines changed

‎ConvNetSharp.Nuget.sln‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.14
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29728.190
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume", "src\ConvNetSharp.Volume\ConvNetSharp.Volume.csproj", "{1A285120-F2F0-4A94-AB31-B4E870679C0E}"
77
EndProject
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume.GPU.Nug
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Flow.Nuget", "src\ConvNetSharp.Flow\ConvNetSharp.Flow.Nuget.csproj", "{33F6F287-80DC-4E94-854A-501B65D4CD15}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Utils.Nuget", "src\ConvNetSharp.Utils\ConvNetSharp.Utils.Nuget.csproj", "{64DB0F34-099A-41F8-A9D5-E58DD66A1276}"
15-
EndProject
1614
Global
1715
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1816
Debug|Any CPU = Debug|Any CPU
@@ -35,10 +33,6 @@ Global
3533
{33F6F287-80DC-4E94-854A-501B65D4CD15}.Debug|Any CPU.Build.0 = Debug|Any CPU
3634
{33F6F287-80DC-4E94-854A-501B65D4CD15}.Release|Any CPU.ActiveCfg = Release|Any CPU
3735
{33F6F287-80DC-4E94-854A-501B65D4CD15}.Release|Any CPU.Build.0 = Release|Any CPU
38-
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Release|Any CPU.Build.0 = Release|Any CPU
4236
EndGlobalSection
4337
GlobalSection(SolutionProperties) = preSolution
4438
HideSolutionNode = FALSE

‎ConvNetSharp.sln‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,47 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.14
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29728.190
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{52D65A64-6583-4C2B-A41B-009A739CCC80}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Classify2DDemo", "Examples\Classify2DDemo\Classify2DDemo.csproj", "{2A9533F5-F706-4170-9E57-B7DCFFD6C168}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Classify2DDemo", "Examples\Classify2DDemo\Classify2DDemo.csproj", "{2A9533F5-F706-4170-9E57-B7DCFFD6C168}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Core.Tests", "src\ConvNetSharp.Core.Tests\ConvNetSharp.Core.Tests.csproj", "{507EE568-0C1E-451D-851E-4FB2D96B9E5F}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Core.Tests", "src\ConvNetSharp.Core.Tests\ConvNetSharp.Core.Tests.csproj", "{507EE568-0C1E-451D-851E-4FB2D96B9E5F}"
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume.GPU", "src\ConvNetSharp.Volume.GPU\ConvNetSharp.Volume.GPU.csproj", "{608C97DB-721F-4B34-BE2D-01A85B762BE9}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Volume.GPU.Tests", "src\ConvNetSharp.Volume.GPU.Tests\ConvNetSharp.Volume.GPU.Tests.csproj", "{1A149F93-71AF-4D84-A9A2-16B2A580D3F7}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume.GPU.Tests", "src\ConvNetSharp.Volume.GPU.Tests\ConvNetSharp.Volume.GPU.Tests.csproj", "{1A149F93-71AF-4D84-A9A2-16B2A580D3F7}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Volume.Tests", "src\ConvNetSharp.Volume.Tests\ConvNetSharp.Volume.Tests.csproj", "{45892049-C55F-411B-9E4C-6240CA6CAC39}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume.Tests", "src\ConvNetSharp.Volume.Tests\ConvNetSharp.Volume.Tests.csproj", "{45892049-C55F-411B-9E4C-6240CA6CAC39}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinimalExample", "Examples\MinimalExample\MinimalExample.csproj", "{4EF98185-F653-4CD3-AF58-77D036CB6A1F}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalExample", "Examples\MinimalExample\MinimalExample.csproj", "{4EF98185-F653-4CD3-AF58-77D036CB6A1F}"
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume", "src\ConvNetSharp.Volume\ConvNetSharp.Volume.csproj", "{1A285120-F2F0-4A94-AB31-B4E870679C0E}"
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Core", "src\ConvNetSharp.Core\ConvNetSharp.Core.csproj", "{3A6864AF-30B4-4C0E-B621-3571E3D88B43}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentMnistDemo", "Examples\FluentMnistDemo\FluentMnistDemo.csproj", "{47ECFF06-58BF-4396-874F-C66AC552705B}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentMnistDemo", "Examples\FluentMnistDemo\FluentMnistDemo.csproj", "{47ECFF06-58BF-4396-874F-C66AC552705B}"
2525
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MnistDemo", "Examples\MnistDemo\MnistDemo.csproj", "{CD073D54-06AC-46E2-BC9C-BB03BC98EC14}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MnistDemo", "Examples\MnistDemo\MnistDemo.csproj", "{CD073D54-06AC-46E2-BC9C-BB03BC98EC14}"
2727
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MnitsDemo.GPU", "Examples\MnistDemo.GPU\MnitsDemo.GPU.csproj", "{1C5D92A1-272A-4545-BE0D-B4F836861E04}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MnitsDemo.GPU", "Examples\MnistDemo.GPU\MnitsDemo.GPU.csproj", "{1C5D92A1-272A-4545-BE0D-B4F836861E04}"
2929
EndProject
30-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Performance.Tests", "src\ConvNetSharp.Performance.Tests\ConvNetSharp.Performance.Tests.csproj", "{857A7B91-A10B-484D-9164-0850734A4583}"
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Performance.Tests", "src\ConvNetSharp.Performance.Tests\ConvNetSharp.Performance.Tests.csproj", "{857A7B91-A10B-484D-9164-0850734A4583}"
3131
EndProject
32-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MnistDemo.Flow.GPU", "Examples\MnistDemo.Flow.GPU\MnistDemo.Flow.GPU.csproj", "{01773087-8E8F-400E-AE7E-891D9764003D}"
32+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MnistDemo.Flow.GPU", "Examples\MnistDemo.Flow.GPU\MnistDemo.Flow.GPU.csproj", "{01773087-8E8F-400E-AE7E-891D9764003D}"
3333
EndProject
3434
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Flow", "src\ConvNetSharp.Flow\ConvNetSharp.Flow.csproj", "{54F7C4CA-B059-46DF-A766-E08515060393}"
3535
EndProject
36-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Flow.Tests", "src\ConvNetSharp.Flow.Tests\ConvNetSharp.Flow.Tests.csproj", "{172EE640-933C-45C2-9F5F-E55CAF37062E}"
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Flow.Tests", "src\ConvNetSharp.Flow.Tests\ConvNetSharp.Flow.Tests.csproj", "{172EE640-933C-45C2-9F5F-E55CAF37062E}"
3737
EndProject
38-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Utils", "src\ConvNetSharp.Utils\ConvNetSharp.Utils.csproj", "{64DB0F34-099A-41F8-A9D5-E58DD66A1276}"
38+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowDemo", "Examples\FlowDemo\FlowDemo.csproj", "{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}"
3939
EndProject
40-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlowDemo", "Examples\FlowDemo\FlowDemo.csproj", "{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}"
40+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaveAndLoadDemo", "Examples\SaveAndLoadDemo\SaveAndLoadDemo.csproj", "{ED370E1C-BCE9-403D-8AD9-19015381C2F3}"
4141
EndProject
42-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaveAndLoadDemo", "Examples\SaveAndLoadDemo\SaveAndLoadDemo.csproj", "{ED370E1C-BCE9-403D-8AD9-19015381C2F3}"
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaveAndLoadDemo.Flow", "Examples\SaveAndLoadDemo.Flow\SaveAndLoadDemo.Flow.csproj", "{09169583-B94A-4E16-9F94-414DF9361834}"
4343
EndProject
44-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaveAndLoadDemo.Flow", "Examples\SaveAndLoadDemo.Flow\SaveAndLoadDemo.Flow.csproj", "{09169583-B94A-4E16-9F94-414DF9361834}"
45-
EndProject
46-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RnnDemo.Flow.GPU", "Examples\RnnDemo.Flow\RnnDemo.Flow.GPU.csproj", "{038BDB21-6368-4BB5-9AF3-DB9FAE9375B8}"
44+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RnnDemo.Flow.GPU", "Examples\RnnDemo.Flow\RnnDemo.Flow.GPU.csproj", "{038BDB21-6368-4BB5-9AF3-DB9FAE9375B8}"
4745
EndProject
4846
Global
4947
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -111,10 +109,6 @@ Global
111109
{172EE640-933C-45C2-9F5F-E55CAF37062E}.Debug|Any CPU.Build.0 = Debug|Any CPU
112110
{172EE640-933C-45C2-9F5F-E55CAF37062E}.Release|Any CPU.ActiveCfg = Release|Any CPU
113111
{172EE640-933C-45C2-9F5F-E55CAF37062E}.Release|Any CPU.Build.0 = Release|Any CPU
114-
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115-
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Debug|Any CPU.Build.0 = Debug|Any CPU
116-
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Release|Any CPU.ActiveCfg = Release|Any CPU
117-
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Release|Any CPU.Build.0 = Release|Any CPU
118112
{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119113
{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
120114
{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎ConvNetSharp.sln.DotSettings‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Blas/@EntryIndexedValue">True</s:Boolean>
3+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Cuda/@EntryIndexedValue">True</s:Boolean>
4+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Cudnn/@EntryIndexedValue">True</s:Boolean>
5+
<s:Boolean x:Key="/Default/UserDictionary/Words/=graphml/@EntryIndexedValue">True</s:Boolean>
6+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Implem/@EntryIndexedValue">True</s:Boolean>
7+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Relu/@EntryIndexedValue">True</s:Boolean>
8+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Softmax/@EntryIndexedValue">True</s:Boolean>
9+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Tanh/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎Examples/Classify2DDemo/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
55
</startup>
66
</configuration>

‎Examples/Classify2DDemo/Classify2DDemo.csproj‎

Lines changed: 14 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,21 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{2A9533F5-F706-4170-9E57-B7DCFFD6C168}</ProjectGuid>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<IsPackable>false</IsPackable>
6+
<StartupObject>Classify2DDemo.Program</StartupObject>
7+
<ApplicationIcon />
88
<OutputType>Exe</OutputType>
9-
<RootNamespace>Classify2DDemo</RootNamespace>
10-
<AssemblyName>Classify2DDemo</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<TargetFrameworkProfile />
159
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
10+
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
12+
2513
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
<Prefer32Bit>false</Prefer32Bit>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Xml.Linq" />
40-
<Reference Include="System.Data.DataSetExtensions" />
41-
<Reference Include="Microsoft.CSharp" />
42-
<Reference Include="System.Data" />
43-
<Reference Include="System.Net.Http" />
44-
<Reference Include="System.Xml" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<Compile Include="Program.cs" />
48-
<Compile Include="Properties\AssemblyInfo.cs" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<None Include="App.config" />
52-
</ItemGroup>
14+
5315
<ItemGroup>
54-
<ProjectReference Include="..\..\src\ConvNetSharp.Core\ConvNetSharp.Core.csproj">
55-
<Project>{3a6864af-30b4-4c0e-b621-3571e3d88b43}</Project>
56-
<Name>ConvNetSharp.Core</Name>
57-
</ProjectReference>
58-
<ProjectReference Include="..\..\src\ConvNetSharp.Volume\ConvNetSharp.Volume.csproj">
59-
<Project>{1a285120-f2f0-4a94-ab31-b4e870679c0e}</Project>
60-
<Name>ConvNetSharp.Volume</Name>
61-
</ProjectReference>
16+
<ProjectReference Include="..\..\src\ConvNetSharp.Core\ConvNetSharp.Core.csproj" />
17+
<ProjectReference Include="..\..\src\ConvNetSharp.Volume\ConvNetSharp.Volume.csproj" />
6218
</ItemGroup>
63-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
19+
20+
6421
</Project>

‎Examples/Classify2DDemo/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎Examples/FlowDemo/App.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Examples/FlowDemo/Classify2DDemo.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using ConvNetSharp.Flow;
55
using ConvNetSharp.Flow.Layers;
66
using ConvNetSharp.Flow.Training;
7-
using ConvNetSharp.Utils.GraphVisualizer;
87
using ConvNetSharp.Volume;
98
using ConvNetSharp.Volume.Double;
109

@@ -63,10 +62,10 @@ public static void Classify2DDemo()
6362
Classify2DUpdate(n, data, trainer, labels);
6463
} while (!Console.KeyAvailable);
6564

66-
// Display graph
67-
var vm = new ViewModel<double>(net.Cost);
68-
var app = new Application();
69-
app.Run(new GraphControl { DataContext = vm });
65+
//// Display graph
66+
//var vm = new ViewModel<double>(net.Cost);
67+
//var app = new Application();
68+
//app.Run(new GraphControl { DataContext = vm });
7069

7170
net.Dispose();
7271
trainer.Dispose();

‎Examples/FlowDemo/ExampleCPUDouble.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Windows;
54
using ConvNetSharp.Flow;
65
using ConvNetSharp.Flow.Training;
7-
using ConvNetSharp.Utils.GraphVisualizer;
86
using ConvNetSharp.Volume;
97

108
namespace FlowDemo
@@ -91,10 +89,10 @@ public static void Example2()
9189
} while (currentCost > 1e-5);
9290
}
9391

94-
// Display derivate at b
95-
var vm = new ViewModel<double>(b.Derivate);
96-
var app = new Application();
97-
app.Run(new GraphControl { DataContext = vm });
92+
//// Display derivate at b
93+
//var vm = new ViewModel<double>(b.Derivate);
94+
//var app = new Application();
95+
//app.Run(new GraphControl { DataContext = vm });
9896

9997
double finalb = b.Result;
10098
Console.WriteLine($"fun = x + {finalb}");

‎Examples/FlowDemo/ExampleCPUSingle.cs‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4-
using System.Windows;
54
using ConvNetSharp.Flow;
65
using ConvNetSharp.Flow.Ops;
76
using ConvNetSharp.Flow.Serialization;
87
using ConvNetSharp.Flow.Training;
9-
using ConvNetSharp.Utils.GraphVisualizer;
108
using ConvNetSharp.Volume;
119

1210
namespace FlowDemo
@@ -72,10 +70,10 @@ public static void Example1()
7270

7371
fun.Save("test", cost);
7472

75-
// Display graph
76-
var vm = new ViewModel<float>(cost);
77-
var app = new Application();
78-
app.Run(new GraphControl { DataContext = vm });
73+
//// Display graph
74+
//var vm = new ViewModel<float>(cost);
75+
//var app = new Application();
76+
//app.Run(new GraphControl { DataContext = vm });
7977
}
8078

8179
Console.ReadKey();
@@ -96,10 +94,10 @@ public static void Example2()
9694
{
9795
session.Differentiate(fun); // computes dCost/dW at every node of the graph
9896

99-
// Display graph
100-
var vm = new ViewModel<float>(x.Derivate);
101-
var app = new Application();
102-
app.Run(new GraphControl { DataContext = vm });
97+
//// Display graph
98+
//var vm = new ViewModel<float>(x.Derivate);
99+
//var app = new Application();
100+
//app.Run(new GraphControl { DataContext = vm });
103101
}
104102

105103
Console.ReadKey();
@@ -129,10 +127,10 @@ public static void Example3()
129127

130128
} while (!Console.KeyAvailable);
131129

132-
// Display graph
133-
var vm = new ViewModel<float>(fun);
134-
var app = new Application();
135-
app.Run(new GraphControl { DataContext = vm });
130+
//// Display graph
131+
//var vm = new ViewModel<float>(fun);
132+
//var app = new Application();
133+
//app.Run(new GraphControl { DataContext = vm });
136134
}
137135
}
138136
}

0 commit comments

Comments
 (0)