layer level attribute for layers and add support in models (#144)

tensorspace-team · Nov 29, 2018 · d2a00a4 · d2a00a4
1 parent 2cb4ce3
commit d2a00a4
Show file tree

Hide file tree

Showing 42 changed files with 91 additions and 42 deletions.
diff --git a/src/layer/abstract/Layer.js b/src/layer/abstract/Layer.js
@@ -250,6 +250,20 @@ function Layer( config ) {
 
 	this.layerType = undefined;
 
+	/**
+	 * The place for Layer in model, measured by y-axis in 3d scene.
+	 * For Sequential model:
+	 * 		the "layerLevel" will be the same as "layerIndex".
+	 * 		the layerLevel will be unique for all layers.
+	 * For Functional model:
+	 * 		the "layerLevel" may be the same for several layers.
+	 * 		these layers has different "layerIndex".
+	 *
+	 * @type { Int }
+	 */
+
+	this.layerLevel = undefined;
+
 	// Load layer config.
 
 	this.loadBasicLayerConfig( config );
@@ -497,7 +511,7 @@ Layer.prototype = {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 	},
 

diff --git a/src/layer/abstract/MergedLayer.js b/src/layer/abstract/MergedLayer.js
@@ -117,7 +117,7 @@ MergedLayer.prototype = Object.assign( Object.create( Layer.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 	},
 

diff --git a/src/layer/abstract/MergedLayer1d.js b/src/layer/abstract/MergedLayer1d.js
@@ -219,9 +219,10 @@ MergedLayer1d.prototype = Object.assign( Object.create( MergedLayer.prototype ),
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		// Validate whether user's input merged elements can be merged in this kind of merge operation.
 

diff --git a/src/layer/abstract/MergedLayer2d.js b/src/layer/abstract/MergedLayer2d.js
@@ -116,9 +116,10 @@ MergedLayer2d.prototype = Object.assign( Object.create( MergedLayer.prototype ),
 
 	},
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		// Validate whether user's input merged elements can be merged in this kind of merge operation.
 

diff --git a/src/layer/abstract/MergedLayer3d.js b/src/layer/abstract/MergedLayer3d.js
@@ -170,9 +170,10 @@ MergedLayer3d.prototype = Object.assign( Object.create( MergedLayer.prototype ),
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		// Validate whether user's input merged elements can be merged in this kind of merge operation.
 

diff --git a/src/layer/abstract/NativeLayer.js b/src/layer/abstract/NativeLayer.js
@@ -110,7 +110,7 @@ NativeLayer.prototype = Object.assign( Object.create( Layer.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 	},
 

diff --git a/src/layer/abstract/NativeLayer1d.js b/src/layer/abstract/NativeLayer1d.js
@@ -1055,7 +1055,7 @@ NativeLayer1d.prototype = Object.assign( Object.create( NativeLayer.prototype ),
 	 * @param { int } layerIndex, this layer's order in model.
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 	},
 

diff --git a/src/layer/abstract/NativeLayer2d.js b/src/layer/abstract/NativeLayer2d.js
@@ -687,7 +687,7 @@ NativeLayer2d.prototype = Object.assign( Object.create( NativeLayer.prototype ),
 	 * @param { int } layerIndex, this layer's order in model.
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 	},
 

diff --git a/src/layer/abstract/NativeLayer3d.js b/src/layer/abstract/NativeLayer3d.js
@@ -729,7 +729,7 @@ NativeLayer3d.prototype = Object.assign( Object.create( NativeLayer.prototype ),
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 	},
 

diff --git a/src/layer/input/GreyscaleInput.js b/src/layer/input/GreyscaleInput.js
@@ -138,9 +138,10 @@ GreyscaleInput.prototype = Object.assign( Object.create( NativeLayer.prototype )
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 	},
 

diff --git a/src/layer/input/Input1d.js b/src/layer/input/Input1d.js
@@ -137,9 +137,10 @@ Input1d.prototype = Object.assign( Object.create( NativeLayer.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 	},
 

diff --git a/src/layer/input/RGBInput.js b/src/layer/input/RGBInput.js
@@ -178,9 +178,10 @@ RGBInput.prototype = Object.assign( Object.create( NativeLayer.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 	},
 

diff --git a/src/layer/intermediate/Activation1d.js b/src/layer/intermediate/Activation1d.js
@@ -52,9 +52,10 @@ Activation1d.prototype = Object.assign( Object.create( NativeLayer1d.prototype )
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Activation2d.js b/src/layer/intermediate/Activation2d.js
@@ -52,9 +52,10 @@ Activation2d.prototype = Object.assign( Object.create( NativeLayer2d.prototype )
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Activation3d.js b/src/layer/intermediate/Activation3d.js
@@ -52,9 +52,10 @@ Activation3d.prototype = Object.assign( Object.create( NativeLayer3d.prototype )
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/BasicLayer1d.js b/src/layer/intermediate/BasicLayer1d.js
@@ -44,9 +44,10 @@ BasicLayer1d.prototype = Object.assign( Object.create( NativeLayer1d.prototype )
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		// Unit length is the same as last layer, use unit length to calculate actualWidth which is used to create three.js object.
 

diff --git a/src/layer/intermediate/BasicLayer2d.js b/src/layer/intermediate/BasicLayer2d.js
@@ -45,9 +45,10 @@ BasicLayer2d.prototype = Object.assign( Object.create( NativeLayer2d.prototype )
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		// Unit length is the same as last layer, use unit length to calculate actualWidth and actualHeight which are used to create three.js object.
 

diff --git a/src/layer/intermediate/BasicLayer3d.js b/src/layer/intermediate/BasicLayer3d.js
@@ -45,9 +45,10 @@ BasicLayer3d.prototype = Object.assign( Object.create( NativeLayer3d.prototype )
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function ( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		// Unit length is the same as last layer, use unit length to calculate actualWidth and actualHeight which are used to create three.js object.
 

diff --git a/src/layer/intermediate/Conv1d.js b/src/layer/intermediate/Conv1d.js
@@ -103,9 +103,10 @@ Conv1d.prototype = Object.assign( Object.create( NativeLayer2d.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Conv2d.js b/src/layer/intermediate/Conv2d.js
@@ -107,9 +107,10 @@ Conv2d.prototype = Object.assign( Object.create( NativeLayer3d.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function ( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Conv2dTranspose.js b/src/layer/intermediate/Conv2dTranspose.js
@@ -107,9 +107,10 @@ Conv2dTranspose.prototype = Object.assign( Object.create( NativeLayer3d.prototyp
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Cropping1d.js b/src/layer/intermediate/Cropping1d.js
@@ -61,9 +61,10 @@ Cropping1d.prototype = Object.assign( Object.create( NativeLayer2d.prototype ),
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Cropping2d.js b/src/layer/intermediate/Cropping2d.js
@@ -62,9 +62,10 @@ Cropping2d.prototype = Object.assign( Object.create( NativeLayer3d.prototype ),
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Dense.js b/src/layer/intermediate/Dense.js
@@ -44,9 +44,10 @@ Dense.prototype = Object.assign( Object.create( NativeLayer1d.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		// Unit length is the same as last layer, use unit length to calculate actualWidth which is used to create three.js object.
 

diff --git a/src/layer/intermediate/DepthwiseConv2d.js b/src/layer/intermediate/DepthwiseConv2d.js
@@ -79,9 +79,10 @@ DepthwiseConv2d.prototype = Object.assign( Object.create( NativeLayer3d.prototyp
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function ( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Flatten.js b/src/layer/intermediate/Flatten.js
@@ -44,9 +44,10 @@ Flatten.prototype = Object.assign( Object.create( NativeLayer1d.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		let units = 1;
 

diff --git a/src/layer/intermediate/GlobalPooling1d.js b/src/layer/intermediate/GlobalPooling1d.js
@@ -49,9 +49,10 @@ GlobalPooling1d.prototype = Object.assign( Object.create( NativeLayer2d.prototyp
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 		this.depth = this.inputShape[ 1 ];

diff --git a/src/layer/intermediate/GlobalPooling2d.js b/src/layer/intermediate/GlobalPooling2d.js
@@ -50,9 +50,10 @@ GlobalPooling2d.prototype = Object.assign( Object.create( NativeLayer3d.prototyp
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.depth = this.lastLayer.depth;
 

diff --git a/src/layer/intermediate/Padding1d.js b/src/layer/intermediate/Padding1d.js
@@ -62,9 +62,10 @@ Padding1d.prototype = Object.assign( Object.create( NativeLayer2d.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Padding2d.js b/src/layer/intermediate/Padding2d.js
@@ -66,9 +66,10 @@ Padding2d.prototype = Object.assign( Object.create( NativeLayer3d.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		// Calculate layer's shape from last layer and user's configuration.
 

diff --git a/src/layer/intermediate/Pooling1d.js b/src/layer/intermediate/Pooling1d.js
@@ -78,9 +78,10 @@ Pooling1d.prototype = Object.assign( Object.create( NativeLayer2d.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;
 

diff --git a/src/layer/intermediate/Pooling2d.js b/src/layer/intermediate/Pooling2d.js
@@ -82,9 +82,10 @@ Pooling2d.prototype = Object.assign( Object.create( NativeLayer3d.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.depth = this.lastLayer.depth;
 

diff --git a/src/layer/intermediate/Reshape1d.js b/src/layer/intermediate/Reshape1d.js
@@ -63,9 +63,10 @@ Reshape1d.prototype = Object.assign( Object.create( NativeLayer1d.prototype ), {
 	 * @param { int } layerIndex, this layer's order in model
 	 */
 
-	assemble: function( layerIndex ) {
+	assemble: function( layerIndex, layerLevel ) {
 
 		this.layerIndex = layerIndex;
+		this.layerLevel = layerLevel;
 
 		this.inputShape = this.lastLayer.outputShape;