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

198 Коммитов

Автор SHA1 Сообщение Дата
Evan Shelhamer 285f61500f Back-merge documentation and fixes 2014-08-07 14:17:48 -07:00
Evan Shelhamer 3b07be06a4 consolidate gpu and device_id args in caffe tool 2014-08-07 11:56:45 -07:00
Evan Shelhamer e3de3d55de fix deprecation warnings 2014-08-06 23:48:29 -07:00
Evan Shelhamer 76633d3351 consolidate test into caffe cli 2014-08-06 23:45:35 -07:00
Evan Shelhamer 7dcf592a50 comment caffe cli 2014-08-06 23:44:55 -07:00
Evan Shelhamer 5c46d79da9 check required caffe cli args 2014-08-06 23:44:55 -07:00
Evan Shelhamer 8634885d83 rename caffe cli args and revise text 2014-08-06 23:44:55 -07:00
Evan Shelhamer 3655aa9395 give usage message for caffe cli 
- call format
- commands
- flags
 2014-08-06 23:44:55 -07:00
Evan Shelhamer fa084945d4 output INFO from caffe cli to stderr by default 2014-08-06 23:44:49 -07:00
Evan Shelhamer 8eb05e1f47 consolidaet GPU flag for caffe cli 2014-08-06 23:44:26 -07:00
Evan Shelhamer de6123c4f4 rename tools 2014-08-06 23:42:00 -07:00
Evan Shelhamer b97b88f0c2 LICENSE governs the whole project so strip file headers 2014-08-06 18:35:29 -07:00
netheril96 75f2938712 Reordering of header includes for convert_imageset.cpp 2014-08-06 10:44:02 +08:00
netheril96 e1d6655480 Fix lint errors 2014-08-06 10:44:02 +08:00
netheril96 42ebee599b Handles gflags's change of namespace 2014-08-06 10:44:02 +08:00
netheril96 a0a5bb180f convert_imageset now uses gflags; optional arguments can be positioned 
arbitrarily now
 2014-08-06 10:44:02 +08:00
Jeff Donahue 92f00dd3a6 Fix header alphabetization lint errors. 2014-08-04 21:26:30 -07:00
Vik Kamath b1c4f121b4 Changed path in description to point to parse_log.sh 
It seems that parse_log.sh has moved from /path/to/caffe/scripts/ to /path/to/caffe/tools/extra. The edit changes the description to reflect this change. Nothing major really.
 2014-08-04 18:36:35 -07:00
netheril96 db286e430d Fix and improve multiple places about random number generation and 
shuffling
 2014-08-04 12:41:58 +08:00
Yangqing Jia 9862d5a4dc LOG(ERROR)->LOG(FATAL), and misc script changes. 2014-07-26 08:37:05 -07:00
Yangqing Jia 70b01f2164 using caffe::string to be consistent with other string definition. 2014-07-25 17:58:35 -07:00
Yangqing Jia 2cfbda510c oops, wrong deprecation message (should have --) 2014-07-25 10:11:26 -07:00
Yangqing Jia 2ced4c9ab9 lint 2014-07-25 09:52:30 -07:00
Yangqing Jia a916ef49fa Adding new caffe binary that does everything in one binary; deprecating device_query, finetune_net, net_speed_benchmark, train_net 2014-07-25 09:08:12 -07:00
Jeff Donahue 518b5f4997 Merge pull request #716 from Yangqing/dev 
Minor Code Cleaning
 2014-07-17 12:46:18 -07:00
Yangqing Jia d6f3adee56 compute_image_mean namespace fix. 2014-07-17 12:18:27 -07:00
Evan Shelhamer e52d91ea33 collect CUDA includes and calls, separate from CPU-only mode, leave out 
- collect CUDA includes in device_alternate.hpp
- add guards for CUDA code
- move GPU code into cu from cpp
- make CUDA includes and libraries conditional in Makefile
- drop CUDA dependency from travis-ci build
 2014-07-17 11:57:47 +02:00
Evan Shelhamer e09e256284 Merge pull request #549 from jamt9000/fix-resize-crop-pil 
Make resizing & cropping with PIL work
 2014-07-03 17:29:14 -07:00
Jeff Donahue 9dc8734600 fix uninitialized variable warnings in tools 2014-07-01 10:16:41 -07:00
Evan Shelhamer e6a46c2be6 lint 2014-06-28 13:54:58 -07:00
James Thewlis 423808dd60 Make resizing & cropping with PIL work 
Previously it was trying to use undefined variables
 2014-06-27 10:55:12 +01:00
Evan Shelhamer 2e23f28f62 Merge pull request #511 from kloudkl/extract_multiple_features 
Extract multiple features in a single Forward pass
 2014-06-26 19:13:28 -07:00
Jeff Donahue 74443591d6 change Backward interface: propagate_down is a vector -- use to fix 
long-standing issue with how this is handled in loss layers (esp.
EuclideanLossLayer)
 2014-06-26 11:34:19 -07:00
