Skip to content

Commit a9be9b7

Browse files
committed
stable:: resolved the nnet-spec properties,tested on cnn
1 parent 54c663e commit a9be9b7

18 files changed

Lines changed: 33 additions & 288 deletions

config/CNN/NP/data_spec.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"random" : true,
77
"random_seed" : 123,
88
"dim_shuffle" : [0,3,2,1],
9-
"batch_size": 256,
109
"keep_flatten" : false,
1110
"reader_type" : "NP"
1211
},
@@ -18,7 +17,6 @@
1817
"random" : true,
1918
"random_seed" : 123,
2019
"dim_shuffle" : [0,3,2,1],
21-
"batch_size": 256,
2220
"keep_flatten" : false,
2321
"reader_type" : "NP"
2422
},
@@ -30,7 +28,6 @@
3028
"random" : true,
3129
"random_seed" : 123,
3230
"dim_shuffle" : [0,3,2,1],
33-
"batch_size": 256,
3431
"keep_flatten" : false,
3532
"reader_type" : "NP"
3633
}

config/CNN/NP/model_conf.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
"wdir" : "wdir",
77

88
"comment" : "valid_data (Mandatory) specify the path of the validation data relative to the working directory",
9-
"data_spec" : "config/CNN/NP/data_spec.json",
9+
"data_spec" : "data_spec.json",
1010

1111
"comment" : "hidden_nnet_spec :: (Mandatory) specify the path of hidden network configuration specification relative to working directory",
12-
"nnet_spec" : "config/CNN/NP/nnet_spec.json",
12+
"nnet_spec" : "nnet_spec.json",
1313

1414
"comment" : "hidden_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
15-
"hidden_output_file" : "hidden_out.model",
15+
"output_file" : "hidden_out.model",
1616

1717
"comment" : "conv_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
18-
"conv_output_file" : "conv_out.model",
18+
"output_file" : "conv_out.model",
1919

2020
"comment" : "input_shape :: (Mandatory) specify the input shape of a given feature vector" ,
2121
"input_shape" : [3,28,28],
@@ -44,5 +44,12 @@
4444
"min_epoch_decay_start" : 15,
4545
"init_error" :100
4646
},
47+
48+
"processes":{
49+
"pretraining":false,
50+
"finetuning":true,
51+
"testing":true,
52+
"export_data":false
53+
},
4754
"export_path" : "data/export"
4855
}

config/CNN/README

Whitespace-only changes.

config/CNN/T/data_spec.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"random_seed" : 123,
88
"input_shape" : [1,10,5],
99
"dim_shuffle" : [0,1,2,3],
10-
"batch_size": 8,
1110
"keep_flatten" : false,
1211
"reader_type" : "T1"
1312
},
@@ -20,7 +19,6 @@
2019
"random_seed" : 123,
2120
"input_shape" : [1,10,5],
2221
"dim_shuffle" : [0,1,2,3],
23-
"batch_size": 8,
2422
"keep_flatten" : false,
2523
"reader_type" : "T1"
2624
},
@@ -33,7 +31,6 @@
3331
"random_seed" : 123,
3432
"input_shape" : [1,10,5],
3533
"dim_shuffle" : [0,1,2,3],
36-
"batch_size": 8,
3734
"keep_flatten" : false,
3835
"reader_type" : "T1"
3936
}

config/CNN/T/mlp_spec.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

config/CNN/T/model_conf.json

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
"wdir" : "wdir",
77

88
"comment" : "valid_data (Mandatory) specify the path of the validation data relative to the working directory",
9-
"data_spec" : "config/CNN/T/data_spec.json",
10-
9+
"data_spec" : "data_spec.json",
10+
1111
"comment" : "nnet_spec :: (Mandatory) specify the path of convolution network configuration specification relative to working directory",
12-
"nnet_spec" : "config/CNN/T/nnet_spec.json",
12+
"nnet_spec" : "nnet_spec.json",
1313

1414
"comment" : "hidden_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
15-
"hidden_output_file" : "hidden_out.model",
15+
"output_file" : "hidden_out.model",
1616

1717
"comment" : "conv_output_file :: (Mandatory) specify the path of convolution network output file relative to working directory",
18-
"conv_output_file" : "conv_out.model",
18+
"output_file" : "conv_out.model",
1919

2020
"comment" : "input_shape :: (Mandatory) specify the input shape of a given feature vector" ,
2121
"input_shape" : [1,10,5],
@@ -44,5 +44,13 @@
4444
"min_epoch_decay_start" : 15,
4545
"init_error" :100
4646
},
47+
48+
"processes":{
49+
"pretraining":false,
50+
"finetuning":true,
51+
"testing":true,
52+
"export_data":false
53+
},
54+
4755
"export_path" : "data/export"
4856
}

config/CNN/conv_spec.json

Lines changed: 0 additions & 35 deletions
This file was deleted.

config/CNN/data_spec.json

Lines changed: 0 additions & 34 deletions
This file was deleted.

config/CNN/mlp_spec.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

config/CNN/model_conf.json

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)