platform/upstream/caffe.git
10 years agoMerge pull request #114 from jeffdonahue/dags-by-split
Evan Shelhamer [Mon, 17 Feb 2014 19:37:40 +0000 (11:37 -0800)]
Merge pull request #114 from jeffdonahue/dags-by-split

Support arbitrary DAGs with SplitLayer

10 years agoremove unnecessary include
Jeff Donahue [Sun, 16 Feb 2014 20:31:40 +0000 (12:31 -0800)]
remove unnecessary include

10 years agoeliminate some cruft by relying on std::map default initializations
Jeff Donahue [Sun, 16 Feb 2014 19:11:03 +0000 (11:11 -0800)]
eliminate some cruft by relying on std::map default initializations

10 years agoget rid of messy snprintf string concatenation
Jeff Donahue [Sun, 16 Feb 2014 18:02:42 +0000 (10:02 -0800)]
get rid of messy snprintf string concatenation

10 years agoget_split_blob_name returns a string to remove some verbosity
Jeff Donahue [Sun, 16 Feb 2014 11:18:39 +0000 (03:18 -0800)]
get_split_blob_name returns a string to remove some verbosity

10 years agoremove redundant add_bottom (immediately cleared and then re-added)
Jeff Donahue [Sun, 16 Feb 2014 10:02:32 +0000 (02:02 -0800)]
remove redundant add_bottom (immediately cleared and then re-added)

10 years agoadd test for layer with two tops that are inputs to multiple layers
Jeff Donahue [Sun, 16 Feb 2014 09:49:27 +0000 (01:49 -0800)]
add test for layer with two tops that are inputs to multiple layers

10 years agofix comment typo
Jeff Donahue [Sun, 16 Feb 2014 09:38:32 +0000 (01:38 -0800)]
fix comment typo