Jonathan L Long cd81969b24 don't end comments with \, so that -Wcomment can be used 2014-06-25 15:11:41 -07:00
Jonathan L Long a65cb967e6 remove unused variables 2014-06-25 15:11:40 -07:00
Kai Li dda092c84e Init google logging 2014-06-24 22:14:54 +08:00
Kai Li 4a276b03fa Replace the raw pointers with shared_ptr to ensure memory is released 2014-06-24 22:12:44 +08:00
Kai Li 738be6fdfc No need to manually delete the pointers which are managed by std::vector 2014-06-24 22:12:44 +08:00
Kai Li 4415f8c045 Progress should be reported for each feature blob 2014-06-24 22:12:44 +08:00
Kai Li da0f89bbd4 Extract multiple features in a single Forward pass 2014-06-24 22:12:44 +08:00
linmin dbc5ebf31b fix string compare error 2014-06-14 16:35:48 +08:00
linmin 01481d581b add lmdb support for compute_image_mean 2014-06-14 16:15:44 +08:00
linmin e0ce93383e add lmdb support for convert_imageset 2014-06-14 16:15:18 +08:00
Jerod Weinman 781761eb74 Changed variable name: iscolor to is_color. 2014-06-08 15:46:23 -05:00
Jerod Weinman d21da02474 Added an iscolor flag to io.cpp method ReadImageToDatum to handle grayscale images and a corresponding commandline flag [-g] to convert_imageset.cpp. 2014-06-02 15:54:25 -05:00
Evan Shelhamer a53978d2b0 convert imageset comment fixup 2014-05-26 10:50:00 -07:00
Jeff Donahue 2e292c44a7 add convert_imageset option to resize images; use in 
convert_imageset.cpp and document
 2014-05-23 14:58:45 -07:00
