microsoft
/
caffe
зеркало из https://github.com/microsoft/caffe.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
3 054 коммитов 3 Ветки 11 Теги 51 MiB
Граф коммитов

61 Коммитов

Автор SHA1 Сообщение Дата
Ronghang Hu 97b4c14533 Update ilsvrc_2012_mean.mat to W x H x C, update demo and add comments 
Update previously ilsvrc_2012_mean.mat stores 'image_mean' variable in
H x W x C with BGR channels, which is inconsistent with Caffe's data format
and inconsistent with caffe.io.read_mean(..). Replace 'image_mean' with
'mean_data' variable in W x H x C and update classification_demo.m. Also add
some comments.
 2015-05-30 14:28:18 +08:00
Ronghang Hu d07e5f7969 More tests for Blob, Layer, copy_from and step, fix some typos 
More testes are added into test_net.m and test_solver.m
 2015-05-29 16:06:35 +08:00
Ronghang Hu 0f13feef34 Move demo to demo/ and check weights file existence 
Move all Matlab demo to caffe/matlab/demo. Since we want the user to add
caffe/matlab to Matlab search PATH, we don't want to mess it up with too
many files

Check if CaffeNet is already downloaded in classification demo.
 2015-05-29 13:21:26 +08:00
Ronghang Hu d3d7d07be9 Clean up old matcaffe wrapper and rename caffe.reset to caffe.reset_all 
Remove old matlab wrapper but keep the classification demo and hdf5 demo

Change 'caffe.reset()' to 'caffe.reset_all()' to avoid potential name conflict.
Otherwise, Matlab R2015a complains:
Warning: Function reset has the same name as a MATLAB builtin. We suggest you rename the
function to avoid a potential name conflict.
 2015-05-29 13:21:25 +08:00
Ronghang Hu 9735f4b3b2 Aesthetic changes on code style and some minor fix 2015-05-29 13:21:25 +08:00
Ronghang Hu a53df9892c Fix matlab tailing dimension 1 issue for shape match 
Matlab cannot have tailing dimension 1 for ndim > 2, so you
cannot create 20 x 10 x 1 x 1 array in matlab as it becomes 20 x 10.
Extend matlab arrays to have tailing dimension 1 during shape match.
 2015-05-29 13:21:25 +08:00
Ronghang Hu ee0c931374 MatCaffe3 : a powerful matlab interface for caffe 
Added matcaffe3, a powerful matlab interface. To test it, run 'make mattest'
 2015-05-29 13:21:25 +08:00
Jeff Donahue cf0e6b7215 Update docs for ND blobs (#1970) and layer type is a string (#1694) 2015-05-14 18:38:16 -07:00
forresti 4a3887ab17 fixed matcaffe printout to specify num of args (now including train/test phase) 2015-02-24 20:05:48 -08:00
Evan Shelhamer 650b944509 Merge pull request #1899 from philkr/project_source_dir 
[cmake] CMAKE_SOURCE/BINARY_DIR to PROJECT_SOURCE/BINARY_DIR
 2015-02-19 00:37:53 -08:00
philkr d1238e14fa Changing CMAKE_SOURCE/BINARY_DIR to PROJECT_SOURCE/BINARY_DIR 2015-02-18 09:27:13 -08:00
Evan Shelhamer bb8b5d60eb [matcaffe] give phase to Net 2015-02-17 11:35:51 -08:00
Anatoly Baksheev aea5dd674a cmake 2.8.7. support 2015-02-16 20:48:41 -08:00
Anatoly Baksheev 9358247014 improve CMake build 2015-02-16 20:48:16 -08:00
Jeff Donahue 53924a76b6 add space after "Loading mean file from" 2015-02-02 12:38:43 -08:00
Evan Shelhamer 85a7626af3 Merge pull request #1746 from dj1989/mat_hdf5_demo 
Matlab demo for Caffe-compatible HDF5 read/write
 2015-01-25 23:06:57 -08:00
Xianjie Chen f4b386537e fix bugs by adding const 2015-01-22 19:27:24 -08:00
Dinesh Jayaraman c795095fd2 Matlab demo for Caffe-compatible HDF5 read/write 2015-01-17 18:23:48 -06:00
Daniel Golden f7625e3632 Prevent Matlab on OS X from crashing on error 
Replace CHECK() and LOG(FATAL) with LOG(ERROR) and mexErrMsgTxt

A failed CHECK() or LOG(FATAL) causes Matlab to crash on OS X 10.9 with Matlab 2014a.
 2014-11-05 17:31:43 -08:00
Jeff Donahue 22515af9a9 [fix] lint causing travis failures 2014-10-02 11:19:05 -07:00
Evan Shelhamer b22b278b14 Merge pull request #951 from gcinbis/patch-1 
Lock the mex file to avoid MATLAB crashes
 2014-10-02 00:12:31 -07:00
Karen Simonyan 9007d96a2d added a Matlab demo with mean BGR pixel subtraction instead of the mean image subtraction 2014-09-24 22:08:46 +01:00
Karen Simonyan 60d47bf534 RGB -> BGR in the matlab demo 2014-09-23 16:39:08 +01:00
Karen Simonyan 5d2a9399ae added example usage to the Matlab script 2014-09-22 20:39:37 +01:00
Karen Simonyan 536335939d added comments to the Matlab demo script 2014-09-22 20:28:06 +01:00
Karen Simonyan 90584bd86f added matcaffe_demo for the VGG models (RGB input) 2014-09-22 20:28:06 +01:00
Sergey Karayev da715ea07a removed mention of getting_pretrained_models page and old paths 2014-09-04 03:59:14 +01:00
R. Gokberk Cinbis 1b5ef7402d Lock the mex file to avoid Matlab crashes. 
Commands like "clear all" and "clear function" causes segmentation faults or errors like these (especially after an 'init'):
 libprotobuf ERROR google/protobuf/descriptor_database.cc:57] File already exists in database: caffe/proto/caffe.proto
 libprotobuf FATAL google/protobuf/descriptor.cc:862] CHECK failed: generated_database_->Add(encoded_file_descriptor, size):
 [libprotobuf ERROR google/protobuf/message.cc:333] Type appears to be in generated pool but wasn't registered: caffe.LayerParameter
 Attempt to restart MATLAB?
