Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ae93517

Browse files
zchholmeszchholmes
committed
update code examples for Functional Model
1 parent 0a887f9 commit ae93517

File tree

2 files changed

+75
-41
lines changed

2 files changed

+75
-41
lines changed

‎html/docs/modelFunctional.html

+37-20
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,9 @@
334334

335335
...
336336
// necessary configurations
337-
inputs: [input],
338-
outputs: [addLayer],
339-
outputsOrder: ["input", "conv1", "conv2", "conv3", "add"],
337+
inputs: [ input ],
338+
outputs: [ addLayer ],
339+
outputsOrder: [ "conv1", "conv2", "conv3", "add" ],
340340
layerShape: "rect",
341341
layerInitStatus: "close",
342342
stats: true
@@ -351,48 +351,65 @@
351351
</div>
352352

353353
<div class="code-snippet">
354-
<pre><code class="Javascript">let input = new TSP.layers.GreyscaleInput({
355-
shape: [28, 28, 1]
356-
});
354+
<pre><code class="Javascript">let input = new TSP.layers.GreyscaleInput( {
355+
356+
shape: [ 28, 28, 1 ]
357+
358+
} );
359+
360+
let layer1 = new TSP.layers.Conv2d( {
357361

358-
let layer1 = new TSP.layers.Conv2d({
359362
kernelSize: 2,
360363
filters: 36,
361364
strides: 1,
362-
padding: "same"
363-
});
365+
padding: "same",
366+
name: "conv1"
367+
368+
} );
364369

365370
layer1.apply( input );
366371

367-
let layer2 = new TSP.layers.Conv2d({
372+
let layer2 = new TSP.layers.Conv2d( {
373+
368374
kernelSize: 2,
369375
filters: 36,
370376
strides: 1,
371-
padding: "same"
372-
});
377+
padding: "same",
378+
name: "conv2"
379+
380+
} );
373381

374382
layer2.apply( input );
375383

376-
let layer3 = new TSP.layers.Conv2d({
384+
let layer3 = new TSP.layers.Conv2d( {
385+
377386
kernelSize: 2,
378387
filters: 4,
379388
strides: 1,
380-
padding: "same"
381-
});
389+
padding: "same",
390+
name: "conv3"
391+
392+
} );
382393

383394
layer3.apply( layer2 );
384395

385-
let addLayer = new TSP.layers.Add([layer1, layer3]);
396+
let addLayer = new TSP.layers.Add(
397+
398+
[ layer1, layer3 ],
399+
400+
{ name: "add" }
401+
402+
);
386403

387404
let model = new TSP.model.Model(container, {
388405

389406
...
390-
inputs: [input],
391-
outputs: [addLayer],
392-
outputsOrder: ["input", "conv1", "conv2", "conv3", "add"],
407+
inputs: [ input ],
408+
outputs: [ addLayer ],
409+
outputsOrder: [ "conv1", "conv2", "conv3", "add" ],
393410
...
394411

395-
});</code></pre>
412+
} );</code></pre>
396413
</div>
397414

398415
<div>

‎html/docs/modelFunctional_zh.html

+38-21
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,10 @@
333333
<pre><code class="Javascript">let model = new TSP.model.Model( container, {
334334

335335
...
336-
// necessary configurations
337-
inputs: [input],
338-
outputs: [addLayer],
339-
outputsOrder: ["input", "conv1", "conv2", "conv3", "add"],
336+
// 模型参数配置
337+
inputs: [ input ],
338+
outputs: [ addLayer ],
339+
outputsOrder: [ "conv1", "conv2", "conv3", "add" ],
340340
layerShape: "rect",
341341
layerInitStatus: "close",
342342
stats: true
@@ -350,48 +350,65 @@
350350
</div>
351351

352352
<div class="code-snippet">
353-
<pre><code class="Javascript">let input = new TSP.layers.GreyscaleInput({
354-
shape: [28, 28, 1]
355-
});
353+
<pre><code class="Javascript">let input = new TSP.layers.GreyscaleInput( {
354+
355+
shape: [ 28, 28, 1 ]
356+
357+
} );
358+
359+
let layer1 = new TSP.layers.Conv2d( {
356360

357-
let layer1 = new TSP.layers.Conv2d({
358361
kernelSize: 2,
359362
filters: 36,
360363
strides: 1,
361-
padding: "same"
362-
});
364+
padding: "same",
365+
name: "conv1"
366+
367+
} );
363368

364369
layer1.apply( input );
365370

366-
let layer2 = new TSP.layers.Conv2d({
371+
let layer2 = new TSP.layers.Conv2d( {
372+
367373
kernelSize: 2,
368374
filters: 36,
369375
strides: 1,
370-
padding: "same"
371-
});
376+
padding: "same",
377+
name: "conv2"
378+
379+
} );
372380

373381
layer2.apply( input );
374382

375-
let layer3 = new TSP.layers.Conv2d({
383+
let layer3 = new TSP.layers.Conv2d( {
384+
376385
kernelSize: 2,
377386
filters: 4,
378387
strides: 1,
379-
padding: "same"
380-
});
388+
padding: "same",
389+
name: "conv3"
390+
391+
} );
381392

382393
layer3.apply( layer2 );
383394

384-
let addLayer = new TSP.layers.Add([layer1, layer3]);
395+
let addLayer = new TSP.layers.Add(
396+
397+
[ layer1, layer3 ],
398+
399+
{ name: "add" }
400+
401+
);
385402

386403
let model = new TSP.model.Model(container, {
387404

388405
...
389-
inputs: [input],
390-
outputs: [addLayer],
391-
outputsOrder: ["input", "conv1", "conv2", "conv3", "add"],
406+
inputs: [ input ],
407+
outputs: [ addLayer ],
408+
outputsOrder: [ "conv1", "conv2", "conv3", "add" ],
392409
...
393410

394-
});</code></pre>
411+
} );</code></pre>
395412
</div>
396413

397414
<div>

0 commit comments

Comments
 (0)