Merge branch 'master' of bitbucket.org:sudhargk/python-dnn

Conflicts:
	run/run_CNN.py
	utils/load_conf.py

Author: abilng

config/CNN/data_spec.json config/CNN/NP/data_spec.jsonconfig/CNN/data_spec.json renamed to config/CNN/NP/data_spec.json

@@ -8,14 +8,11 @@
 	"comment" : "valid_data (Mandatory) specify the path of the validation data relative to the working directory",
 	"data_spec" : "data_spec.json",
 
-	"comment" : "nnet_spec :: (Mandatory) specify the path of network configuration specification relative to working directory",
-	"nnet_spec" : "conv_spec.json",
-
-	"comment" : "hidden_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
-	"hidden_output_file" : "hidden_out.model",
+	"comment" : "hidden_nnet_spec :: (Mandatory) specify the path of hidden network configuration specification relative to working directory",
+	"nnet_spec" : "nnet_spec.json",
 
-	"comment" : "conv_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
-	"conv_output_file" : "conv_out.model",
+	"comment" : "hidden_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
+	"output_file" : "hidden_out.model",
 
 	"comment" : "conv_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
 	"output_file" : "conv_out.model",
@@ -47,13 +44,12 @@
 			"min_epoch_decay_start" : 15,
 			"init_error" :100
 		},
-
+	
 	"processes":{
 		"pretraining":false,
 		"finetuning":true,
 		"testing":true,
 		"export_data":false
 	},
-	
 	"export_path" : "data/export"
 }

config/CNN/model_conf.json config/CNN/NP/model_conf.jsonconfig/CNN/model_conf.json renamed to config/CNN/NP/model_conf.json

@@ -0,0 +1,37 @@
+{
+	"comment" : "layers :: convolution layer configuration",
+	"cnn": {
+	   "layers": [
+			{
+				"convmat_dim" : [5,5],
+				"num_filters" : 100,
+				"poolsize" :  [2,2],
+				"flatten" : false,
+				"update" : true
+			},
+			{
+				"convmat_dim" : [4,4],
+				"num_filters" : 200,
+				"poolsize" :  [2,2],
+				"flatten" : true,
+				"update" : true
+			}
+		],
+
+	  "comment" : "activation :: sigmoid or tanh",
+	  "activation" : "tanh",
+
+	  "comment" : "use_fast :: To use pylearn2 library for faster computation or not",
+	  "use_fast" : false
+	},
+	
+	"comment" : "layers :: hidden layer configuration",
+	"mlp" : {
+	
+	   "layers": [500,200],
+
+	   "comment" : "activation :: sigmoid or tanh",
+	   "activation" : "tanh"
+	}
+}
+

config/CNN/NP/nnet_spec.json

@@ -8,14 +8,14 @@
 	"comment" : "valid_data (Mandatory) specify the path of the validation data relative to the working directory",
 	"data_spec" : "data_spec.json",
 
-	"comment" : "conv_nnet_spec :: (Mandatory) specify the path of convolution network configuration specification relative to working directory",
-	"nnet_spec" : "conv_spec.json",
+	"comment" : "nnet_spec :: (Mandatory) specify the path of convolution network configuration specification relative to working directory",
+	"nnet_spec" : "nnet_spec.json",
 
 	"comment" : "hidden_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
-	"hidden_output_file" : "hidden_out.model",
+	"output_file" : "hidden_out.model",
 
 	"comment" : "conv_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
-	"conv_output_file" : "conv_out.model",
+	"output_file" : "conv_out.model",
 
 	"comment" : "input_shape :: (Mandatory) specify the input shape of a given feature vector" ,
 	"input_shape" : [1,10,5],
@@ -49,7 +49,7 @@
 		"pretraining":false,
 		"finetuning":true,
 		"testing":true,
-		"export_data":false,
+		"export_data":false
 	},
 
 	"export_path" : "data/export"

config/CNN/README

@@ -0,0 +1,29 @@
+{
+	"comment" : "layers :: convolution layer configuration",
+	"cnn" : {
+	   "layers": [
+			{
+				"convmat_dim" : [3,2],
+				"num_filters" : 100,
+				"poolsize" :  [2,2],
+				"flatten" : true,
+				"update" : true
+			}
+
+		],
+
+	   "comment" : "activation :: sigmoid or tanh",
+	   "activation" : "tanh",
+
+	  "comment" : "use_fast :: To use pylearn2 library for faster computation or not",
+	  "use_fast" : false
+	},
+	
+	"comment" : "layers :: hidden layer configuration",
+	"mlp" : {
+	   "layers": [100,200],
+
+	   "comment" : "activation :: sigmoid or tanh",
+	   "activation" : "tanh"
+	}
+}