Fix: Make proxy layer compatible with empty functional model

tensorspace-team · Apr 20, 2019 · 7fd32f5 · 7fd32f5
1 parent b90869b
commit 7fd32f5
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 3 deletions.
diff --git a/src/layer/intermediate/Reshape.js b/src/layer/intermediate/Reshape.js
@@ -61,9 +61,22 @@ function Reshape( config ) {
 	this.actualHeight = undefined;
 	this.actualDepth = undefined;
 
+	this.depth = undefined;
+
 	this.layerDimension = undefined;
 	this.openFmCenters = undefined;
 
+	this.lastLayer = undefined;
+
+	if ( config !== undefined &&
+		( config.targetShape !== undefined || config.shape !== undefined ) ) {
+
+		this.setReshapeType();
+		this.createActualLayer();
+		this.updateLayerMetric();
+
+	}
+
 }
 
 Reshape.prototype = {
@@ -114,10 +127,14 @@ Reshape.prototype = {
 		this.actualHeight = this.actualLayer.actualHeight;
 		this.actualDepth = this.actualLayer.actualDepth;
 
+		this.depth = this.actualLayer.depth;
+
 		this.layerDimension = this.actualLayer.layerDimension;
 
 		this.openFmCenters = this.actualLayer.openFmCenters;
 
+		this.lastLayer = this.actualLayer.lastLayer;
+
 	},
 
 	/**
@@ -166,6 +183,13 @@ Reshape.prototype = {
 
 	setEnvironment: function( context, model ) {
 
+		if ( this.actualLayer === undefined ) {
+
+			this.createActualLayer();
+			this.updateLayerMetric();
+
+		}
+
 		this.actualLayer.setEnvironment( context, model );
 
 	},
@@ -212,6 +236,20 @@ Reshape.prototype = {
 
 	},
 
+	translateLayer: function( targetCenter, translateTime ) {
+
+		this.actualLayer.translateLayer( targetCenter, translateTime );
+
+	},
+
+	apply: function( lastLayer ) {
+
+		this.actualLayer.apply( lastLayer );
+
+		this.updateLayerMetric();
+
+	},
+
 	setShape: function( shape ) {
 
 		// Based on shape dimension, update proxy states.
@@ -246,6 +284,15 @@ Reshape.prototype = {
 
 	assemble: function() {
 
+		this.setReshapeType();
+
+		this.actualLayer.assemble();
+		this.updateLayerMetric();
+
+	},
+
+	setReshapeType: function() {
+
 		// If "setShape" has been called before, there is no need to check "shape" attribute or "targetShape" attribute in config.
 
 		if ( this.reshapeType === undefined ) {
@@ -308,9 +355,6 @@ Reshape.prototype = {
 
 		}
 
-		this.actualLayer.assemble();
-		this.updateLayerMetric();
-
 	}
 
 };

diff --git a/src/merge/proxy/MergeProxy.js b/src/merge/proxy/MergeProxy.js
@@ -45,6 +45,8 @@ function MergeProxy( operatorType, layerList, config ) {
 	this.actualHeight = undefined;
 	this.actualDepth = undefined;
 
+	this.depth = undefined;
+
 	this.layerDimension = undefined;
 
 	this.openFmCenters = undefined;
@@ -89,6 +91,8 @@ MergeProxy.prototype = {
 		this.actualHeight = this.actualLayer.actualHeight;
 		this.actualDepth = this.actualLayer.actualDepth;
 
+		this.depth = this.actualLayer.depth;
+
 		this.layerDimension = this.actualLayer.layerDimension;
 
 		this.openFmCenters = this.actualLayer.openFmCenters;
@@ -136,6 +140,14 @@ MergeProxy.prototype = {
 
 	setEnvironment: function( context, model ) {
 
+		if ( this.actualLayer === undefined ) {
+
+			MergeValidator.validateDimension( this.layerList );
+			this.createActualLayer();
+			this.updateLayerMetric();
+
+		}
+
 		this.actualLayer.setEnvironment( context, model );
 
 	},
@@ -188,6 +200,12 @@ MergeProxy.prototype = {
 
 	},
 
+	translateLayer: function( targetCenter, translateTime ) {
+
+		this.actualLayer.translateLayer( targetCenter, translateTime );
+
+	},
+
 	setShape: function( shape ) {
 
 		// make sure the input elements have the same dimension.