Jeff Donahue [Mon, 31 Mar 2014 21:25:42 +0000 (14:25 -0700)]
remove silly thing where I copied proto headers to a separate
build/include dir
Jeff Donahue [Mon, 31 Mar 2014 21:16:11 +0000 (14:16 -0700)]
matcaffe fixes
Jeff Donahue [Sun, 30 Mar 2014 14:21:00 +0000 (07:21 -0700)]
fix test bugs and minor cleanup
Jeff Donahue [Sun, 30 Mar 2014 13:58:17 +0000 (06:58 -0700)]
cleanup python build and clean
Jeff Donahue [Sun, 30 Mar 2014 13:21:38 +0000 (06:21 -0700)]
compile test bins directly into build/test
Jeff Donahue [Sun, 30 Mar 2014 12:22:52 +0000 (05:22 -0700)]
add test header dependency and fix mat targets
Jeff Donahue [Sun, 30 Mar 2014 11:44:17 +0000 (04:44 -0700)]
minor cleanup
Jeff Donahue [Sun, 30 Mar 2014 11:42:43 +0000 (04:42 -0700)]
libcaffe.* in build/lib/
Jeff Donahue [Sun, 30 Mar 2014 11:36:22 +0000 (04:36 -0700)]
everything prints a blank line after compiling
Jeff Donahue [Sun, 30 Mar 2014 11:14:48 +0000 (04:14 -0700)]
lots of corrections to dependencies etc., things seem to mostly build
coherently now
Jeff Donahue [Sun, 30 Mar 2014 05:26:46 +0000 (22:26 -0700)]
messed around with Makefile - currently in very messy state
Jeff Donahue [Sun, 30 Mar 2014 03:12:24 +0000 (20:12 -0700)]
cleanup superclean output
Jeff Donahue [Sun, 30 Mar 2014 02:36:05 +0000 (19:36 -0700)]
put proto-generated .cc and .h files in build directory
Jeff Donahue [Sun, 30 Mar 2014 01:29:15 +0000 (18:29 -0700)]
create softlink to test directory at build/test
Jeff Donahue [Sun, 30 Mar 2014 00:47:58 +0000 (17:47 -0700)]
create superclean Makefile target to delete all files with generated
extensions
Jeff Donahue [Sun, 30 Mar 2014 00:46:39 +0000 (17:46 -0700)]
put TEST_GPUID in Makefile.config
Jeff Donahue [Wed, 2 Apr 2014 17:50:59 +0000 (10:50 -0700)]
Merge pull request #223 from sguada/improved_matcaffe
Improved matcaffe
Jeff Donahue [Wed, 2 Apr 2014 17:39:10 +0000 (10:39 -0700)]
Merge pull request #278 from kloudkl/log_error_string_in_check_macro
Log error strings in the error/status checking macros
Evan Shelhamer [Wed, 2 Apr 2014 00:28:41 +0000 (17:28 -0700)]
Merge pull request #283 from jeffdonahue/boost-rand-seed
Seed Boost RNG with cluster_seedgen by default
Jeff Donahue [Tue, 1 Apr 2014 23:49:34 +0000 (16:49 -0700)]
seed boost rng with cluster_seedgen by default
Kai Li [Tue, 1 Apr 2014 02:30:40 +0000 (10:30 +0800)]
Add a space before the error string
Kai Li [Mon, 31 Mar 2014 14:38:16 +0000 (22:38 +0800)]
Fix cpplint errors
Kai Li [Mon, 31 Mar 2014 14:29:36 +0000 (22:29 +0800)]
Add curandGetErrorString and use it to redefine CURAND_CHECK
Kai Li [Mon, 31 Mar 2014 14:23:22 +0000 (22:23 +0800)]
Add caffe::cublasGetErrorString and redefine CUBLAS_CHECK with it
Kai Li [Mon, 31 Mar 2014 14:07:22 +0000 (22:07 +0800)]
Define CUDA_POST_KERNEL_CHECK with CUDA_CHECK
Kai Li [Mon, 31 Mar 2014 13:56:05 +0000 (21:56 +0800)]
Log error string rather than enum value in CUDA_CHECK
Sergio Guadarrama [Mon, 31 Mar 2014 22:57:48 +0000 (15:57 -0700)]
Removed empty space, verified lint
Sergio Guadarrama [Mon, 31 Mar 2014 22:55:33 +0000 (15:55 -0700)]
Added default values to matcaffe_batch for testing
Sergio Guadarrama [Mon, 31 Mar 2014 22:47:36 +0000 (15:47 -0700)]
Added matcaffe_init to easy reuse of caffe initialization
Sergio Guadarrama [Mon, 31 Mar 2014 21:45:29 +0000 (14:45 -0700)]
Removed fillers from imagenet_deploy
Sergio Guadarrama [Mon, 17 Mar 2014 19:44:58 +0000 (12:44 -0700)]
Created reset command and changed END to NULL again
sguada [Thu, 27 Feb 2014 21:40:31 +0000 (13:40 -0800)]
Added prints to matcaffe_demo stages
Sergio Guadarrama [Mon, 31 Mar 2014 21:42:24 +0000 (14:42 -0700)]
Cleaned matcaffe.cpp to pass lint
Sergio Guadarrama [Mon, 31 Mar 2014 21:40:38 +0000 (14:40 -0700)]
Changed matcaffe_demo to return maxlabel
Sergio Guadarrama [Mon, 31 Mar 2014 21:39:16 +0000 (14:39 -0700)]
Changed Copyright to BVLC
Sergio Guadarrama [Mon, 31 Mar 2014 21:37:58 +0000 (14:37 -0700)]
Resolved merge conflicts
Jeff Donahue [Sat, 29 Mar 2014 20:46:04 +0000 (13:46 -0700)]
Merge pull request #275 from kloudkl/fix_kernel_for_loop_in_macro
Fix kernel for loop in macro
Kai Li [Sat, 29 Mar 2014 20:37:53 +0000 (04:37 +0800)]
Use CUDA_KERNEL_LOOP in the macro DEFINE_AND_INSTANTIATE_GPU_UNARY_FUNC
Evan Shelhamer [Sat, 29 Mar 2014 19:57:47 +0000 (12:57 -0700)]
Merge pull request #272 from kloudkl/gpu_hamming_distance
Implement GPU Hamming distance math function
Evan Shelhamer [Sat, 29 Mar 2014 19:19:30 +0000 (12:19 -0700)]
Merge pull request #271 from jeffdonahue/lint-bvlc-copyright
lint check for BVLC Copyright
Kai Li [Sat, 29 Mar 2014 13:36:13 +0000 (21:36 +0800)]
Implement and test gpu hamming distance
Kai Li [Sat, 29 Mar 2014 12:20:58 +0000 (20:20 +0800)]
Rename caffe_hamming_distance into caffe_cpu_hamming_distance
Jeff Donahue [Sat, 29 Mar 2014 05:03:13 +0000 (22:03 -0700)]
make lint check for 'Copyright [year] BVLC and contributors.'
Jeff Donahue [Sat, 29 Mar 2014 04:54:58 +0000 (21:54 -0700)]
compile the copyright regex
Evan Shelhamer [Fri, 28 Mar 2014 07:49:18 +0000 (00:49 -0700)]
Merge pull request #219 from jeffdonahue/refactor-layerparam-proto
Refactor LayerParameter into per-layer Parameter messages and add tools for seamless proto upgrade.
Jeff Donahue [Fri, 28 Mar 2014 07:21:26 +0000 (00:21 -0700)]
rename test_innerproduct_layer to test_inner_product_layer
Jeff Donahue [Fri, 28 Mar 2014 04:25:26 +0000 (21:25 -0700)]
move ReadNetParamsFrom{Text,Binary}File into util
Jeff Donahue [Fri, 28 Mar 2014 01:24:51 +0000 (18:24 -0700)]
add NetParameterPrettyPrint so that upgrade tool prints inputs before
layers
Jeff Donahue [Thu, 27 Mar 2014 23:37:20 +0000 (16:37 -0700)]
update docs (and a couple comments) for refactored layerparam
Jeff Donahue [Thu, 27 Mar 2014 23:07:07 +0000 (16:07 -0700)]
fix upgrade_net_proto names
Jeff Donahue [Thu, 27 Mar 2014 22:53:10 +0000 (15:53 -0700)]
minor cleanup
Jeff Donahue [Thu, 27 Mar 2014 22:11:22 +0000 (15:11 -0700)]
add support for hdf5 output layer
Jeff Donahue [Thu, 27 Mar 2014 21:58:45 +0000 (14:58 -0700)]
cleaner version of refactoring with fields added to LayerConnection
(which retains an optional V0LayerParameter field for legacy support)
and LayerConnection renamed to LayerParameter
Jeff Donahue [Thu, 27 Mar 2014 19:34:40 +0000 (12:34 -0700)]
some post rebase fixes -- copyright, hdf5_output layer (still need to
incorporate into util/upgrade_proto)
Jeff Donahue [Mon, 24 Mar 2014 04:06:09 +0000 (21:06 -0700)]
rollback previous commit adding version number to NetParameter -- going
a different route
Jeff Donahue [Mon, 24 Mar 2014 04:53:59 +0000 (21:53 -0700)]
add NetParameter required version number as breaking change for
V0NetParameter
Jeff Donahue [Mon, 24 Mar 2014 04:06:09 +0000 (21:06 -0700)]
allow upgrade_net_proto to also read/write binary protos (e.g. saved
models)
Jeff Donahue [Mon, 24 Mar 2014 00:34:39 +0000 (17:34 -0700)]
regenerate imagenet_val feature extraction prototxt with missing
IMAGE_DATA params
Jeff Donahue [Sun, 23 Mar 2014 21:26:31 +0000 (14:26 -0700)]
make all tools backwards compatible with v0 net param
Jeff Donahue [Sun, 23 Mar 2014 21:14:17 +0000 (14:14 -0700)]
upgrade images layer
Jeff Donahue [Fri, 21 Mar 2014 23:42:33 +0000 (16:42 -0700)]
upgrade remaining prototxts
Jeff Donahue [Fri, 21 Mar 2014 23:05:41 +0000 (16:05 -0700)]
upgrade_net_proto: allow input files already in new proto format
Jeff Donahue [Fri, 21 Mar 2014 22:58:06 +0000 (15:58 -0700)]
fix upgrade_net_proto name
Jeff Donahue [Fri, 21 Mar 2014 22:53:35 +0000 (15:53 -0700)]
incorporate WindowDataLayer into V0Upgrade and add tests
Jeff Donahue [Fri, 21 Mar 2014 22:37:43 +0000 (15:37 -0700)]
update deprecated protos to latest dev versions
Jeff Donahue [Fri, 21 Mar 2014 22:20:43 +0000 (15:20 -0700)]
make test_protobuf use NONE for dummy layer instead of SPLIT
Jeff Donahue [Fri, 21 Mar 2014 22:14:08 +0000 (15:14 -0700)]
some naming standardization: ImagesLayer -> ImageDataLayer (like other
data layers), and load_hdf5_file_data -> LoadHDF5FileData
Jeff Donahue [Fri, 21 Mar 2014 22:01:55 +0000 (15:01 -0700)]
alphabetize classes in vision_layers.hpp
Jeff Donahue [Fri, 21 Mar 2014 21:48:31 +0000 (14:48 -0700)]
some cleanup - lowercase layer class member variable names
Jeff Donahue [Fri, 21 Mar 2014 21:33:42 +0000 (14:33 -0700)]
remove padding layer
Jeff Donahue [Fri, 21 Mar 2014 21:04:11 +0000 (14:04 -0700)]
fix test_net for refactor
Jeff Donahue [Fri, 21 Mar 2014 20:45:38 +0000 (13:45 -0700)]
incorporate WindowDataLayer
Jeff Donahue [Tue, 18 Mar 2014 20:40:39 +0000 (13:40 -0700)]
rebase and fix stuff, incorporate image and padding layers
Jeff Donahue [Mon, 17 Mar 2014 19:38:11 +0000 (12:38 -0700)]
fix layertype alphabetization
Jeff Donahue [Mon, 17 Mar 2014 19:21:24 +0000 (12:21 -0700)]
fix lint errors
Jeff Donahue [Mon, 17 Mar 2014 18:35:01 +0000 (11:35 -0700)]
fix post-rebase param bugs
Jeff Donahue [Mon, 17 Mar 2014 13:22:29 +0000 (06:22 -0700)]
convert existing models to new format (used tools/upgrade_net_proto with
no manual editing)
Jeff Donahue [Mon, 17 Mar 2014 13:20:55 +0000 (06:20 -0700)]
LayerType enum
Jeff Donahue [Mon, 17 Mar 2014 12:24:53 +0000 (05:24 -0700)]
put inputs before layers in the proto so they print in that order
Jeff Donahue [Mon, 17 Mar 2014 12:18:55 +0000 (05:18 -0700)]
add test for input/input_dim and fix bug, wasn't copying input
Jeff Donahue [Mon, 17 Mar 2014 11:35:31 +0000 (04:35 -0700)]
add upgrade_net_proto tool
Jeff Donahue [Mon, 17 Mar 2014 10:45:09 +0000 (03:45 -0700)]
fix insert_splits for new layer param format
Jeff Donahue [Mon, 17 Mar 2014 10:30:49 +0000 (03:30 -0700)]
add test which includes upgraded params
Jeff Donahue [Mon, 17 Mar 2014 10:04:35 +0000 (03:04 -0700)]
add imagenet upgrade test and fix bug in upgrade_proto
Jeff Donahue [Mon, 17 Mar 2014 09:08:09 +0000 (02:08 -0700)]
more padding layer upgrade tests
Jeff Donahue [Mon, 17 Mar 2014 08:58:29 +0000 (01:58 -0700)]
imagenet padding upgrade test
Jeff Donahue [Mon, 17 Mar 2014 08:40:03 +0000 (01:40 -0700)]
set correct bottom blob name in upgraded conv layer
Jeff Donahue [Mon, 17 Mar 2014 08:21:06 +0000 (01:21 -0700)]
function to upgrade padding layers
Jeff Donahue [Sat, 15 Mar 2014 11:12:45 +0000 (04:12 -0700)]
make solver use upgrade_proto (by constructing net with a string) and
fix upgrade_proto bugs
Jeff Donahue [Sat, 15 Mar 2014 11:04:18 +0000 (04:04 -0700)]
add deprecated protos to PROTO_OBJS in makefile so things compile; other
minor cleanup of includes etc
Jeff Donahue [Sat, 15 Mar 2014 09:33:40 +0000 (02:33 -0700)]
make ReadProtoFromTextFile not die on parse failure; add
ReadProtoFromTextFileOrDie which has the old functionality
Jeff Donahue [Sat, 15 Mar 2014 09:15:44 +0000 (02:15 -0700)]
add V0NetParameter and UpgradeV0Net
Jeff Donahue [Sat, 15 Mar 2014 08:44:03 +0000 (01:44 -0700)]
caffe.proto: layer->layers
Jeff Donahue [Sat, 15 Mar 2014 08:11:33 +0000 (01:11 -0700)]
add v0->v1 'bridge' proto and add util that uses it
Jeff Donahue [Sat, 15 Mar 2014 05:24:12 +0000 (22:24 -0700)]
move caffe.proto.v0 -> deprecated/caffe.v0.proto and add separate target
makefile target for it
Jeff Donahue [Sat, 15 Mar 2014 03:56:07 +0000 (20:56 -0700)]
update tests for new proto format; now they compile
Jeff Donahue [Sat, 15 Mar 2014 00:59:28 +0000 (17:59 -0700)]
changes to layers etc to make 'make all' run successfully under new
caffe.proto
Jeff Donahue [Sat, 15 Mar 2014 00:57:26 +0000 (17:57 -0700)]
add duplicated params from InnerProductParam to ConvolutionParam and
PoolingParam etc, create InfogainLossParam
Jeff Donahue [Sat, 15 Mar 2014 00:30:42 +0000 (17:30 -0700)]
HDF5DataParameter message and concat_param
Jeff Donahue [Sat, 15 Mar 2014 00:13:59 +0000 (17:13 -0700)]
NetParameter.layers -> layer