parent: 1b5e6d | patch | commitdiff
Joseph Redmon
2014-04-17 b4b729a15e577c68f64e0ac69fb299de6f5f706c
refs
author Joseph Redmon <pjreddie@gmail.com>
Thursday, April 17, 2014 16:57 +0000
committer Joseph Redmon <pjreddie@gmail.com>
Thursday, April 17, 2014 16:58 +0000
commitb4b729a15e577c68f64e0ac69fb299de6f5f706c
tree fbe64c76273bf44c8e8c3b6a9dfdf2f8436fa159 tree | zip | gz | tar | bzip2 | xz
parent 1b5e6d8855064e5d990bd73f1f3a0aa00cbdfb4c view | diff
5e468d1c13d6f3cd64747dfa0ef1910a1165941e view | diff 
Merge branch 'master' of pjreddie.com:jnet

Conflicts:
	src/tests.c
19 files modified
7 files added
5 files deleted
2594 ■■■■■ changed files
Makefile 13 ●●●●● diff | view | raw | blame | history
dog.jpg diff | view | raw | blame | history
src/connected_layer.c 19 ●●●●● diff | view | raw | blame | history
src/connected_layer.h 3 ●●●●● diff | view | raw | blame | history
src/convolutional_layer.c 151 ●●●●● diff | view | raw | blame | history
src/convolutional_layer.h 6 ●●●●● diff | view | raw | blame | history
src/cpu_gemm.c 86 ●●●●● diff | view | raw | blame | history
src/data.c 24 ●●●●● diff | view | raw | blame | history
src/data.h 1 ●●●●● diff | view | raw | blame | history
src/gemm.cl 72 ●●●●● diff | view | raw | blame | history
src/gpu_gemm.c 153 ●●●●● diff | view | raw | blame | history
src/image.c 170 ●●●●● diff | view | raw | blame | history
src/image.h 13 ●●●●● diff | view | raw | blame | history
src/maxpool_layer.c 13 ●●●●● diff | view | raw | blame | history
src/maxpool_layer.h 4 ●●●●● diff | view | raw | blame | history
src/mini_blas.c 148 ●●●●● diff | view | raw | blame | history
src/mini_blas.h 13 ●●●●● diff | view | raw | blame | history
src/network.c 153 ●●●●● diff | view | raw | blame | history
src/network.h 8 ●●●●● diff | view | raw | blame | history
src/normalization_layer.c 96 ●●●●● diff | view | raw | blame | history
src/normalization_layer.h 26 ●●●●● diff | view | raw | blame | history
src/opencl.c 77 ●●●●● diff | view | raw | blame | history
src/opencl.h 21 ●●●●● diff | view | raw | blame | history
src/parser.c 54 ●●●●● diff | view | raw | blame | history
src/softmax_layer.c 41 ●●●●● diff | view | raw | blame | history
src/softmax_layer.h 3 ●●●●● diff | view | raw | blame | history
src/tests.c 1226 ●●●●● diff | view | raw | blame | history
test.jpg diff | view | raw | blame | history
test_color.png diff | view | raw | blame | history
test_dog.jpg diff | view | raw | blame | history
test_hinton.jpg diff | view | raw | blame | history