PR to compare original caffe branch (master) with OpenCL port branch (dev)#9

Open

gujunli wants to merge 139 commits intomasterfrom dev

+18,729-9,628

Commits on Jul 26, 2015

This is yibing's first patch. removed all cuda files and added device file

Junli Gu
authored and
Junli
committed
Synced memory changes

Yibing
authored and
Junli
committed
update data layer for AMD_PERSISTENT_MEM

Yibing
authored and
Junli
committed
add Forward_gpu and Backward_gpu for more layers; update math functions, Makefile and im2col.cpp

Yibing
authored and
Junli
committed
Minor update ot syncedmem.hpp

Junli
authored and
Junli
committed
This patch debugged data layer, added ocl/util, etc. made run cpu alexnet

Yibing
authored and
Junli
committed
Conv layer FP and BP logic ported. Baseline scheme

Yibing
authored and
Junli
committed
Debugging layer. Not much change for layers

Yibing
authored and
Junli
committed
OpenCL porting for relu, sofmax layer

Junli
authored and
Junli
committed
OpenCL porting of pooling layer

Junli
authored and
Junli
committed
OpenCL porting of LRN layers and inner-product layer; fixed some bugs in solver

Junli
authored and
Junli
committed
This patch has conv_org,relu, pooling,fc OpenCL porting and correct

Junli
authored and
Junli
committed

Commits on Jul 31, 2015

Port the softmax layer

Yibing
authored and
Yibing
committed

Commits on Aug 2, 2015

cleanup the kernel interface of conv, relu and dropout

Yibing
authored and
Yibing
committed
minor fix

Junli
authored and
Junli
committed
Ported optimized scheme for conv layer
junli
committed
added Makefile.config. As needed by fresh git clone; then make all
junli
committed
fix some merge bugs; add ./models into git
junli
committed

Commits on Aug 3, 2015

cleaned up sgemm_ex interfaces; re-organized the relu layer kernel and wrappers

Yibing
authored and
Yibing
committed
cleaning up the conv opt interfaces

Junli
authored and
Junli
committed
conv opt cleaning up cont.

Junli
authored and
Junli
committed
Merge branch 'master' of https://github.com/gujunli/caffe-merge

Junli
authored and
Junli
committed
conv opt forward done
Junli Gu
committed

Commits on Aug 4, 2015

conf opt backward interfaces
Junli Gu
committed
finished debugging for conv optimized scheme

Junli
authored and
Junli
committed
minor change

Junli
authored and
Junli
committed

Commits on Aug 5, 2015

conv layer clean up
Junli Gu
committed
fixed the bug in syncedmem set_cpu_data

Yibing
authored and
Yibing
committed

Commits on Aug 6, 2015

gconv opt debug

Yibing
authored and
Yibing
committed

Commits on Aug 7, 2015

Split OpenCL kernels into different files

Yuan
authored and
Yuan
committed

Commits on Aug 8, 2015

Created global kernel map

Yibing
authored and
Yibing
committed
ocl wrappers get kernel from the map @amdDevice.Kernels instead of passing from outside; haven't finished in conv_layer

Yibing
authored and
Yibing
committed

Commits on Aug 9, 2015

clean the ocl wrappers in conv_layer; check the type of files to be built in ./src/caffe/ocl

Yibing
authored and
Yibing
committed
fixed some kernel name errors and re-organized the kernel files

Yibing
authored and
Yibing
committed

Commits on Aug 10, 2015

add AMD's license

Yibing
authored and
Yibing
committed

Commits on Aug 25, 2015

This is a test layer

Junli
authored and
Junli
committed
modified the packing number

Junli
authored and
Junli
committed

Commits on Aug 27, 2015

remove all cuda related flags in Makefile

Yibing
authored and
Yibing
committed
modified the packing number

Junli
authored and
Yibing
committed
add clFinish in test

Junli
authored and
Junli
committed
fix cmake

Junli
authored and
Junli
committed
Merge branch 'dev' of https://github.com/gujunli/OpenCL-CAFFE-upstream-test into dev

Junli
authored and
Junli
committed

Commits on Aug 28, 2015

Remove cuda related code
Noplz
committed

Commits on Aug 30, 2015

add FindOpenCL and FindclBLAS in cmake/

Yibing
authored and
Yibing
committed

Commits on Sep 1, 2015

Fixed conv layers opt2 bug

Yibing
authored and
Yibing
committed
conv clean up

Yibing
authored and
Yibing
committed
removed all cuDNN files

Yibing
authored and
Yibing
committed
Removed forward_opt and backward_opt functions in conv layer

Yibing
authored and
Yibing
committed

Commits on Sep 3, 2015

Enable SetDevice function; clean the code in device.cpp

Yibing
authored and
Yibing
committed
Fixed conv layers opt2 bug

Yibing
authored and
Yibing
committed
conv clean up

Yibing
authored and
Yibing
committed
removed all cuDNN files

Yibing
authored and
Yibing
committed
Removed forward_opt and backward_opt functions in conv layer

Yibing
authored and
Yibing
committed
fixed merge conflicts

Junli
authored and
Junli
committed
gfixed merge conflicts

Junli
authored and
Junli
committed

Commits on Sep 4, 2015

Merge branch 'dev' of /home/yugao/caffe-merge-junli/temp/../upstream_clean/OpenCL-caffe-upstream-test into dev