To avoid these, lock the the mex file.
 2014-08-20 07:53:31 +03:00
Adam Kosiorek ececfc0c0c cmake build system 2014-08-17 01:07:11 -07:00
Sergio Guadarrama c13fded3ac Merge pull request #888 from ronghanghu/matcaffe-add-check 
add necessary input checks for matcaffe
 2014-08-09 02:29:05 -07:00
Ronghang Hu c8b6457de5 add necessary input checks for matcaffe 2014-08-08 15:47:23 -07:00
Alireza Shafaei 51074e91d2 Painless binary mean conversion to matlab matrices. 2014-08-06 22:27:13 -07:00
Evan Shelhamer b97b88f0c2 LICENSE governs the whole project so strip file headers 2014-08-06 18:35:29 -07:00
Jeff Donahue 92f00dd3a6 Fix header alphabetization lint errors. 2014-08-04 21:26:30 -07:00
qipeng fc4e1d11e6 fix compiler complaint in matcaffe 2014-08-01 14:53:35 -07:00
Evan Shelhamer 1da30a5558 replace all memcpy by caffe_copy 2014-07-03 17:14:12 -07:00
Evan Shelhamer 9f74b6b129 switch to unified virtual addressing CUDA memcpy 
Host / device copies are distinguished by the virtual address of the
pointers instead of explicit memcpy modes.
 2014-07-03 17:14:11 -07:00
Jeff Donahue 16176a2d3e add caffe/random_fn lint rule to check for use of rand, rand_r, random 2014-04-22 23:40:18 -07:00
Sergio Guadarrama 503634da5e Removed empty space, verified lint 2014-03-31 15:57:48 -07:00
Sergio Guadarrama 5e79c95eac Added default values to matcaffe_batch for testing 2014-03-31 15:55:33 -07:00
Sergio Guadarrama 38e3d7ff3a Added matcaffe_init to easy reuse of caffe initialization 2014-03-31 15:47:36 -07:00
Sergio Guadarrama 5c35b55bf4 Created reset command and changed END to NULL again 2014-03-31 14:42:27 -07:00
sguada e3daae6fb1 Added prints to matcaffe_demo stages 2014-03-31 14:42:27 -07:00
Sergio Guadarrama 372fadde6d Cleaned matcaffe.cpp to pass lint 2014-03-31 14:42:24 -07:00
Sergio Guadarrama 8f0580b836 Changed matcaffe_demo to return maxlabel 2014-03-31 14:40:38 -07:00
Sergio Guadarrama c8249e7f88 Changed Copyright to BVLC 2014-03-31 14:39:16 -07:00
Sergio Guadarrama 0edff71a01 Resolved merge conflicts 2014-03-31 14:37:58 -07:00
Evan Shelhamer 6db92e838b Standardize copyright, add root-level CONTRIBUTORS credit 2014-03-27 11:20:35 -07:00
Jeff Donahue ec6f3b8466 minor cleanup in rcnn-finetuning -- rcnn feature computation tested at 
this commit (in addition to all caffe unit tests passing)
 2014-03-19 20:50:13 -07:00
Ross Girshick dfec9471ea cleanup matlab demo 2014-03-19 19:17:40 -07:00