8000 Merge pull request #54 from NiklasGustafsson/main · dotnet/TorchSharpExamples@1840bcf · GitHub
[go: up one dir, main page]
Skip to content

Commit 1840bcf

Browse files
NiklasGustafssonNiklasGustafsson
authored
Merge pull request #54 from NiklasGustafsson/main
Updates
2 parents 92fc3ad + e330fd6 commit 1840bcf

13 files changed

+41
-43
lines changed

‎src/CSharp/CSharpExamples/AdversarialExampleGeneration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private static double Test(
161161
model.zero_grad();
162162
loss.backward();
163163

164-
var perturbed = Attack(data, ε, data.grad());
164+
var perturbed = Attack(data, ε, data.grad);
165165

166166
using (var final = model.forward(perturbed))
167167
{

‎src/CSharp/CSharpExamples/CSharpExamples.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="TorchSharp-cpu" Version="0.102.0" />
21-
<PackageReference Include="TorchVision" Version="0.102.0" />
20+
<PackageReference Include="TorchSharp-cpu" Version="0.104.0" />
21+
<PackageReference Include="TorchVision" Version="0.104.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/CSharp/Models/AlexNet.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ public class AlexNet : Module<Tensor, Tensor>
2424
public AlexNet(string name, int numClasses, Device device = null) : base(name)
2525
{
2626
features = Sequential(
27-
("c1", Conv2d(3, 64, kernelSize: 3, stride: 2, padding: 1)),
27+
("c1", Conv2d(3, 64, kernel_size:3, stride: 2, padding: 1)),
2828
("r1", ReLU(inplace: t 4277 rue)),
29-
("mp1", MaxPool2d(kernelSize: new long[] { 2, 2 })),
30-
("c2", Conv2d(64, 192, kernelSize: 3, padding: 1)),
29+
("mp1", MaxPool2d(kernel_size:new long[] { 2, 2 })),
30+
("c2", Conv2d(64, 192, kernel_size:3, padding: 1)),
3131
("r2", ReLU(inplace: true)),
32-
("mp2", MaxPool2d(kernelSize: new long[] { 2, 2 })),
33-
("c3", Conv2d(192, 384, kernelSize: 3, padding: 1)),
32+
("mp2", MaxPool2d(kernel_size:new long[] { 2, 2 })),
33+
("c3", Conv2d(192, 384, kernel_size:3, padding: 1)),
3434
("r3", ReLU(inplace: true)),
35-
("c4", Conv2d(384, 256, kernelSize: 3, padding: 1)),
35+
("c4", Conv2d(384, 256, kernel_size:3, padding: 1)),
3636
("r4", ReLU(inplace: true)),
37-
("c5", Conv2d(256, 256, kernelSize: 3, padding: 1)),
37+
("c5", Conv2d(256, 256, kernel_size:3, padding: 1)),
3838
("r5", ReLU(inplace: true)),
39-
("mp3", MaxPool2d(kernelSize: new long[] { 2, 2 })));
39+
("mp3", MaxPool2d(kernel_size:new long[] { 2, 2 })));
4040

4141
avgPool = AdaptiveAvgPool2d(new long[] { 2, 2 });
4242

‎src/CSharp/Models/MNIST.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class Model : Module<Tensor,Tensor>
1919

2020
// These don't have any parameters, so the only reason to instantiate
2121
// them is performance, since they will be used over and over.
22-
private Module<Tensor, Tensor> pool1 = MaxPool2d(kernelSize: new long[] { 2, 2 });
22+
private Module<Tensor, Tensor> pool1 = MaxPool2d(kernel_size:new long[] { 2, 2 });
2323

2424
private Module<Tensor, Tensor> relu1 = ReLU();
2525
private Module<Tensor, Tensor> relu2 = ReLU();

‎src/CSharp/Models/MobileNet.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public MobileNet(string name, int numClasses, Device device = null) : base(name)
3131

3232
var modules = new List<(string, Module<Tensor,Tensor>)>();
3333

34-
modules.Add(($"conv2d-first", Conv2d(3, 32, kernelSize: 3, stride: 1, padding: 1, bias: false)));
34+
modules.Add(($"conv2d-first", Conv2d(3, 32, kernel_size:3, stride: 1, padding: 1, bias: false)));
3535
modules.Add(($"bnrm2d-first", BatchNorm2d(32)));
3636
modules.Add(($"relu-first", ReLU()));
3737
MakeLayers(modules, 32);
@@ -54,10 +54,10 @@ private void MakeLayers(List<(string, Module<Tensor, Tensor>)> modules, long in_
5454
var out_planes = planes[i];
5555
var stride = strides[i];
5656

57-
modules.Add(($"conv2d-{i}a", Conv2d(in_planes, in_planes, kernelSize: 3, stride: stride, padding: 1, groups: in_planes, bias: false)));
57+
modules.Add(($"conv2d-{i}a", Conv2d(in_planes, in_planes, kernel_size:3, stride: stride, padding: 1, groups: in_planes, bias: false)));
5858
modules.Add(($"bnrm2d-{i}a", BatchNorm2d(in_planes)));
5959
modules.Add(($"relu-{i}a", ReLU()));
60-
modules.Add(($"conv2d-{i}b", Conv2d(in_planes, out_planes, kernelSize: 1L, stride: 1L, padding: 0L, bias: false)));
60+
modules.Add(($"conv2d-{i}b", Conv2d(in_planes, out_planes, kernel_size:1L, stride: 1L, padding: 0L, bias: false)));
6161
modules.Add(($"bnrm2d-{i}b", BatchNorm2d(out_planes)));
6262
modules.Add(($"relu-{i}b", ReLU()));
6363

‎src/CSharp/Models/Models.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="TorchSharp-cpu" Version="0.102.0" />
9-
<PackageReference Include="TorchVision" Version="0.102.0" />
8+
<PackageReference Include="TorchSharp-cpu" Version="0.104.0" />
9+
<PackageReference Include="TorchVision" Version="0.104.0" />
1010
</ItemGroup>
1111

1212
</Project>

‎src/CSharp/Models/ResNet.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public ResNet(string name, Func<string, int,int,int, Module<Tensor, Tensor>> blo
7777

7878
var modules = new List<(string, Module<Tensor, Tensor>)>();
7979

80-
modules.Add(($"conv2d-first", Conv2d(3, 64, kernelSize: 3, stride: 1, padding: 1, bias: false)));
80+
modules.Add(($"conv2d-first", Conv2d(3, 64, kernel_size:3, stride: 1, padding: 1, bias: false)));
8181
modules.Add(($"bnrm2d-first", BatchNorm2d(64)));
8282
modules.Add(($"relu-first", ReLU(inplace:true)));
8383
MakeLayer(modules, block, expansion, 64, num_blocks[0], 1);
@@ -120,17 +120,17 @@ public BasicBlock (string name, int in_planes, int planes, int stride) : base(na
120120
{
121121
var modules = new List<(string, Module<Tensor, Tensor>)>();
122122

123-
modules.Add(($"{name}-conv2d-1", Conv2d(in_planes, planes, kernelSize: 3, stride: stride, padding: 1, bias: false)));
123+
modules.Add(($"{name}-conv2d-1", Conv2d(in_planes, planes, kernel_size:3, stride: stride, padding: 1, bias: false)));
124124
modules.Add(($"{name}-bnrm2d-1", BatchNorm2d(planes)));
125125
modules.Add(($"{name}-relu-1", ReLU(inplace: true)));
126-
modules.Add(($"{name}-conv2d-2", Conv2d(planes, planes, kernelSize: 3, stride: 1, padding: 1, bias: false)));
126+
modules.Add(($"{name}-conv2d-2", Conv2d(planes, planes, kernel_size:3, stride: 1, padding: 1, bias: false)));
127127
modules.Add(($"{name}-bnrm2d-2", BatchNorm2d(planes)));
128128

129129
layers = Sequential(modules);
130130

131131
if (stride != 1 || in_planes != expansion*planes) {
132132
shortcut = Sequential(
133-
($"{name}-conv2d-3", Conv2d(in_planes, expansion * planes, kernelSize: 1, stride: stride, bias: false)),
133+
($"{name}-conv2d-3", Conv2d(in_planes, expansion * planes, kernel_size:1, stride: stride, bias: false)),
134134
($"{name}-bnrm2d-3", BatchNorm2d(expansion * planes)));
135135
}
136136
else {
@@ -161,20 +161,20 @@ public Bottleneck(string name, int in_planes, int planes, int stride) : base(nam
161161
{
162162
var modules = new List<(string, Module<Tensor, Tensor>)>();
163163

164-
modules.Add(($"{name}-conv2d-1", Conv2d(in_planes, planes, kernelSize: 1, bias: false)));
164+
modules.Add(($"{name}-conv2d-1", Conv2d(in_planes, planes, kernel_size:1, bias: false)));
165165
modules.Add(($"{name}-bnrm2d-1", BatchNorm2d(planes)));
166166
modules.Add(($"{name}relu-1", ReLU(inplace:true)));
167-
modules.Add(($"{name}-conv2d-2", Conv2d(planes, planes, kernelSize: 3, stride: stride, padding: 1, bias: false)));
167+
modules.Add(($"{name}-conv2d-2", Conv2d(planes, planes, kernel_size:3, stride: stride, padding: 1, bias: false)));
168168
modules.Add(($"{name}-bnrm2d-2", BatchNorm2d(planes)));
169169
modules.Add(($"{name}relu-2", ReLU(inplace: true)));
170-
modules.Add(($"{name}-conv2d-3", Conv2d(planes, expansion * planes, kernelSize: 1, bias: false)));
170+
modules.Add(($"{name}-conv2d-3", Conv2d(planes, expansion * planes, kernel_size:1, bias: false)));
171171
modules.Add(($"{name}-bnrm2d-3", BatchNorm2d(expansion * planes)));
172172

173173
layers = Sequential(modules);
174174

175175
if (stride != 1 || in_planes != expansion * planes) {
176176
shortcut = Sequential(
177-
($"{name}-conv2d-4", Conv2d(in_planes, expansion * planes, kernelSize: 1, stride: stride, bias: false)),
177+
($"{name}-conv2d-4", Conv2d(in_planes, expansion * planes, kernel_size:1, stride: stride, bias: false)),
178178
($"{name}-bnrm2d-4", BatchNorm2d(expansion * planes)));
179179
} else {
180180
shortcut = Sequential();

‎src/CSharp/Models/VGG.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public VGG(string name, int numClasses, Device device = null) : base(name)
3838
for (var i = 0; i < channels.Length; i++) {
3939

4040
if (channels[i] == 0) {
41-
modules.Add(($"MaxPool2d-{i}a", MaxPool2d(kernelSize: 2, stride: 2)));
41+
modules.Add(($"MaxPool2d-{i}a", MaxPool2d(kernel_size:2, stride: 2)));
4242
} else {
43-
modules.Add(($"conv2d-{i}a", Conv2d(in_channels, channels[i], kernelSize: 3, padding: 1)));
43+
modules.Add(($"conv2d-{i}a", Conv2d(in_channels, channels[i], kernel_size:3, padding: 1)));
4444
modules.Add(($"bnrm2d-{i}a", BatchNorm2d(channels[i])));
4545
modules.Add(($"relu-{i}b", ReLU(inplace: true)));
4646
in_channels = channels[i];

‎src/FSharp/FSharpExamples/AdversarialExampleGeneration.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ let test (model:MNIST.Model) (eps:float) (dataLoader:MNISTReader) size =
7777
model.zero_grad()
7878
loss.backward()
7979

80-
use perturbed = attack input (eps.ToScalar()) (input.grad())
80+
use perturbed = attack input (eps.ToScalar()) (input.grad)
8181
use final = perturbed --> model
8282
correct <- correct + final.argmax(1L).eq(labels).sum().ToInt32()
8383
end

‎src/FSharp/FSharpExamples/AlexNet.fs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ let getDataFiles sourceDir targetDir =
4646
type Model(name,device:torch.Device) as this =
4747
inherit Module<torch.Tensor,torch.Tensor>(name)
4848

49-
let features = Sequential(("c1", Conv2d(3L, 64L, kernelSize=3L, stride=2L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
49+
let features = Sequential(("c1", Conv2d(3L, 64L, kernel_size=3L, stride=2L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
5050
("r1", ReLU(inplace=true) :> Module<torch.Tensor,torch.Tensor>),
51-
("mp1", MaxPool2d(kernelSize=[|2L; 2L|]) :> Module<torch.Tensor,torch.Tensor>),
52-
("c2", Conv2d(64L, 192L, kernelSize=3L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
51+
("mp1", MaxPool2d(kernel_size=[|2L; 2L|]) :> Module<torch.Tensor,torch.Tensor>),
52+
("c2", Conv2d(64L, 192L, kernel_size=3L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
5353
("r2", ReLU(inplace=true) :> Module<torch.Tensor,torch.Tensor>),
54-
("mp2", MaxPool2d(kernelSize=[|2L; 2L|]) :> Module<torch.Tensor,torch.Tensor>),
55-
("c3", Conv2d(192L, 384L, kernelSize=3L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
54+
("mp2", MaxPool2d(kernel_size=[|2L; 2L|]) :> Module<torch.Tensor,torch.Tensor>),
55+
("c3", Conv2d(192L, 384L, kernel_size=3L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
5656
("r3", ReLU(inplace=true) :> Module<torch.Tensor,torch.Tensor>),
57-
("c4", Conv2d(384L, 256L, kernelSize=3L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
57+
("c4", Conv2d(384L, 256L, kernel_size=3L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
5858
("r4", ReLU(inplace=true) :> Module<torch.Tensor,torch.Tensor>),
59-
("c5", Conv2d(256L, 256L, kernelSize=3L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
59+
("c5", Conv2d(256L, 256L, kernel_size=3L, padding=1L) :> Module<torch.Tensor,torch.Tensor>),
6060
("r5", ReLU(inplace=true) :> Module<torch.Tensor,torch.Tensor>),
61-
("mp3", MaxPool2d(kernelSize=[|2L; 2L|]) :> Module<torch.Tensor,torch.Tensor>),
61+
("mp3", MaxPool2d(kernel_size=[|2L; 2L|]) :> Module<torch.Tensor,torch.Tensor>),
6262
("avg", AdaptiveAvgPool2d([|2L; 2L|]) :> Module<torch.Tensor,torch.Tensor>))
6363

6464
let classifier = Sequential(("d1", Dropout() :> Module<torch.Tensor,torch.Tensor>),
@@ -174,8 +174,6 @@ let run epochs =
174174
trainBatchSize <- trainBatchSize * 8
175175
testBatchSize <- testBatchSize * 8
176176

177-
let epochs = if device.``type`` = DeviceType.CUDA then epochs * 4 else epochs
178-
179177
printfn ""
180178
printfn $"\tRunning AlexNet with {dataset} on {device.``type``.ToString()} for {epochs} epochs"
181179
printfn ""

‎src/FSharp/FSharpExamples/FSharpExamples.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="TorchSharp-cpu" Version="0.102.0" />
23-
<PackageReference Include="TorchVision" Version="0.102.0" />
22+
<PackageReference Include="TorchSharp-cpu" Version="0.104.0" />
23+
<PackageReference Include="TorchVision" Version="0.104.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎src/FSharp/FSharpExamples/MNIST.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ type Model(name,device:torch.Device) as this =
6262
let fc1 = Linear(9216L, 128L)
6363
let fc2 = Linear(128L, 10L)
6464

65-
let pool1 = MaxPool2d(kernelSize=[|2L; 2L|])
65+
let pool1 = MaxPool2d(kernel_size=[|2L; 2L|])
6666

6767
let relu = ReLU()
6868

‎src/Utils/Examples.Utils.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<ItemGroup>
1212
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1313
<PackageReference Include="SharpZipLib" Version="1.4.2" />
14-
<PackageReference Include="TorchSharp-cpu" Version="0.102.0" />
15-
<PackageReference Include="TorchVision" Version="0.102.0" />
14+
<PackageReference Include="TorchSharp-cpu" Version="0.104.0" />
15+
<PackageReference Include="TorchVision" Version="0.104.0" />
1616
</ItemGroup>
1717

1818
</Project>

0 commit comments

Comments
 (0)
0