Junli
authored and
Junli
committed
Merge https://github.com/gujunli/OpenCL-caffe-upstream-test into dev

Junli
authored and
Junli
committed
clean up warining info

Junli
authored and
Junli
committed
Remove the annotation code

Junli
authored and
Junli
committed
Partially get through unit test

Yibing
authored and
Yibing
committed
Merge branch 'dev' of https://github.com/gujunli/OpenCL-caffe-upstream-test into dev

Yibing
authored and
Yibing
committed
fixed the random seed

Yibing
authored and
Yibing
committed

Commits on Sep 6, 2015

Clean up the last two warnings

Yibing
authored and
Yibing
committed
Clean up the last two warings

Yibing
authored and
Yibing
committed
Ported hdf5_data hdf5_output log and mvn layer

Yibing
authored and
Yibing
committed
Port absval_layer bnll_layer concat_layer contrastive_loss_layer deconv_layer eltwise_layer euclidean_loss_layer exp_layer & filter_layer

Yibing
authored and
Yibing
committed
Fix some bugs in layers' porting

Yibing
authored and
Yibing
committed

Commits on Sep 7, 2015

Ignore log dir
Noplz
committed

Commits on Sep 8, 2015

ported new layers

Junli
authored and
Junli
committed
Made my own last porting layers go through unit test

Yibing
authored and
Yibing
committed

Commits on Sep 9, 2015

fix bug in PReLU layer

Junli
authored and
Junli
committed
modify conv layers

Junli
authored and
Junli
committed
Pass HDF5 layers unit test
Yibing
committed
minor fix
Yibing
committed
Format the code
Noplz
committed
Pass concat_layer & spp_layer; remove kernels in lrn_layer
Yibing
committed
Fix the bug that CPU mode cannot run

Yibing
authored and
Yibing
committed
update Readme and License file

Junli
authored and
Junli
committed
update Readme and License file

Junli
authored and
Junli
committed
minor fix

Junli
authored and
Junli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed

Commits on Sep 10, 2015

Adjust the code style
Noplz
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
Fixed the bug in kernel_channel_sum(), passed throug softmaxwithloss, validated the loss output in log file

Yibing
authored and
Yibing
committed
Update README.md
gujunli
committed
merge fix

Yibing
authored and
Yibing
committed
Added rng_uniform rng_gaussian

Yibing
authored and
Yibing
committed
Merge Maohua's patch: add rng_gaussian rng_uniform

Yibing
authored and
Yibing
committed
fix a template error in random.cl

Yibing
authored and
Yibing
committed
Add uint random generator

Yibing
authored and
Yibing
committed
Update README.md
gujunli
committed
Update README.md
gujunli
committed
add notation

Junli
authored and
Junli
committed

Commits on Sep 11, 2015

Adjust the indent
Noplz
committed
Merge https://github.com/amd/OpenCL-caffe into dev

Yibing
authored and
Yibing
committed
Passed dropout unit test

Yibing
authored and
Yibing
committed

Commits on Sep 12, 2015

fixed mergre problem

Yibing
authored and
Yibing
committed

Commits on Sep 13, 2015

Merge https://github.com/amd/OpenCL-caffe into dev

Junli
authored and
Junli
committed
removed cmakefiles from git repo

Junli
authored and
Junli
committed
Enable CPU_ONLY flag

Yibing
authored and
Yibing
committed

Commits on Sep 14, 2015

add find path for AMDAPPSDK3.0 and addes src/caffe/CMakeLists.txt
Junli Gu
committed
Merge branch 'dev' of https://github.com/amd/OpenCL-caffe into dev
Junli Gu
committed
Add the change in tools/

Yibing
authored and
Yibing
committed
Clean test code

Yibing
authored and
Yibing
committed

Commits on Sep 15, 2015

Passed PReLU layer's unit test

Yibing
authored and
Yibing
committed
Passed through Slice layer

Yibing
authored and
Yibing
committed

Commits on Sep 16, 2015

Passed through Im2col_layer test

Yibing
authored and
Yibing
committed
Update README.md
gujunli
committed
Tested reduction_layer & deconv_layer

Yibing
authored and
Yibing
committed
Merge https://github.com/amd/OpenCL-caffe into dev

Yibing
authored and
Yibing
committed
Update README.md
gujunli
committed
update gitignore
Junli Gu
committed
untrack auto generated src/caffe/test/CMakeFiles
Junli Gu
committed
removed unnecessary cmake files
Junli Gu
committed

Commits on Sep 17, 2015

integrate Mauricio's code review suggestions
Junli Gu
committed
Update README.md
gujunli
committed

Commits on Sep 18, 2015

comment on where the code is modified for OpenCL port

Yibing
authored and
Yibing
committed
Go through 1x1 convolution

Yibing
authored and
Yibing
committed
Merge https://github.com/amd/OpenCL-caffe into dev

Yibing
authored and
Yibing
committed
Go through conv_layer

Yibing
authored and
Yibing
committed
Go through GPUMathFunctionsTest

Yibing
authored and
Yibing
committed

Commits on Sep 19, 2015

fixed im2col_opt paramters

Junli
authored and
Junli
committed
fixed im2col

Junli
authored and
Junli
committed
direct is_1_1 conv to original scheme

Junli
authored and
Junli
committed
Removed unused variable in base_conv_layer

Yibing
authored and
Yibing
committed

Commits on Sep 20, 2015

pass col2im_opt unit test

Junli
authored and
Junli
committed