Evan Shelhamer a894796977 fix workaround in net prototxt upgrade 2014-05-14 12:35:33 -07:00
Evan Shelhamer 04273e7045 fix test_net to upgrade params from v0 if needed 2014-04-26 16:33:40 -07:00
Evan Shelhamer 8e2a51b8f2 default test net device to 0 and log device chosen 2014-04-26 16:08:22 -07:00
Evan Shelhamer 4df0de2cd0 proofreading and trivial polish 2014-04-26 15:23:56 -07:00
Evan Shelhamer 0b885b9ba4 add device id arg to test_net (fix #232) 2014-04-26 15:22:42 -07:00
Evan Shelhamer efacd98413 Back-merge documentation and fixes 
format installation docs, add links
Add hdf5 requirements to 10.9 notes, drop cmake (not linked)
fix im2col height/width bound check bug (issue #284 identified by @kmatzen)
strip confusing confusing comment about shuffling files
add /etc/rc.local hint for boot configuration of gpus
Include k40 images per day benchmark
drop caffe presentation in favor of dropbox link
make build_docs.sh script work from anywhere
proofread, fix dead link, standardize NVIDIA capitalization
Added Link in index.md to perfomance_hardware.md
Added Performance and Hardware Tips
imagenet fix: ilvsrc -> ilsvrc
 2014-04-07 22:13:13 -07:00
Evan Shelhamer 68f80decae strip confusing confusing comment about shuffling files 2014-04-04 22:32:44 -07:00
Jeff Donahue 48e2e8ea52 add NetParameterPrettyPrint so that upgrade tool prints inputs before 
layers
 2014-03-27 23:42:29 -07:00
Jeff Donahue e20c43abc1 update docs (and a couple comments) for refactored layerparam 2014-03-27 23:42:29 -07:00
Jeff Donahue 56ce56266c fix upgrade_net_proto names 2014-03-27 23:42:29 -07:00
Jeff Donahue 57167a047c cleaner version of refactoring with fields added to LayerConnection 
(which retains an optional V0LayerParameter field for legacy support)
and LayerConnection renamed to LayerParameter
 2014-03-27 23:42:29 -07:00
Jeff Donahue b7444d63e2 some post rebase fixes -- copyright, hdf5_output layer (still need to 
incorporate into util/upgrade_proto)
 2014-03-27 23:42:29 -07:00
Jeff Donahue 927642e408 allow upgrade_net_proto to also read/write binary protos (e.g. saved 
models)
 2014-03-27 23:42:29 -07:00
Jeff Donahue 17a59c3048 make all tools backwards compatible with v0 net param 2014-03-27 23:42:29 -07:00
Jeff Donahue 1b30e0ad48 upgrade_net_proto: allow input files already in new proto format 2014-03-27 23:42:28 -07:00
Jeff Donahue 6de9f0a1c5 add test for input/input_dim and fix bug, wasn't copying input 2014-03-27 23:42:28 -07:00
Jeff Donahue 461b8745bd add upgrade_net_proto tool 2014-03-27 23:42:28 -07:00
Jeff Donahue be8d83603c make ReadProtoFromTextFile not die on parse failure; add 
ReadProtoFromTextFileOrDie which has the old functionality
 2014-03-27 23:42:28 -07:00
Jonathan L Long 48cbcb617f tools should have nonzero error exit codes 2014-03-27 16:40:10 -07:00
Jonathan L Long 71136b0bb7 passing too many args to tool binaries is an error 2014-03-27 15:17:51 -07:00
Evan Shelhamer 6db92e838b Standardize copyright, add root-level CONTRIBUTORS credit 2014-03-27 11:20:35 -07:00
Jeff Donahue e6ef9ca4c8 Merge pull request #209 from jeffdonahue/loss-in-forward-pass 
Compute loss in the forward pass
 2014-03-21 12:52:16 -07:00
Evan Shelhamer 50862880dd Back-merge documentation and script fixes 
fix script path incantation
convert css indentation to spaces
fix cifar10 leveldb creation path
wget without checking certificate for dropbox (dodge complaint on linux)
docs: added list of contributors
minor style update of docs
 2014-03-19 22:34:01 -07:00
Evan Shelhamer 19a7e23ccc fix script path incantation 2014-03-19 22:31:59 -07:00
Sergey Karayev c10ba54f0f Merge pull request #161 from kloudkl/simplify_feature_extraction 
Feature extraction, feature binarization and image retrieval examples
 2014-03-19 21:21:28 -07:00
Jeff Donahue aee5f54661 fix net_speed_benchmark so 'make all' works 2014-03-19 12:37:31 -07:00
Evan Shelhamer 32ee91c204 Merge pull request #221 from jamt9000/fix-dump-network 
Fix dump network
 2014-03-19 12:31:39 -07:00
Kai Li 2ac5785561 File naming convention requires that two words be split by a underscore 2014-03-19 12:31:38 -07:00
Kai Li b5803c627a Fix shell script current dir bad substition errors 2014-03-19 12:31:38 -07:00
Kai Li a967cf5d29 Move binarize_features, retrieve_images to examples/feauture_extraction 2014-03-19 23:04:42 +08:00
Kai Li 25b6bcc420 Add a python script to generate a list of all the files in a directory 2014-03-19 23:04:42 +08:00
Kai Li 6a60795aec Don't create a new batch after all the feature vectors have been saved 2014-03-19 23:04:42 +08:00
Kai Li 5bcdebdafb Fix cpplint errors for Net, its tests and feature related 3 examples 2014-03-19 23:04:42 +08:00
Kai Li 8e7153b4db Use lowercase underscore naming convention for Net blob & layer getters 2014-03-19 23:04:42 +08:00
Kai Li c60d551781 Move extract_features, binarize_features, retrieve_images to tools/ 2014-03-19 23:04:42 +08:00
James Thewlis 28d27ee908 Remove cudaSetDevice(1) 
So it works when there is only one GPU
 2014-03-19 14:55:44 +00:00
Evan Shelhamer 8ce9236af4 lint, except for rand/rand_r 2014-03-18 15:45:42 -07:00
James Thewlis 0f9a28dace Set phase to TRAIN when performing backward pass 2014-03-18 09:28:09 +00:00
Kai Li 53f1ef3af2 Display total num of processed files after computing image mean 2014-03-18 15:54:37 +08:00
James Thewlis 3345aa409a Fix wrong argv check for whether a backward pass should be done 2014-03-17 20:50:41 +00:00
James Thewlis 67f6910fc7 Prevent blob from being freed at end of if statement scope 
Was causing nonsense data to be read, tripping the blob size
check in Blob::CopyFrom
 2014-03-17 20:48:37 +00:00
Evan Shelhamer 04d6595d3c Merge pull request #136 from kloudkl/cuda_timing 
Add Timer class unifying CPU and GPU timer and use it in net_speed_benchmark
 2014-03-13 11:31:36 -07:00
linmin a2c2f3ce57 move if outside of forloop 2014-03-10 18:31:14 -07:00
linmin 53db54aa25 compute data mean for float_data 2014-03-10 18:31:13 -07:00
Kai Li cc509a913b Fix the cpplint errors for benchmark Timer 2014-03-04 10:02:37 +08:00
Kai Li 342a9111c0 Add state machine, boost::posix_time based cpu timer & tests for Timer 2014-03-04 10:02:26 +08:00
Kai Li cd84539806 Replace CPU timer with newly added Timer to benchmark net speed 2014-03-04 10:02:13 +08:00
Kai Li 8e580fd1e9 Synchronize GPU before CPU timers start and stop in net_speed_benchmark 2014-03-04 10:01:42 +08:00
chyojn d31a36d6a5 use absolute path in script 2014-02-28 14:46:13 +08:00
Jeff Donahue 8c58e415b4 fix linter errors in examples 2014-02-26 15:42:39 -08:00
Evan Shelhamer 4f1cdeb4ef Make tools/ for core binaries, stow scripts/ in tools/extra 
Collect core Caffe tools like train_net, device_query, etc. together in
tools/ and include helper scripts under tools/extra.
 2014-02-26 12:37:44 -08:00