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

2739 Коммитов

Автор SHA1 Сообщение Дата
forresti 4a3887ab17 fixed matcaffe printout to specify num of args (now including train/test phase) 2015-02-24 20:05:48 -08:00
Jon Long b915f9d2bb Merge pull request #1923 from philkr/python3_master 
Making python3 work with cmake and the new python wrapper
 2015-02-24 15:00:58 -08:00
philkr 54037d3942 Making python3 work with cmake and the new python wrapper 2015-02-24 14:06:36 -08:00
Jon Long 360dbfd492 Merge pull request #1926 from shelhamer/test-caffe-tool 
Check caffe tool runs
 2015-02-23 20:04:48 -08:00
Jon Long c091197b2b Merge pull request #1941 from jsupancic/cpp_lint_python2 
fixes: cpp_lint.py fails silently with Python3
 2015-02-23 20:01:27 -08:00
Jon Long 486360d3e0 Merge pull request #1948 from spmallick/patch-1 
APPLE was misspelled in Line 27
 2015-02-23 19:52:12 -08:00
spmallick 845f9eac2b APPLE was misspelled. in Line 27 2015-02-23 16:13:20 -08:00
Evan Shelhamer cb1f4d61e1 Merge pull request #1939 from Nerei/bugfix/install_rpath_for_pycaffe 
[cmake] fix install rpath for pycaffe
 2015-02-22 10:35:10 -08:00
James Supancic III 569ae01cc3 cpp_lint.py fails silently with Python3 (which is the default on some systems). 
This commit specifies Python2 with which cpp_lint.py works :-)
 2015-02-22 10:16:45 -08:00
Anatoly Baksheev 5e06d16d14 minor cmake sumamry log fix 2015-02-22 20:14:40 +03:00
Anatoly Baksheev 645aa03207 fixed bug in install-tree: _caffe.so installed by install(TARGET ...) was overwritten with symlink created at build time and installed with install(DIRECTORY ...) 2015-02-22 19:56:23 +03:00
Anatoly Baksheev fca05c34c6 set proper CMAKE_INSTALL_RPATH for _caffe.so and tools 2015-02-22 19:56:05 +03:00
Anatoly Baksheev a1e951dcf9 ignore pycharm files 2015-02-22 18:58:12 +03:00
Evan Shelhamer 5a2633370f check caffe tool runs in runtest 2015-02-20 20:29:53 -08:00
Evan Shelhamer 682d9da0db Merge pull request #1921 from shelhamer/fix-tool-linking 
[build] fix dynamic linking of tools
 2015-02-20 12:20:23 -08:00
Evan Shelhamer eabbccd4d3 [build] fix dynamic linking of tools 
set the right rpath for tools and examples respectively

thanks for the report @mees!
 2015-02-20 11:21:16 -08:00
Evan Shelhamer 5ee85b79a1 Merge pull request #1914 from eerwitt/master 
fix Imagenet example path
 2015-02-19 22:16:10 -08:00
e3 af01b9c735 Updated the path for get_ilsvrc_aux.sh to match what is found in the current project 2015-02-19 22:07:27 -08:00
Evan Shelhamer f998127ef2 Merge pull request #1849 from BVLC/next 
Next: release candidater
 2015-02-19 18:35:23 -08:00
Brandon Amos 079e4168f5 Correct 'epochs' to 'iterations' 
See https://github.com/BVLC/caffe/blob/master/models/bvlc_reference_caffenet/solver.prototxt
 2015-02-19 18:33:37 -08:00
Andre Ambrosio Boechat 5d15ed7d30 Brief explanation of SLICE layer's attributes 
* A sample code was added.
* `slice_dim` and `slice_point` attributes were explained.
 2015-02-19 18:33:29 -08:00
Evan Shelhamer 7867ead95a [docs] add check mode hint to CPU-only mode error 2015-02-19 18:31:19 -08:00
Evan Shelhamer 2d155abc4b [docs] send API link to class list 2015-02-19 18:30:36 -08:00
Evan Shelhamer 5c81243ad7 [build] fix rpath for examples 2015-02-19 18:14:57 -08:00
Evan Shelhamer 9114424cef Merge pull request #1910 from philkr/encoded 
add force_encoded_color flag to the data layer and warn about
  mixed encoding
 2015-02-19 18:01:13 -08:00
