Skip to content

Commit dfa022e

Browse files
committed
Merge branch 'fileexport'
2 parents 73daace + 4b66d6f commit dfa022e

50 files changed

Lines changed: 568 additions & 243 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

config/CNN/data_spec.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
11
{
22
"validation": {
3-
"path" : "data/val.dat",
3+
"base_path" : "data/NPFILE",
4+
"filename" : "val.dat",
45
"partition" : 200,
56
"random" : true,
67
"random_seed" : 123,
78
"dim_shuffle" : [0,3,2,1],
89
"batch_size": 256,
910
"keep_flatten" : false,
10-
"reader_type" : "T"
11+
"reader_type" : "NP"
1112
},
1213

1314
"training" : {
14-
"path" : "data/train.dat",
15+
"base_path" : "data/NPFILE",
16+
"filename" : "train.dat",
1517
"partition" : 200,
1618
"random" : true,
1719
"random_seed" : 123,
1820
"dim_shuffle" : [0,3,2,1],
1921
"batch_size": 256,
2022
"keep_flatten" : false,
21-
"reader_type" : "T"
23+
"reader_type" : "NP"
2224
},
2325

2426
"testing" : {
25-
"path" : "data/test.dat",
27+
"base_path" : "data/NPFILE",
28+
"filename" : "train.dat",
2629
"partition" : 200,
2730
"random" : true,
2831
"random_seed" : 123,
2932
"dim_shuffle" : [0,3,2,1],
3033
"batch_size": 256,
3134
"keep_flatten" : false,
32-
"reader_type" : "T"
35+
"reader_type" : "NP"
3336
}
3437
}

config/CNN/model_conf.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"momentum" : 0.5,
3131

3232
"comment" : "n_outs :: Specify the number of outputs",
33-
"n_outs" : 10,
33+
"n_outs" : 8,
3434

3535
"comment" : "l_rate_method :: Two method l_rate method are supported C: Constant learning rate and E : Exponential decay",
3636
"l_rate_method" : "C",
@@ -46,5 +46,6 @@
4646
"min_derror_stop" : 0.05,
4747
"min_epoch_decay_start" : 15,
4848
"init_error" :100
49-
}
49+
},
50+
"export_path" : "data/export"
5051
}

config/CNN1/data_spec.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,40 @@
11
{
22
"validation": {
3-
"path" : "data/TFILE/val.dat",
3+
"base_path" : "data/TFILE",
4+
"filename" : "val1.dat",
45
"partition" : 0.002,
56
"random" : true,
67
"random_seed" : 123,
78
"input_shape" : [1,10,5],
89
"dim_shuffle" : [0,1,2,3],
910
"batch_size": 8,
1011
"keep_flatten" : false,
11-
"reader_type" : "T2"
12+
"reader_type" : "T1"
1213
},
1314

1415
"training" : {
15-
"path" : "data/TFILE/train.dat",
16+
"base_path" : "data/TFILE",
17+
"filename" : "train1.dat",
1618
"partition" : 0.002,
1719
"random" : true,
1820
"random_seed" : 123,
1921
"input_shape" : [1,10,5],
2022
"dim_shuffle" : [0,1,2,3],
2123
"batch_size": 8,
2224
"keep_flatten" : false,
23-
"reader_type" : "T2"
25+
"reader_type" : "T1"
2426
},
2527

2628
"testing" : {
27-
"path" : "data/TFILE/test.dat",
29+
"base_path" : "data/TFILE",
30+
"filename" : "train1.dat",
2831
"partition" : 0.002,
2932
"random" : true,
3033
"random_seed" : 123,
3134
"input_shape" : [1,10,5],
3235
"dim_shuffle" : [0,1,2,3],
3336
"batch_size": 8,
3437
"keep_flatten" : false,
35-
"reader_type" : "T2"
38+
"reader_type" : "T1"
3639
}
3740
}

config/CNN1/model_conf.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"momentum" : 0.5,
3131

3232
"comment" : "n_outs :: Specify the number of outputs",
33-
"n_outs" : 2,
33+
"n_outs" : 8,
3434

3535
"comment" : "l_rate_method :: Two method l_rate method are supported C: Constant learning rate and E : Exponential decay",
3636
"l_rate_method" : "C",
@@ -46,5 +46,6 @@
4646
"min_derror_stop" : 0.05,
4747
"min_epoch_decay_start" : 15,
4848
"init_error" :100
49-
}
49+
},
50+
"export_path" : "data/export"
5051
}

data/TFILE/c1/train_c1.dat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
train/train1.data
2+
train/train3.data
3+
train/train5.data
4+
train/train7.data

data/TFILE/c1/val_c1.dat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
val/val1.data
2+
val/val3.data
3+
val/val5.data
4+
val/val7.data

data/TFILE/c2/train_c2.dat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
train/train2.data
2+
train/train4.data
3+
train/train6.data
4+
train/train8.data

data/TFILE/c2/val_c2.dat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
val/val2.data
2+
val/val4.data
3+
val/val6.data
4+
val/val8.data

data/TFILE/train.dat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
50 2
2-
data/TFILE/train_c1.dat
3-
data/TFILE/train_c2.dat
2+
c1/train_c1.dat
3+
c2/train_c2.dat

0 commit comments

Comments
 (0)