Skip to content

Commit

Permalink
Merge branch 'gh-pages' of https://github.com/tensorspace-team/tensor…
Browse files Browse the repository at this point in the history 
…space into gh-pages
  • Loading branch information
@syt123450
syt123450 committed Nov 27, 2018
2 parents ccd1bcc + ba07b45 commit aa17b0a
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 48 deletions.
61 changes: 39 additions & 22 deletions html/docs/modelFunctional.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,9 @@

...
// necessary configurations
inputs: [input],
outputs: [addLayer],
outputsOrder: ["input", "conv1", "conv2", "conv3", "add"],
inputs: [ input ],
outputs: [ addLayer ],
outputsOrder: [ "conv1", "conv2", "conv3", "add" ],
layerShape: "rect",
layerInitStatus: "close",
stats: true
Expand All @@ -351,48 +351,65 @@
</div>

<div class="code-snippet">
<pre><code class="Javascript">let input = new TSP.layers.GreyscaleInput({
shape: [28, 28, 1]
});
<pre><code class="Javascript">let input = new TSP.layers.GreyscaleInput( {

shape: [ 28, 28, 1 ]

} );

let layer1 = new TSP.layers.Conv2d( {

let layer1 = new TSP.layers.Conv2d({
kernelSize: 2,
filters: 36,
strides: 1,
padding: "same"
});
padding: "same",
name: "conv1"

} );

layer1.apply( input );

let layer2 = new TSP.layers.Conv2d({
let layer2 = new TSP.layers.Conv2d( {

kernelSize: 2,
filters: 36,
strides: 1,
padding: "same"
});
padding: "same",
name: "conv2"

} );

layer2.apply( input );

let layer3 = new TSP.layers.Conv2d({
let layer3 = new TSP.layers.Conv2d( {

kernelSize: 2,
filters: 4,
strides: 1,
padding: "same"
});
padding: "same",
name: "conv3"

} );

layer3.apply( layer2 );

let addLayer = new TSP.layers.Add([layer1, layer3]);
let addLayer = new TSP.layers.Add(

[ layer1, layer3 ],

{ name: "add" }

);

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

...
inputs: [input],
outputs: [addLayer],
outputsOrder: ["input", "conv1", "conv2", "conv3", "add"],
inputs: [ input ],
outputs: [ addLayer ],
outputsOrder: [ "conv1", "conv2", "conv3", "add" ],
...

});</code></pre>
} );</code></pre>
</div>

<div>
Expand Down Expand Up @@ -470,10 +487,10 @@
Represents the list of all layer object names in the model.
</li>
<li class="panel-heading"><i class="material-icons">filter_center_focus</i>
To show the order of all layers.
Each name string in the list corresponds to the <span class="span_bold">"name"</span> property of the TSP.Layer object in the TSP model.
</li>
<li class="panel-heading"><i class="material-icons">filter_center_focus</i>
The order of the output represents the intermediate outputs computed from the preprocessed ML model.
The order of the list matches the order of intermediate outputs computed from the preprocessed deep learning model.
</li>
</ul>
</div>
Expand Down
65 changes: 41 additions & 24 deletions html/docs/modelFunctional_zh.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,10 @@
<pre><code class="Javascript">let model = new TSP.model.Model( container, {

...
// necessary configurations
inputs: [input],
outputs: [addLayer],
outputsOrder: ["input", "conv1", "conv2", "conv3", "add"],
// 模型参数配置
inputs: [ input ],
outputs: [ addLayer ],
outputsOrder: [ "conv1", "conv2", "conv3", "add" ],
layerShape: "rect",
layerInitStatus: "close",
stats: true
Expand All @@ -350,48 +350,65 @@
</div>

<div class="code-snippet">
<pre><code class="Javascript">let input = new TSP.layers.GreyscaleInput({
shape: [28, 28, 1]
});
<pre><code class="Javascript">let input = new TSP.layers.GreyscaleInput( {

shape: [ 28, 28, 1 ]

} );

let layer1 = new TSP.layers.Conv2d( {

let layer1 = new TSP.layers.Conv2d({
kernelSize: 2,
filters: 36,
strides: 1,
padding: "same"
});
padding: "same",
name: "conv1"

} );

layer1.apply( input );

let layer2 = new TSP.layers.Conv2d({
let layer2 = new TSP.layers.Conv2d( {

kernelSize: 2,
filters: 36,
strides: 1,
padding: "same"
});
padding: "same",
name: "conv2"

} );

layer2.apply( input );

let layer3 = new TSP.layers.Conv2d({
let layer3 = new TSP.layers.Conv2d( {

kernelSize: 2,
filters: 4,
strides: 1,
padding: "same"
});
padding: "same",
name: "conv3"

} );

layer3.apply( layer2 );

let addLayer = new TSP.layers.Add([layer1, layer3]);
let addLayer = new TSP.layers.Add(

[ layer1, layer3 ],

{ name: "add" }

);

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

...
inputs: [input],
outputs: [addLayer],
outputsOrder: ["input", "conv1", "conv2", "conv3", "add"],
inputs: [ input ],
outputs: [ addLayer ],
outputsOrder: [ "conv1", "conv2", "conv3", "add" ],
...

});</code></pre>
} );</code></pre>
</div>