Evan Shelhamer ccd837433d Repeal revert of #1878 2015-02-19 17:54:49 -08:00
Evan Shelhamer 06ceaf452f [docs] add gitter chat badge 2015-02-19 17:49:12 -08:00
philkr a2f7f479a8 added a force_encoded_color flag to the data layer. Printing a warning if images of different channel dimensions are encoded together 2015-02-19 17:27:25 -08:00
Evan Shelhamer 6f4bdd88df Revert "Merge pull request #1878 from philkr/encoded" 
This reverts the encoding cleanup since it breaks data processing for
existing inputs as discussed in #1901.
 2015-02-19 11:03:23 -08:00
Evan Shelhamer a724e58852 Merge pull request #1907 from shelhamer/memory-warn-transform 
relax MemoryData transform check to warning
 2015-02-19 10:56:26 -08:00
Evan Shelhamer a1c160ba87 relax MemoryData transform check to warning 
warning is still useful to keep from accidentally running data without
pre-processing.
 2015-02-19 10:31:23 -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
Evan Shelhamer c66847b037 Merge pull request #1902 from shelhamer/py-stopgap 
Stop-gap fixes for pycaffe
 2015-02-19 00:25:18 -08:00
Evan Shelhamer 26c16bf414 [pycaffe] switch examples to Transformer 
This is a quick translation of the examples to the caffe.io.Transformer
interface. The results are not strictly identical to the earlier
implementation! The models now use a mean pixel instead of a mean image
for simplicity. The output classifications and detections are preserved
but scores may differ.

Note: the examples will be rewritten to make use of `caffe.Net` alone
since it is the true interface, but not yet.
 2015-02-18 20:59:40 -08:00
Evan Shelhamer 74f171bcdb [pycaffe] take pre-processing from Net and give to Transformer 
The pyreformation #1703 aligned pycaffe Net with the real Caffe Net.
This broke the pre-processing helpers that had been bolted on to
`caffe.Net`.

These responsibilities are gathered in `caffe.io.Transformer` instead.
This is only an intermediate step in a real solution to pycaffe IO that
should make use of the same data pipeline as the rest of the framework.

See #1245 for further thoughts on input processing.
 2015-02-18 20:47:12 -08:00
Evan Shelhamer cb6b09b46b [pycaffe] import newline cleanup 2015-02-18 20:46:41 -08:00
philkr d1238e14fa Changing CMAKE_SOURCE/BINARY_DIR to PROJECT_SOURCE/BINARY_DIR 2015-02-18 09:27:13 -08:00
Jonathan L Long 30771911be comment fix: Decaf -> Caffe 2015-02-17 18:23:32 -08:00
Jonathan L Long d9825e4e5a [pycaffe] fix bug in Python layer setup 
Previously, setup did not correctly override LayerSetUp (and therefore
did not run) due to an incorrect type.
 2015-02-17 15:46:29 -08:00
Evan Shelhamer 0254c149c3 Merge pull request #1790 from shelhamer/net-phase 
Give phase to Net
 2015-02-17 12:02:55 -08:00
Evan Shelhamer bb8b5d60eb [matcaffe] give phase to Net 2015-02-17 11:35:51 -08:00
Evan Shelhamer d2934aee4c [pycaffe] give phase to Net 
- expose `caffe.{TRAIN,TEST}` constants
- instantiate `caffe.Net`s with phase
- drop singleton phase interface `caffe.set_phase_{train,test}`
 2015-02-17 11:35:51 -08:00
Evan Shelhamer fe8fe5f3a1 tools make net with phase 2015-02-17 11:35:51 -08:00
Evan Shelhamer 6def482ead construct Net from file and phase 2015-02-17 11:35:51 -08:00
Evan Shelhamer ab0cc510fc no phase for the solver to orchestrate 2015-02-17 11:35:50 -08:00
Evan Shelhamer 02be9d7020 pass phase to transformer through layer 2015-02-17 11:35:50 -08:00
Evan Shelhamer 6eb0931aee give phase to Net and Layer 
Give the responsibility for phase to Net and Layer, making phase an
immutable choice at instantiation and dropping it from the Caffe
singleton.
 2015-02-17 11:35:50 -08:00
Evan Shelhamer 5e64f5a7d1 Merge pull request #1703 from longjon/pyreformation 
Reform the boost::python wrapper, including layers implemented in Python
 2015-02-17 01:34:31 -08:00
Evan Shelhamer dfbc2dcc0b Merge pull request #1887 from shelhamer/docs 
Documentation: README, credits, favicon, installation, and workflow
 2015-02-17 01:20:42 -08:00
Jonathan L Long 91289b3d95 [make] link libcaffe.so before dependencies 2015-02-17 01:19:51 -08:00