updates and things

.gitignore

@@ -14,6 +14,7 @@ decaf/
 submission/
 cfg/
 darknet
+.fuse*
 
 # OS Generated #
 .DS_Store*

Makefile

@@ -1,6 +1,6 @@
-GPU=1
-CUDNN=1
-OPENCV=1
+GPU=0
+CUDNN=0
+OPENCV=0
 DEBUG=0
 
 ARCH= --gpu-architecture=compute_52 --gpu-code=compute_52
@@ -41,7 +41,7 @@ CFLAGS+= -DCUDNN
 LDFLAGS+= -lcudnn
 endif
 
-OBJ=gemm.o utils.o cuda.o deconvolutional_layer.o convolutional_layer.o list.o image.o activations.o im2col.o col2im.o blas.o crop_layer.o dropout_layer.o maxpool_layer.o softmax_layer.o data.o matrix.o network.o connected_layer.o cost_layer.o parser.o option_list.o darknet.o detection_layer.o imagenet.o captcha.o route_layer.o writing.o box.o nightmare.o normalization_layer.o avgpool_layer.o coco.o dice.o yolo.o detector.o layer.o compare.o classifier.o local_layer.o swag.o shortcut_layer.o activation_layer.o rnn_layer.o gru_layer.o rnn.o rnn_vid.o crnn_layer.o demo.o tag.o cifar.o go.o batchnorm_layer.o art.o region_layer.o reorg_layer.o super.o voxel.o
+OBJ=gemm.o utils.o cuda.o deconvolutional_layer.o convolutional_layer.o list.o image.o activations.o im2col.o col2im.o blas.o crop_layer.o dropout_layer.o maxpool_layer.o softmax_layer.o data.o matrix.o network.o connected_layer.o cost_layer.o parser.o option_list.o darknet.o detection_layer.o captcha.o route_layer.o writing.o box.o nightmare.o normalization_layer.o avgpool_layer.o coco.o dice.o yolo.o detector.o layer.o compare.o classifier.o local_layer.o swag.o shortcut_layer.o activation_layer.o rnn_layer.o gru_layer.o rnn.o rnn_vid.o crnn_layer.o demo.o tag.o cifar.o go.o batchnorm_layer.o art.o region_layer.o reorg_layer.o super.o voxel.o
 ifeq ($(GPU), 1) 
 LDFLAGS+= -lstdc++ 
 OBJ+=convolutional_kernels.o deconvolutional_kernels.o activation_kernels.o im2col_kernels.o col2im_kernels.o blas_kernels.o crop_layer_kernels.o dropout_layer_kernels.o maxpool_layer_kernels.o softmax_layer_kernels.o network_kernels.o avgpool_layer_kernels.o

cfg/extraction22k.cfg

@@ -0,0 +1,209 @@
+[net]
+batch=128
+subdivisions=1
+height=224
+width=224
+max_crop=320
+channels=3
+momentum=0.9
+decay=0.0005
+
+learning_rate=0.01
+max_batches = 0
+policy=steps
+steps=444000,590000,970000
+scales=.5,.2,.1
+
+#policy=sigmoid
+#gamma=.00008
+#step=100000
+#max_batches=200000
+
+[convolutional]
+batch_normalize=1
+filters=64
+size=7
+stride=2
+pad=1
+activation=leaky
+
+[maxpool]
+size=2
+stride=2
+
+[convolutional]
+batch_normalize=1
+filters=192
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[maxpool]
+size=2
+stride=2
+
+[convolutional]
+batch_normalize=1
+filters=128
+size=1
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=256
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=256
+size=1
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=512
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[maxpool]
+size=2
+stride=2
+
+[convolutional]
+batch_normalize=1
+filters=256
+size=1
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=512
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=256
+size=1
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=512
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=256
+size=1
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=512
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=256
+size=1
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=512
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=512
+size=1
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=1024
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[maxpool]
+size=2
+stride=2
+
+[convolutional]
+batch_normalize=1
+filters=1024
+size=1
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=2048
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=1024
+size=1
+stride=1
+pad=1
+activation=leaky
+
+[convolutional]
+batch_normalize=1
+filters=2048
+size=3
+stride=1
+pad=1
+activation=leaky
+
+[avgpool]
+
+[connected]
+output=21842
+activation=leaky
+
+[softmax]
+groups=1
+
+[cost]
+type=sse
+

cfg/go.test.cfg

@@ -3,102 +3,126 @@ batch=1
 subdivisions=1
 height=19
 width=19
-channels=8
+channels=1
 momentum=0.9
 decay=0.0005
 
 learning_rate=0.1
-max_batches = 0
-policy=steps
-steps=50000
-scales=.1
+policy=poly
+power=4
+max_batches=400000
 
 [convolutional]
-filters=512
+filters=192
 size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
 [convolutional]
-filters=256
-size=1
+filters=192
+size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
 [convolutional]
-filters=512
+filters=192
 size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
 [convolutional]
-filters=256
-size=1
+filters=192
+size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
 [convolutional]
-filters=512
+filters=192
 size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
 [convolutional]
-filters=256
-size=1
+filters=192
+size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
 [convolutional]
-filters=512
+filters=192
 size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
 [convolutional]
-filters=256
-size=1
+filters=192
+size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
 [convolutional]
-filters=512
+filters=192
 size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
 [convolutional]
-filters=256
-size=1
+filters=192
+size=3
 stride=1
 pad=1
-activation=leaky
+activation=relu
 batch_normalize=1
 
+[convolutional]
+filters=192
+size=3
+stride=1
+pad=1
+activation=relu
+batch_normalize=1
+
+[convolutional]
+filters=192
+size=3
+stride=1
+pad=1
+activation=relu
+batch_normalize=1
+
+[convolutional]
+filters=192
+size=3
+stride=1
+pad=1
+activation=relu
+batch_normalize=1
+
+
 [convolutional]
 filters=1
 size=1
 stride=1
 pad=1
-activation=leaky
+activation=linear
 
 [softmax]