Skip to content

Commit 60f40f8

Browse files
committed
commit BIGBALLON#17: remove log & fixed some bug
1 parent cb1c4a3 commit 60f40f8

7 files changed

+21
-34
lines changed

1_Lecun_Network/LeNet_dp_da_keras.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
iterations = 391
1313
num_classes = 10
1414
log_filepath = './lenet_dp_da'
15+
mean = [125.307, 122.95, 113.865]
16+
std = [62.9932, 62.0887, 66.7048]
1517

1618
def build_model():
1719
model = Sequential()
@@ -47,15 +49,10 @@ def scheduler(epoch):
4749
x_test = x_test.astype('float32')
4850

4951
# data preprocessing [raw - mean / std]
50-
51-
x_train[:,:,:,0] = (x_train[:,:,:,0] - np.mean(x_train[:,:,:,0])) / np.std(x_train[:,:,:,0])
52-
x_train[:,:,:,1] = (x_train[:,:,:,1] - np.mean(x_train[:,:,:,1])) / np.std(x_train[:,:,:,1])
53-
x_train[:,:,:,2] = (x_train[:,:,:,2] - np.mean(x_train[:,:,:,2])) / np.std(x_train[:,:,:,2])
54-
55-
x_test[:,:,:,0] = (x_test[:,:,:,0] - np.mean(x_test[:,:,:,0])) / np.std(x_test[:,:,:,0])
56-
x_test[:,:,:,1] = (x_test[:,:,:,1] - np.mean(x_test[:,:,:,1])) / np.std(x_test[:,:,:,1])
57-
x_test[:,:,:,2] = (x_test[:,:,:,2] - np.mean(x_test[:,:,:,2])) / np.std(x_test[:,:,:,2])
58-
52+
for i in range(3):
53+
x_train[:,:,:,i] = (x_train[:,:,:,i] - mean[i]) / std[i]
54+
x_test[:,:,:,i] = (x_test[:,:,:,i] - mean[i]) / std[i]
55+
5956
# build network
6057
model = build_model()
6158
print(model.summary())

1_Lecun_Network/LeNet_dp_da_wd_keras.py

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@
99
from keras.regularizers import l2
1010

1111
batch_size = 128
12-
epochs = 180
12+
epochs = 150
1313
iterations = 391
1414
num_classes = 10
1515
weight_decay = 0.0001
16+
mean = [125.307, 122.95, 113.865]
17+
std = [62.9932, 62.0887, 66.7048]
18+
lr = [0.02, 0.004, 0.0008]
19+
1620
log_filepath = './lenet_dp_da_wd'
1721

1822
def build_model():
@@ -30,14 +34,7 @@ def build_model():
3034
return model
3135

3236
def scheduler(epoch):
33-
learning_rate_init = 0.02
34-
if epoch >= 60:
35-
learning_rate_init = 0.01
36-
if epoch >= 120:
37-
learning_rate_init = 0.004
38-
if epoch >= 160:
39-
learning_rate_init = 0.0008
40-
return learning_rate_init
37+
return lr[epoch//50]
4138

4239
if __name__ == '__main__':
4340

@@ -49,18 +46,14 @@ def scheduler(epoch):
4946
x_test = x_test.astype('float32')
5047

5148
# data preprocessing [raw - mean / std]
52-
53-
x_train[:,:,:,0] = (x_train[:,:,:,0] - np.mean(x_train[:,:,:,0])) / np.std(x_train[:,:,:,0])
54-
x_train[:,:,:,1] = (x_train[:,:,:,1] - np.mean(x_train[:,:,:,1])) / np.std(x_train[:,:,:,1])
55-
x_train[:,:,:,2] = (x_train[:,:,:,2] - np.mean(x_train[:,:,:,2])) / np.std(x_train[:,:,:,2])
56-
57-
x_test[:,:,:,0] = (x_test[:,:,:,0] - np.mean(x_test[:,:,:,0])) / np.std(x_test[:,:,:,0])
58-
x_test[:,:,:,1] = (x_test[:,:,:,1] - np.mean(x_test[:,:,:,1])) / np.std(x_test[:,:,:,1])
59-
x_test[:,:,:,2] = (x_test[:,:,:,2] - np.mean(x_test[:,:,:,2])) / np.std(x_test[:,:,:,2])
49+
for i in range(3):
50+
x_train[:,:,:,i] = (x_train[:,:,:,i] - mean[i]) / std[i]
51+
x_test[:,:,:,i] = (x_test[:,:,:,i] - mean[i]) / std[i]
6052

6153
# build network
6254
model = build_model()
6355
print(model.summary())
56+
6457
# set callback
6558
tb_cb = TensorBoard(log_dir=log_filepath, histogram_freq=0)
6659
change_lr = LearningRateScheduler(scheduler)

1_Lecun_Network/LeNet_dp_keras.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,11 @@ def scheduler(epoch):
4747

4848
# x_train /= 255
4949
# x_test /= 255
50-
51-
x_train[:,:,:,0] = (x_train[:,:,:,0] - np.mean(x_train[:,:,:,0])) / np.std(x_train[:,:,:,0])
52-
x_train[:,:,:,1] = (x_train[:,:,:,1] - np.mean(x_train[:,:,:,1])) / np.std(x_train[:,:,:,1])
53-
x_train[:,:,:,2] = (x_train[:,:,:,2] - np.mean(x_train[:,:,:,2])) / np.std(x_train[:,:,:,2])
54-
55-
x_test[:,:,:,0] = (x_test[:,:,:,0] - np.mean(x_test[:,:,:,0])) / np.std(x_test[:,:,:,0])
56-
x_test[:,:,:,1] = (x_test[:,:,:,1] - np.mean(x_test[:,:,:,1])) / np.std(x_test[:,:,:,1])
57-
x_test[:,:,:,2] = (x_test[:,:,:,2] - np.mean(x_test[:,:,:,2])) / np.std(x_test[:,:,:,2])
50+
mean = [125.307, 122.95, 113.865]
51+
std = [62.9932, 62.0887, 66.7048]
52+
for i in range(3):
53+
x_train[:,:,:,i] = (x_train[:,:,:,i] - mean[i]) / std[i]
54+
x_test[:,:,:,i] = (x_test[:,:,:,i] - mean[i]) / std[i]
5855

5956
# build network
6057
model = build_model()
Binary file not shown.
-171 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)