platform/upstream/caffeonacl.git
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

10 years agoignore distribute dir
Evan Shelhamer [Sat, 25 Jan 2014 00:18:17 +0000 (16:18 -0800)]
ignore distribute dir

10 years agogive batch size efficiency advice
Evan Shelhamer [Fri, 24 Jan 2014 05:15:26 +0000 (21:15 -0800)]
give batch size efficiency advice

10 years agodefault power_wrapper batch size to 10 (aeca741a69 cont'd)
Evan Shelhamer [Fri, 24 Jan 2014 05:05:17 +0000 (21:05 -0800)]
default power_wrapper batch size to 10 (aeca741a69 cont'd)

default command line arg and function arg to 10
remove global BATCH_SIZE in favor of arg

10 years agoMerge pull request #51 from sguada/solver_test
Yangqing Jia [Fri, 24 Jan 2014 02:09:43 +0000 (18:09 -0800)]
Merge pull request #51 from sguada/solver_test

Do snapshot after computing loss and test accuracy

10 years agoDo snapshot after computing loss and test accuracy
Sergio Guadarrama [Wed, 22 Jan 2014 23:13:22 +0000 (15:13 -0800)]
Do snapshot after computing loss and test accuracy

10 years agoinclude install notes
Evan Shelhamer [Wed, 22 Jan 2014 02:50:07 +0000 (18:50 -0800)]
include install notes

10 years agoinclude intro, license, and citing in README
Evan Shelhamer [Wed, 22 Jan 2014 02:37:51 +0000 (18:37 -0800)]
include intro, license, and citing in README

10 years agoLicense under BSD
Evan Shelhamer [Tue, 21 Jan 2014 02:24:41 +0000 (18:24 -0800)]
License under BSD

Caffe is henceforth BSD licensed and welcomes community contributions!

10 years agoMerge pull request #11 from longjon/master
Evan Shelhamer [Mon, 20 Jan 2014 05:17:43 +0000 (21:17 -0800)]
Merge pull request #11 from longjon/master

Python interface to blobs and blob data through boost::python

10 years agocleanup whitespace
Evan Shelhamer [Sun, 19 Jan 2014 22:34:12 +0000 (14:34 -0800)]
cleanup whitespace

10 years agoMerge pull request #29 from kloudkl/master
Evan Shelhamer [Sun, 19 Jan 2014 22:10:14 +0000 (14:10 -0800)]
Merge pull request #29 from kloudkl/master

Separate build, distribute, and src directories + build more cuda archs

10 years agoMerge pull request #34 from forresti/master
Evan Shelhamer [Sun, 19 Jan 2014 06:59:33 +0000 (22:59 -0800)]
Merge pull request #34 from forresti/master

set default power_wrapper batch size to match the imagenet_deploy

compatible out-of-the-box with the ipython notebook tutorial

10 years agosetting default power_wrapper batch size to match the imagenet_deploy prototxt
forresti [Wed, 15 Jan 2014 20:02:12 +0000 (12:02 -0800)]
setting default power_wrapper batch size to match the imagenet_deploy prototxt

10 years agoExpose params in Python interface
Jonathan L Long [Tue, 14 Jan 2014 23:44:53 +0000 (15:44 -0800)]
Expose params in Python interface

10 years agoAdd Python interface to layer blobs
Jonathan L Long [Sat, 7 Dec 2013 00:39:01 +0000 (16:39 -0800)]
Add Python interface to layer blobs

10 years agoAdd removing distribute directory when make clean
Kai Li [Mon, 13 Jan 2014 12:42:01 +0000 (20:42 +0800)]
Add removing distribute directory when make clean

10 years agoAdd make proto target to seperately generate caffe/proto/caffe.pb.h
Kai Li [Mon, 13 Jan 2014 12:25:30 +0000 (20:25 +0800)]
Add make proto target to seperately generate caffe/proto/caffe.pb.h

issue: #22

10 years agoSeperated build, distribute and source directories
Kai Li [Mon, 13 Jan 2014 11:34:34 +0000 (19:34 +0800)]
Seperated build, distribute and source directories

issue: #1

10 years agoMerge pull request #18 from jeffdonahue/bvlc
Jeff Donahue [Sun, 22 Dec 2013 21:24:34 +0000 (13:24 -0800)]
Merge pull request #18 from jeffdonahue/bvlc

change imagenet_val batch size from 200 to intended 50

10 years agochange imagenet_val batch size from 200 to intended 50
Jeff Donahue [Sun, 22 Dec 2013 21:13:47 +0000 (13:13 -0800)]
change imagenet_val batch size from 200 to intended 50

10 years agopoint caffe url to bvlc
Evan Shelhamer [Wed, 18 Dec 2013 03:21:15 +0000 (19:21 -0800)]
point caffe url to bvlc

10 years agobringing license up to date with gh-pages version
Sergey Karayev [Fri, 6 Dec 2013 20:39:49 +0000 (12:39 -0800)]
bringing license up to date with gh-pages version

10 years agoupdated detection demo notebook with picture of two cats
Sergey Karayev [Fri, 6 Dec 2013 19:28:41 +0000 (11:28 -0800)]
updated detection demo notebook with picture of two cats

10 years agoMerge pull request #10 from sergeyk/selective_search_proposals2
Yangqing Jia [Fri, 6 Dec 2013 04:14:15 +0000 (20:14 -0800)]
Merge pull request #10 from sergeyk/selective_search_proposals2

Efficient processing of images, with option to use selective search window proposals

10 years agominor edit
Sergey Karayev [Fri, 6 Dec 2013 03:35:32 +0000 (19:35 -0800)]
minor edit

10 years agoselective search notebook and renaming to power_wrapper
Sergey Karayev [Fri, 6 Dec 2013 03:33:13 +0000 (19:33 -0800)]
selective search notebook and renaming to power_wrapper

10 years agofixed bug that renormalized window crops on second resize
Sergey Karayev [Fri, 6 Dec 2013 03:12:50 +0000 (19:12 -0800)]
fixed bug that renormalized window crops on second resize

10 years agocenter_only and corners modes work correctly
Sergey Karayev [Fri, 6 Dec 2013 01:21:47 +0000 (17:21 -0800)]
center_only and corners modes work correctly

10 years agoprocessing images in batch, with option to use selective search window proposals
Sergey Karayev [Fri, 6 Dec 2013 00:38:36 +0000 (16:38 -0800)]
processing images in batch, with option to use selective search window proposals

10 years agorenaming"
Yangqing Jia [Thu, 5 Dec 2013 17:38:11 +0000 (09:38 -0800)]
renaming"

10 years agoUpdate README.md
Yangqing Jia [Thu, 5 Dec 2013 09:13:59 +0000 (01:13 -0800)]
Update README.md

10 years agoMerge pull request #9 from jeffdonahue/fixflattenbug
Yangqing Jia [Thu, 5 Dec 2013 04:24:26 +0000 (20:24 -0800)]
Merge pull request #9 from jeffdonahue/fixflattenbug

fix really stupid bug in flatten layer (and add test that shows the

10 years agofix really stupid bug in flatten layer (and add test that shows the
Jeff Donahue [Thu, 5 Dec 2013 04:16:25 +0000 (20:16 -0800)]
fix really stupid bug in flatten layer (and add test that shows the
failure case; not sure why CheckGradientExhaustive didn't catch it)

10 years agolenet.prototxt loss layer rename
Yangqing Jia [Tue, 3 Dec 2013 18:53:29 +0000 (10:53 -0800)]
lenet.prototxt loss layer rename

10 years agomnist train script
Yangqing Jia [Tue, 3 Dec 2013 18:05:19 +0000 (10:05 -0800)]
mnist train script

10 years agoSeveral changes:
Yangqing Jia [Mon, 2 Dec 2013 23:44:43 +0000 (15:44 -0800)]
Several changes:

changed the paths for the mnist demo
removed unused fields in SolverParameter
added solver_mode to specify CPU/GPU solving
accordingly, removed the set mode code in the examples code
removed examples/test_read_imagenet since it is trivial
removed get_cifar script since no cifar demo exists.

10 years agoget_mnist.sh: changed the script to generate leveldb as well.
Yangqing Jia [Mon, 2 Dec 2013 23:19:37 +0000 (15:19 -0800)]
get_mnist.sh: changed the script to generate leveldb as well.

10 years agoconvert script: spacing
Yangqing Jia [Mon, 2 Dec 2013 00:38:24 +0000 (16:38 -0800)]
convert script: spacing