<div>
Expand Down Expand Up @@ -423,7 +440,7 @@
</div>


<div class="sub-title" id="modelConfig"> Property </div>
<div class="sub-title" id="modelConfig"> 属性 </div>

<div class="property-title"><a href="https://github.com/tensorspace-team/tensorspace/blob/master/src/tsp-model/Model.js#L257">.inputs</a> : Layer[]</div>
<div>
Expand Down Expand Up @@ -468,7 +485,7 @@
表示输出层对象的名称列表。
</li>
<li class="panel-heading"><i class="material-icons">filter_center_focus</i>
展示输出层对象的输出顺序。
列表中的每一个名称对应了 TSP 模型中，各个 TSP.Layer 对象的 "name" 属性的值。
</li>
<li class="panel-heading"><i class="material-icons">filter_center_focus</i>
其输出顺序代表了预处理的神经网络模型的中间层计算输出的顺序。
Expand Down Expand Up @@ -548,7 +565,7 @@
</ul>
</div>

<div class="sub-title" id="modelMethod"> Method </div>
<div class="sub-title" id="modelMethod"> 方法 </div>

<div id="init" class="property-title"><a href="https://github.com/tensorspace-team/tensorspace/blob/master/src/tsp-model/AbstractModel.js#L255">.init( callback )</a> : void</div>
<div>
Expand Down
2 changes: 1 addition & 1 deletion html/docs/modelSequential.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@
</ul>
</div>

<div id="predict" class="property-title"><a href="https://github.com/tensorspace-team/tensorspace/blob/master/src/tsp-model/Sequential.js#L239">.add( layer )</a> : void</div>
<div class="property-title"><a href="https://github.com/tensorspace-team/tensorspace/blob/master/src/tsp-model/Sequential.js#L239">.add( layer )</a> : void</div>
<div>
<ul class="list-content">
<li class="panel-heading"><i class="material-icons">filter_center_focus</i>
Expand Down
2 changes: 1 addition & 1 deletion html/docs/modelSequential_zh.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@
</ul>
</div>

<div id="predict" class="property-title"><a href="https://github.com/tensorspace-team/tensorspace/blob/master/src/tsp-model/Sequential.js#L239">.add( layer )</a> : void</div>
<div class="property-title"><a href="https://github.com/tensorspace-team/tensorspace/blob/master/src/tsp-model/Sequential.js#L239">.add( layer )</a> : void</div>
<div>
<ul class="list-content">
<li class="panel-heading"><i class="material-icons">filter_center_focus</i>
Expand Down

0 comments on commit aa17b0a

Please sign in to comment.