10 years agoremove pointlessly duplicated CheckGradientExhaustive calls (I screwed
Jeff Donahue [Sun, 16 Feb 2014 00:48:10 +0000 (16:48 -0800)]
remove pointlessly duplicated CheckGradientExhaustive calls (I screwed
up when merging, I think)

10 years agochange \" in test_split_layer to ' for readability
Jeff Donahue [Sun, 16 Feb 2014 00:38:47 +0000 (16:38 -0800)]
change \" in test_split_layer to ' for readability

10 years agoallow in place computation of SplitLayer 0th top blob
Jeff Donahue [Sun, 16 Feb 2014 00:28:44 +0000 (16:28 -0800)]
allow in place computation of SplitLayer 0th top blob

10 years agogive first top split blob same name as bottom blob
Jeff Donahue [Sun, 16 Feb 2014 00:00:44 +0000 (16:00 -0800)]
give first top split blob same name as bottom blob

10 years agochange \n's to less distracting spaces in hard-coded proto strings
Jeff Donahue [Sat, 15 Feb 2014 23:56:15 +0000 (15:56 -0800)]
change \n's to less distracting spaces in hard-coded proto strings

10 years agoeliminate redundant code with get_split_blob_name method
Jeff Donahue [Sat, 15 Feb 2014 23:52:48 +0000 (15:52 -0800)]
eliminate redundant code with get_split_blob_name method

10 years agosome cleanup
Jeff Donahue [Sat, 15 Feb 2014 22:51:37 +0000 (14:51 -0800)]
some cleanup

10 years agoadd split layer insertion tests; move split insertion code to util file
Jeff Donahue [Sat, 15 Feb 2014 22:39:44 +0000 (14:39 -0800)]
add split layer insertion tests; move split insertion code to util file

10 years agoadd split layer tests
Jeff Donahue [Sat, 15 Feb 2014 20:24:00 +0000 (12:24 -0800)]
add split layer tests

10 years agoadd split layer tests
Jeff Donahue [Sat, 15 Feb 2014 20:24:00 +0000 (12:24 -0800)]
add split layer tests

10 years agomake split_layer backward obey propagate_down
Jeff Donahue [Sat, 15 Feb 2014 20:07:02 +0000 (12:07 -0800)]
make split_layer backward obey propagate_down

10 years agoadd SplitLayer and Net::AddSplits to transform shared bottom blobs into
Jeff Donahue [Sat, 15 Feb 2014 19:53:24 +0000 (11:53 -0800)]
add SplitLayer and Net::AddSplits to transform shared bottom blobs into
split layers

10 years agodefine by := (no need for re-expansion)
Evan Shelhamer [Sat, 15 Feb 2014 07:28:26 +0000 (23:28 -0800)]
define by := (no need for re-expansion)

10 years agopython requirements: don't fear the future
Evan Shelhamer [Sat, 15 Feb 2014 02:14:56 +0000 (18:14 -0800)]
python requirements: don't fear the future

10 years agoadd shebang to python scripts
Evan Shelhamer [Fri, 14 Feb 2014 23:40:38 +0000 (15:40 -0800)]
add shebang to python scripts

for executing in the shell without call to python. Follows the example
of @kloudkl .

10 years agoadd macro for numpy < 1.7
Evan Shelhamer [Thu, 23 Jan 2014 17:10:44 +0000 (09:10 -0800)]
add macro for numpy < 1.7

as suggested by @longjon
https://github.com/BVLC/caffe/issues/44#issuecomment-32832810

10 years agoMerge pull request #106 from tdomhan/sigmoidlayer
Yangqing Jia [Thu, 13 Feb 2014 17:56:35 +0000 (09:56 -0800)]
Merge pull request #106 from tdomhan/sigmoidlayer

Sigmoidlayer

10 years agofixed copyright
Tobias Domhan [Thu, 13 Feb 2014 17:20:27 +0000 (18:20 +0100)]
fixed copyright

10 years agosigmoid layer cpu and gpu code
Tobias Domhan [Thu, 13 Feb 2014 16:42:21 +0000 (17:42 +0100)]
sigmoid layer cpu and gpu code

10 years agoadded sigmoid layer
Tobias Domhan [Thu, 13 Feb 2014 16:32:18 +0000 (17:32 +0100)]
added sigmoid layer

10 years agoMerge pull request #104 from sergeyk/master
Evan Shelhamer [Thu, 13 Feb 2014 09:42:22 +0000 (01:42 -0800)]
Merge pull request #104 from sergeyk/master

Groom detection demo notebook, replace gflags with argparse in detector.py

10 years agoselective_search_demo final updated version
Sergey Karayev [Thu, 13 Feb 2014 09:22:02 +0000 (01:22 -0800)]
selective_search_demo final updated version

10 years agodetector.py refactored with argparse (was gflags)
Sergey Karayev [Thu, 13 Feb 2014 09:21:43 +0000 (01:21 -0800)]
detector.py refactored with argparse (was gflags)

10 years agoUpdated detection demo notebook.
Sergey Karayev [Thu, 13 Feb 2014 09:03:03 +0000 (01:03 -0800)]
Updated detection demo notebook.
- Works with new detector.py
- Everything is run automatically from cells.

10 years agogit-ignoring ipython notebook checkpoints
Sergey Karayev [Thu, 13 Feb 2014 07:58:33 +0000 (23:58 -0800)]
git-ignoring ipython notebook checkpoints

10 years agomoving selective_search_demo notebook to examples/
Sergey Karayev [Thu, 13 Feb 2014 07:58:21 +0000 (23:58 -0800)]
moving selective_search_demo notebook to examples/

10 years agoUpdate LICENSE
Yangqing Jia [Thu, 13 Feb 2014 06:18:28 +0000 (22:18 -0800)]
Update LICENSE

Removed the FreeBSD disclaimer (which should not be there) per http://opensource.org/licenses/BSD-2-Clause

10 years agoMerge pull request #103 from Yangqing/master
Yangqing Jia [Thu, 13 Feb 2014 05:59:13 +0000 (21:59 -0800)]
Merge pull request #103 from Yangqing/master

bugfix regarding #100

10 years agobugfix regarding #100
Yangqing Jia [Thu, 13 Feb 2014 05:52:33 +0000 (21:52 -0800)]
bugfix regarding #100

10 years agoUpdate net.cpp
Yangqing Jia [Thu, 13 Feb 2014 01:31:36 +0000 (17:31 -0800)]
Update net.cpp

Fixed bug raised by @tdomhan in issue #100.

10 years agoMerge pull request #98 from kloudkl/check_data_size
Evan Shelhamer [Wed, 12 Feb 2014 09:34:42 +0000 (01:34 -0800)]
Merge pull request #98 from kloudkl/check_data_size

fix size initialization in convert_imageset

10 years agoSet data_size_initialized to true after data_size is initialized
Kai Li [Wed, 12 Feb 2014 08:15:08 +0000 (16:15 +0800)]
Set data_size_initialized to true after data_size is initialized

10 years agoadd CXXFLAGS for libstdc++ on OS X 10.9
Evan Shelhamer [Wed, 12 Feb 2014 03:55:41 +0000 (19:55 -0800)]
add CXXFLAGS for libstdc++ on OS X 10.9

10 years agoMerge pull request #94 from kloudkl/image_data_size
Yangqing Jia [Tue, 11 Feb 2014 18:09:59 +0000 (10:09 -0800)]
Merge pull request #94 from kloudkl/image_data_size

Ensure all the images are of the same size before creating leveldb

10 years agoAdd script to resize and crop images in parallel using mincepie
Kai Li [Tue, 11 Feb 2014 11:39:02 +0000 (19:39 +0800)]
Add script to resize and crop images in parallel using mincepie

10 years agoCheck data size when converting images into leveldb
Kai Li [Tue, 11 Feb 2014 07:14:11 +0000 (15:14 +0800)]
Check data size when converting images into leveldb

10 years agoinclude pip requirements.txt for python deps
Evan Shelhamer [Tue, 11 Feb 2014 08:41:01 +0000 (00:41 -0800)]
include pip requirements.txt for python deps

10 years agoMerge pull request #91 from kloudkl/plot_training_log
Evan Shelhamer [Tue, 11 Feb 2014 04:03:54 +0000 (20:03 -0800)]
Merge pull request #91 from kloudkl/plot_training_log

plot training/test measures against iterations/time
create mnist leveldb as separate script

10 years agoRemove trailing whitespace in example gnuplot script
Kai Li [Tue, 11 Feb 2014 02:59:53 +0000 (10:59 +0800)]
Remove trailing whitespace in example gnuplot script

10 years agoAdd python matplotlib example to plot the training log
Kai Li [Tue, 11 Feb 2014 02:54:15 +0000 (10:54 +0800)]
Add python matplotlib example to plot the training log

10 years agoAdd gnuplot example to plot the training log
Kai Li [Tue, 11 Feb 2014 02:48:06 +0000 (10:48 +0800)]
Add gnuplot example to plot the training log

10 years agoUpdate script to parse log format that contains test iteration
Kai Li [Mon, 10 Feb 2014 08:39:42 +0000 (16:39 +0800)]
Update script to parse log format that contains test iteration

10 years agoPrint iteration along with every test score in Solver::Test
Kai Li [Mon, 10 Feb 2014 08:03:15 +0000 (16:03 +0800)]
Print iteration along with every test score in Solver::Test

10 years agoExtract elapsed seconds since the start of solving from training log
Kai Li [Mon, 10 Feb 2014 07:42:37 +0000 (15:42 +0800)]
Extract elapsed seconds since the start of solving from training log

10 years agoExtract learning rate from training log
Kai Li [Mon, 10 Feb 2014 06:18:36 +0000 (14:18 +0800)]
Extract learning rate from training log

10 years agoreplace bundled install instructions with link to site
Evan Shelhamer [Mon, 10 Feb 2014 23:31:59 +0000 (15:31 -0800)]
replace bundled install instructions with link to site

10 years agoMerge pull request #90 from sguada/parselog
Evan Shelhamer [Mon, 10 Feb 2014 20:56:13 +0000 (12:56 -0800)]
Merge pull request #90 from sguada/parselog

Polish log parsing script

10 years agoUse sed instead of awk to find the Iteration
sguada [Sun, 9 Feb 2014 23:46:25 +0000 (15:46 -0800)]
Use sed instead of awk to find the Iteration

10 years agoUpdate parselog.sh
Sergio Guadarrama [Sun, 9 Feb 2014 22:08:10 +0000 (14:08 -0800)]
Update parselog.sh

Removed parameters

10 years agoExtract Iteration from log instead of computing it from parameters
sguada [Sun, 9 Feb 2014 22:01:14 +0000 (14:01 -0800)]
Extract Iteration from log instead of computing it from parameters

10 years agoMerge pull request #89 from sguada/parselog
Yangqing Jia [Sun, 9 Feb 2014 17:36:54 +0000 (09:36 -0800)]
Merge pull request #89 from sguada/parselog

Added bash script to parse log

10 years agoAdded bash script to parse log and extract training loss, and test loss and accuracy
sguada [Sun, 9 Feb 2014 03:46:01 +0000 (19:46 -0800)]
Added bash script to parse log and extract training loss, and test loss and accuracy

10 years agoMerge pull request #83 from sguada/net_speed
Evan Shelhamer [Fri, 7 Feb 2014 20:28:11 +0000 (12:28 -0800)]
Merge pull request #83 from sguada/net_speed

Add benchmarks

10 years agoMore detailed net_speed_benchmark
sguada [Fri, 7 Feb 2014 17:51:32 +0000 (09:51 -0800)]
More detailed net_speed_benchmark

10 years agofix path problem in train_mnist.sh
Zhongwen Xu [Thu, 6 Feb 2014 12:55:40 +0000 (20:55 +0800)]
fix path problem in train_mnist.sh

10 years agoMerge pull request #70 from petewarden/buffer-overflow
Evan Shelhamer [Wed, 5 Feb 2014 21:13:12 +0000 (13:13 -0800)]
Merge pull request #70 from petewarden/buffer-overflow

Fix for buffer overflow problem with long filenames when setting up the LevelDB

10 years agoMerge pull request #72 from sguada/solver_device_id
Jeff Donahue [Wed, 5 Feb 2014 19:19:28 +0000 (11:19 -0800)]
Merge pull request #72 from sguada/solver_device_id

Rename devicequery.cpp to device_query.cpp

10 years agoRename devicequery.cpp to device_query.cpp
Sergio Guadarrama [Wed, 5 Feb 2014 19:09:00 +0000 (11:09 -0800)]
Rename devicequery.cpp to device_query.cpp

Match filename and usage

10 years agoFix for buffer overflow problem with long filenames when setting up the LevelDB
Pete Warden [Wed, 5 Feb 2014 01:20:57 +0000 (17:20 -0800)]
Fix for buffer overflow problem with long filenames when setting up the LevelDB

10 years agoMerge pull request #69 from sguada/solver_device_id
Evan Shelhamer [Tue, 4 Feb 2014 19:03:02 +0000 (11:03 -0800)]
Merge pull request #69 from sguada/solver_device_id

set device in solver config

10 years agoUpdate solver.cpp
Sergio Guadarrama [Mon, 3 Feb 2014 21:20:05 +0000 (13:20 -0800)]
Update solver.cpp

Added these two conditions before trying SetDevice
param_.solver_mode() && param_.has_device_id()

10 years agoUpdate caffe.proto
Sergio Guadarrama [Mon, 3 Feb 2014 21:09:43 +0000 (13:09 -0800)]
Update caffe.proto

10 years agoUpdate devicequery.cpp
Sergio Guadarrama [Mon, 3 Feb 2014 21:07:37 +0000 (13:07 -0800)]
Update devicequery.cpp

Changed Copyright

10 years agoAdded device_query.cpp to examples/ to get basic information about the current GPU...
sguada [Mon, 3 Feb 2014 20:41:55 +0000 (12:41 -0800)]
Added device_query.cpp to examples/ to get basic information about the current GPU device or other device_id

10 years agoAdded device_id to solver.prototxt and to solver.cpp
sguada [Mon, 3 Feb 2014 20:40:43 +0000 (12:40 -0800)]
Added device_id to solver.prototxt and to solver.cpp

10 years agofix flatten layer backwards to dummy return
Evan Shelhamer [Mon, 3 Feb 2014 19:15:10 +0000 (11:15 -0800)]
fix flatten layer backwards to dummy return

10 years agoremoving Makefile.config
Sergey Karayev [Mon, 3 Feb 2014 11:17:53 +0000 (03:17 -0800)]
removing Makefile.config

10 years agoos x installation instructions
Sergey Karayev [Mon, 3 Feb 2014 11:14:13 +0000 (03:14 -0800)]
os x installation instructions

10 years agoMakefile.config removed in favor of .example file
Sergey Karayev [Mon, 3 Feb 2014 10:41:44 +0000 (02:41 -0800)]
Makefile.config removed in favor of .example file
with more verbose explanations of paths.

10 years agoremove linking against mkl_intel_thread: unneeded
Sergey Karayev [Mon, 3 Feb 2014 10:41:04 +0000 (02:41 -0800)]
remove linking against mkl_intel_thread: unneeded
and gives hard-to-debug errors on os x

10 years agoMerge pull request #62 from viirya/master
Evan Shelhamer [Sat, 1 Feb 2014 03:02:48 +0000 (19:02 -0800)]
Merge pull request #62 from viirya/master

Fix example path + set number of CUDA threads according to architecture

10 years agoFix test_data_layer segfault by adding destructor to join pthread
Kai Li [Sun, 12 Jan 2014 07:56:47 +0000 (15:56 +0800)]
Fix test_data_layer segfault by adding destructor to join pthread

10 years agonote pretrained model licensing: academic / non-commercial use only
Evan Shelhamer [Fri, 31 Jan 2014 10:52:29 +0000 (02:52 -0800)]
note pretrained model licensing: academic / non-commercial use only

10 years agoread single input, load/save csv, and record windows
Evan Shelhamer [Fri, 31 Jan 2014 07:12:41 +0000 (23:12 -0800)]
read single input, load/save csv, and record windows

Load `--input_file` as a list of image filenames if .txt OR read as CSV
with fields filename,ymin,xmin,ymax,xmax (with labeled header) if .csv.

Save `--output_file` as HDF5 if .h5 or CSV if .csv. For CSV, enumerate
the class probabilities as numbered class fields.

Record crop windows in original image coordinates if `center_only` or
`corners` crop mode selected. Previously, these modes didn't report
locations.

10 years agoremove outdated reference to input size, debugging print
Evan Shelhamer [Fri, 31 Jan 2014 07:26:40 +0000 (23:26 -0800)]
remove outdated reference to input size, debugging print

10 years agochoose proper thread number per block according to CUDA architecture.
Liang-Chi Hsieh [Wed, 29 Jan 2014 10:39:16 +0000 (18:39 +0800)]
choose proper thread number per block according to CUDA architecture.

10 years agofix program path.
Liang-Chi Hsieh [Wed, 29 Jan 2014 09:37:57 +0000 (17:37 +0800)]
fix program path.

10 years agoalign detector comments to reality
Evan Shelhamer [Wed, 29 Jan 2014 02:09:13 +0000 (18:09 -0800)]
align detector comments to reality

10 years agoMerge pull request #61 from kloudkl/master
Evan Shelhamer [Tue, 28 Jan 2014 09:59:27 +0000 (01:59 -0800)]
Merge pull request #61 from kloudkl/master

Save the last batch of data in image set conversion

+ comment and output edits

10 years agoSave the last batch of data in image set conversion
Kai Li [Tue, 28 Jan 2014 07:35:56 +0000 (15:35 +0800)]
Save the last batch of data in image set conversion

10 years agodetect by window list
Evan Shelhamer [Mon, 27 Jan 2014 23:20:29 +0000 (15:20 -0800)]
detect by window list

Do window detection on a list of predefined windows by adding a
crop_mode `list` that accepts a path to a text file of format:

    image_filename xmin ymin xmax ymax

10 years agoreplace magic numbers with variable names in comments
Evan Shelhamer [Mon, 27 Jan 2014 23:17:45 +0000 (15:17 -0800)]
replace magic numbers with variable names in comments

10 years agofix ImageNet solver max iteration typo
Evan Shelhamer [Sun, 26 Jan 2014 06:33:18 +0000 (22:33 -0800)]
fix ImageNet solver max iteration typo

max iteration no. is 450,000 (= 90 epochs)

caught by @SWu
https://github.com/BVLC/caffe/pull/33#issuecomment-33175810

10 years agoautomagically set detection batch size from network
Evan Shelhamer [Sun, 26 Jan 2014 04:53:00 +0000 (20:53 -0800)]
automagically set detection batch size from network

10 years agodocument power_wrapper -> detector in detection notebook
Evan Shelhamer [Sun, 26 Jan 2014 03:58:18 +0000 (19:58 -0800)]
document power_wrapper -> detector in detection notebook

10 years agoMerge pull request #56 from shelhamer/detection-wrapper
Jeff Donahue [Sun, 26 Jan 2014 02:04:56 +0000 (18:04 -0800)]
Merge pull request #56 from shelhamer/detection-wrapper

Make detection module for python wrapper

10 years agopromote power_wrapper to 'detection' submodule
Evan Shelhamer [Sat, 25 Jan 2014 04:51:00 +0000 (20:51 -0800)]
promote power_wrapper to 'detection' submodule

10 years agogroom power_wrapper flags (cont'd)
Evan Shelhamer [Sat, 25 Jan 2014 04:33:24 +0000 (20:33 -0800)]
groom power_wrapper flags (cont'd)

10 years agonote power_wrapper TODOs
Evan Shelhamer [Sat, 25 Jan 2014 03:31:25 +0000 (19:31 -0800)]
note power_wrapper TODOs

10 years agogeneralize power_wrapper to different networks and inputs
Evan Shelhamer [Sat, 25 Jan 2014 03:26:31 +0000 (19:26 -0800)]
generalize power_wrapper to different networks and inputs

generalize from the imagenet reference to other detection networks:
- refactor to configure for a given net and data source
- determine dimensions of net input and output automatically from blobs

10 years agogroom power_wrapper flags
Evan Shelhamer [Sat, 25 Jan 2014 03:24:58 +0000 (19:24 -0800)]
groom power_wrapper flags

10 years agopython lint
Evan Shelhamer [Sat, 25 Jan 2014 01:36:46 +0000 (17:36 -0800)]
python lint