Sasa Galic
d7b4e744c9
Merge caffe/windows@{2016-03-08} into master
2016-03-08 10:15:59 -08:00
Sasa Galic
cf7c0a4643
Fix issues after the latest merge
2016-03-07 04:45:24 -08:00
Sasa Galic
90fcdc0b5a
Merge master@{2016-03-07} into windows
2016-03-07 02:52:57 -08:00
Jon Long
c1126aadb6
Merge pull request #3590 from junshi15/GPUUtilities
...
Add functions to check and grab GPU
2016-03-05 19:32:14 -08:00
Jon Long
54162f85f7
Merge pull request #3588 from junshi15/P2psyncPrepare
...
Refine P2PSync
2016-03-05 19:17:14 -08:00
Evan Shelhamer
74cc4970c8
Merge pull request #3613 from longjon/py-coord-map
...
Python/net spec coordinate map and crop offset computation
2016-03-05 11:35:56 -08:00
Evan Shelhamer
ca1ce4a907
Merge pull request #3570 from BlGene/crop-nd
...
ND Crop layer
2016-03-05 11:34:50 -08:00
Jun Shi
01528918c7
split p2psync::run()
2016-03-05 07:07:21 -08:00
Evan Shelhamer
e03a2873a0
Crop: more tests and test tuning.
...
Changes are:
reduce test blob dims for speed
use standard Gaussian filler,
polish formatting and rename tests,
test HW crop and 5D crop,
standard gradient checks
2016-03-05 14:59:51 +00:00
max argus
ca9fa498fb
Crop: fixes, tests and negative axis indexing.
2016-03-05 14:59:51 +00:00
max argus
952fd17e52
Extend Crop to N-D, changed CropParameter.
2016-03-05 14:59:51 +00:00
Jonathan L Long
64e78bdc76
add CropLayer: crop blob to another blob's dimensions with offsets
...
configure offset(s) through proto definition.
2016-03-05 14:59:51 +00:00
Jun Shi
b9ea026785
add check and find GPU device utilities
2016-03-04 22:50:29 -08:00
Evan Shelhamer
880e147427
[pycaffe] test coord_map
...
- test known mappings: conv-pool-deconv stack, ReLU and 1x1 conv
- test effects of padding
- test rectangular/anisotropic coordinate mapping, test N-D
- catch error cases: negative crop, scale mismatch, tops that are not
spatially connected
2016-03-04 19:09:51 -08:00
Evan Shelhamer
25b9ef95f3
[pycaffe] align coord_map and #3570 Crop layer
...
- crop -> offset
- adjust crop axis by 1
2016-03-04 19:09:51 -08:00
Evan Shelhamer
6149e7383e
[pycaffe] document, style, and complete coord_map
...
- document by docstring and comment
- pep8
- add latest layers and alphabetize
- respect default crop params
- handle graphs with compositions of crops by walking only the
first, cropped bottom of Crop layers
- make python3 happy by replacing arg tuple unpacking
2016-03-04 19:09:21 -08:00
Evan Shelhamer
6a0b98768d
Merge pull request #3770 from BlGene/lint_fix
...
Removed lint script reference to non-existant caffe_memcpy function.
2016-03-04 18:53:21 -08:00
Jonathan L Long
7a8b19f957
[pycaffe] add coord_map.py for computing induced coordinate transform
...
This provides a framework for automatically aligning different layers of
a net despite up/downsampling, padding, and output size rounding.
2016-03-04 15:30:51 -08:00
Jon Long
a1c81aca64
Merge pull request #3773 from longjon/travis-protobuf3-fix
...
Travis: force protobuf 3.0.0b2 for Python 3
2016-03-04 13:58:03 -08:00
Jonathan L Long
ebfa2af1ca
[travis] force protobuf 3.0.0b2 for Python 3
...
This is temporary measure to avoid an apparent upstream issue with
protobuf 3.0.0b2.post1.
2016-03-04 12:53:49 -08:00
max argus
db7a26162c
Removed lint script reference to non-existant caffe_memcpy function.
2016-03-04 01:59:48 +00:00
Evan Shelhamer
c2354b9860
Merge pull request #3575 from errord/fix-boost-shared_ptr-caffe-Blob-float-no-register
...
[pycaffe] fix boost 1.60 compatibility issue; close #3494
2016-03-03 16:42:00 -08:00
pavlejosipovic
60c639770c
Merge pull request #30 from zer0n/master
...
Remove MIL layers (fix #27 )
2016-03-03 20:09:14 +01:00
Kenneth Tran
588c334bb0
remove MIL layers
2016-03-03 07:42:24 -08:00
Jon Long
559758d0c5
Merge pull request #3716 from ttdt/master
...
Use six library to ensure pycaffe.py python3 compliance
2016-03-02 16:23:14 -08:00
pavlejosipovic
6cb3194667
Merge pull request #23 from lunzueta/master
...
matcaffe VS project and scripts added.
2016-03-02 16:58:57 +01:00
Luis Unzueta
bc07e063ad
Add support for matcaffe build in Windows
...
Necessary changes to enable matcaffe build in Windows:
- Visual Studio project file added.
- Common settings file updated.
- Pre and post build scripts added.
- 3rd party dependencies resolved through NuGet.
- Minor code changes.
2016-03-02 15:22:54 +01:00
Jeff Donahue
37d1f915f9
Merge pull request #3759 from vivkul/patch-1
...
minor mistakes removed
2016-03-01 21:11:22 -08:00
Viveka Kulharia
4f4d020949
minor mistakes removed
2016-03-02 10:37:56 +05:30
Evan Shelhamer
93af70e464
[example] groom multilabel notebook title, order
2016-03-01 15:41:33 -08:00
Evan Shelhamer
f561682cf2
Merge pull request #3755 from shelhamer/fix-upgrade-proto
...
Fix Upgrade Net Tools
2016-03-01 12:18:57 -08:00
Evan Shelhamer
358b60c501
Merge pull request #3471 from beijbom/clean-datalayer-tutorial
...
[example] tutorial on python data layers and multilabel classification
2016-03-01 10:29:15 -08:00
Evan Shelhamer
2c5a24e35f
Merge pull request #3756 from intelcaffe/mkl-cosmetic-imprvmnts
...
[build] MKL support improvements
2016-03-01 10:00:33 -08:00
Pavle Josipovic
55f3cfd46d
Tweak default build options
...
Make compiling Maxwell and Kepler cuda arch default.
Support extrating cuDNN files to CUDA install folder.
Copy caffe dependancies to python output folder.
Adjust README.md
2016-03-01 16:05:25 +01:00
happynear
14f17f9499
support signal handler
2016-03-01 16:05:14 +01:00
Jacek Czaja
326a486d7e
- doc and cmake update MKL related
...
- cosmetic change to mkl related doc
2016-03-01 15:54:36 +01:00
pavlejosipovic
bed9df09ac
Update README.md
...
Add build badges.
Add windows build guide.
2016-03-01 11:03:57 +01:00
Evan Shelhamer
7eaeb3aeaa
refuse to upgrade net with layer/layers inconsistency
...
die loudly if a net definition (prototxt) mixes proto formats by
defining both `layer` and `layers` fields instead of complaining but
discarding and continuing.
fix #3381
2016-02-29 21:24:47 -08:00
Evan Shelhamer
ff6c6e4875
fix input field -> input layer net upgrade: only convert full defs
...
convert inputs in legacy definitions (prototxt), but simply strip inputs
from legacy weights (caffemodel).
fix #3750
2016-02-29 21:24:29 -08:00
Evan Shelhamer
effa9411ca
check all net upgrade conditions
...
check all conditions all the time; V0 -> V1 and V1 -> V2 do not suffice.
2016-02-29 21:22:15 -08:00
Evan Shelhamer
01d5a9e0af
output all logging from upgrade net tools
...
output info, warnings, and errors for fuller description of the upgrade
2016-02-29 21:22:15 -08:00
Oscar Beijbom
9f8f7775a8
Finalized tutorial. Removed asyncronous layer.
2016-02-29 19:16:03 -08:00
Evan Lezar
cf765b983a
Refactor and improve code style.
...
Fix some typos. Correct imports. Refactor data layers. Apply PEP8 formatting.
2016-02-29 19:09:59 -08:00
Oscar Beijbom
15a979df45
Added tutorial on how to use python datalayers and multilabel classification.
2016-02-29 19:07:55 -08:00
Evan Shelhamer
e5315fe702
Merge pull request #3747 from Nerei/master
...
[pycaffe] NetSpec: set tops by attribute or dictionary
2016-02-29 09:13:01 -08:00
Anatoly Baksheev
cb277769a4
NetSpec: allow setting blob names by string
2016-02-29 18:01:11 +03:00
Thibault Deregnaucourt
666da79ad2
Use 'six' library to ensure python3 compliance.
...
Use '//' instead of '/' for entire division.
2016-02-29 10:21:07 +01:00
Jeff Donahue
c2769c1096
Merge pull request #3725 from shaibagon/drop_nd_blobs
...
supporting N-D Blobs in Dropout layer Reshape
2016-02-28 00:31:17 -08:00
shai
bef2c05d61
supporting N-D Blobs in Dropout layer Reshape
...
fixing lint errors
2016-02-28 08:53:18 +02:00
Evan Shelhamer
04aa36e271
Merge pull request #3740 from shelhamer/fix-docker-flags
...
Fix flags for nvidia-docker from #3518
2016-02-27 12:12:24 -08:00