Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DenseNet feature pyramid computation #308

Closed
wants to merge 92 commits into from

Commits on Mar 18, 2014

  1. import of ffld patchwork code; initial skeleton of pyramid stitching …

    …and its python iface
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    fc3503f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    176b0cc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1821069 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f00eb3f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ecbd74e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f723879 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c005e6b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    96bfea8 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4f25c7c View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    a99c574 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    5944af5 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    f76ca85 View commit details
    Browse the repository at this point in the history
  13. streamlining upsampling/downsampling code. going to return scale fact…

    …ors (as Sergey suggested)
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    78fb085 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    c05ae56 View commit details
    Browse the repository at this point in the history
  15. remove Eigen debris

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    d506d66 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    b1c06e0 View commit details
    Browse the repository at this point in the history
  17. now returning a DICT instead of a LIST from extract_features(). the n…

    …ew data type is dict['feat'] = list of feature scales
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    7c1ea80 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    0af3167 View commit details
    Browse the repository at this point in the history
  19. returning scales that make sense

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    45a327f View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    e904f25 View commit details
    Browse the repository at this point in the history
  21. -- initial work on matlab exports for feature pyramid extraction.

    -- note: this commit almost certainly breaks compilation of matcaffe.
    
    mwm
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    178c693 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    3decf2f View commit details
    Browse the repository at this point in the history
  23. -- use p_vect_float instead of mxArray for buffering feature pyramid …

    …caffe output in matlab wrapper.
    
    mwm
    
    fix matlab vs octave compile stuff for matlab pyramid API
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    a2f3361 View commit details
    Browse the repository at this point in the history
  24. moved stitch_pyramid from caffe/python/caffe/imagenet/stitch_pyramid …

    …-> caffe/src/stitch_pyramid
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    30b8049 View commit details
    Browse the repository at this point in the history
  25. fixed demo

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    0cbbe39 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    12e2fcd View commit details
    Browse the repository at this point in the history
  27. partially implimented padding: background->mean; edges linear interp …

    …to mean; corner regions still TODO
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    0e17940 View commit details
    Browse the repository at this point in the history
  28. add interpolation-to-mean to corner padding for image pyramid patchwo…

    …rk; other minor changes.
    
    -- fill corners of padding with interpolation of edge padding (which is in turn already an interpolation from the image edge to the imagenet mean).
    -- add .PHONY stitch target to top level makefile for building just libStitchPyramid
    -- minor fix to testing makefile: add a -L. to src/stitch_pyramid/build/Makefile
    -- update matcaffe.cpp comment with current mkoctfile-based build command (can be used to test building matcaffe under octave)
    -- condense str() in featpyramid_common.hpp (str() is for debugging printfs)
    -- add a copy of str() in JPEDPyramid.cpp (FIXME: use some common copy?)
    
    mwm
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    ad8a025 View commit details
    Browse the repository at this point in the history
  29. add timers

    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    b0af64c View commit details
    Browse the repository at this point in the history
  30. pycaffe/stitchpyramid related makefile tweaks; add missing (PyArrayOb…

    …ject*) casts (to fix compile errors for some build envs).
    
    note also that there is a new SHARED_LDFLAGS makefile var that can be set to include -Wl,--no-undefined (for gcc) to avoid accidentally linking an .so missing some of its dependencies. but, since people use other compilers, it's not enabled by default, and only the stitch library build line uses the macro at this point.
    
    mwm
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    77b207b View commit details
    Browse the repository at this point in the history
  31. change default plane size in featpyramid matlab demo to 1100x1100.

    the decrease from 2000x2000 to 1100x1100 should consistently allow running on GPUs with less than 4G of memory (i.e. 2G).
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    efbd4cb View commit details
    Browse the repository at this point in the history
  32. indentation and comments

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    d7027dd View commit details
    Browse the repository at this point in the history
  33. add visualization to demo

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    6dee408 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    7b785fc View commit details
    Browse the repository at this point in the history
  35. running hog pyra for regression test

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    252737a View commit details
    Browse the repository at this point in the history
  36. testing scale calc

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    84fa075 View commit details
    Browse the repository at this point in the history
  37. bbox slicing from pyra looks reasonable now. (in hog space... will te…

    …st in convnet space soon)
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    59f7a39 View commit details
    Browse the repository at this point in the history
  38. working on only using pyramids and no on-demand features in DPM train…

    …ing. root_model() now updates spos{} to 'know' its root filter shape
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    f5073c5 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    fba4623 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    ed97d45 View commit details
    Browse the repository at this point in the history
  41. looks like there's systematic shift of bboxes slightly left from wher…

    …e they should be. (when rounding)
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    e0aafd0 View commit details
    Browse the repository at this point in the history
  42. centering approx bbox on each exemplar in hog space. (previously, was…

    … anchored to top left)
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    ed74ae5 View commit details
    Browse the repository at this point in the history
  43. centering hog features, this time with ceil() instead of round(). als…

    …o, looking at results without truncation features.
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    223e01a View commit details
    Browse the repository at this point in the history
  44. Configuration menu
    Copy the full SHA
    1b2bfb3 View commit details
    Browse the repository at this point in the history
  45. setting up shared DenseNet_Params class for both the matlab and pytho…

    …n APIs to share
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    e8fa849 View commit details
    Browse the repository at this point in the history
  46. Configuration menu
    Copy the full SHA
    8ca7682 View commit details
    Browse the repository at this point in the history
  47. Configuration menu
    Copy the full SHA
    a2083d2 View commit details
    Browse the repository at this point in the history
  48. changes to convnet_featpyramid matlab interface

    return value is now a scalar structure array with fields 'feat' (a cell array of 3D numeric arrays) and 'scales' (a 1D numeric array).
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    cfb7491 View commit details
    Browse the repository at this point in the history
  49. Configuration menu
    Copy the full SHA
    aaa149a View commit details
    Browse the repository at this point in the history
  50. Configuration menu
    Copy the full SHA
    15aa69a View commit details
    Browse the repository at this point in the history
  51. convnet_featpyramid matlab iface: add placeholder feat_padx and feat_…

    …pady fields to output (always set = 1)
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    7643481 View commit details
    Browse the repository at this point in the history
  52. convnet_featpyramid matlab/python iface changes

    -- add sbin to matlab output
    -- add feat_padx, feat_pady, sbin to python output
    -- add parameters to python input
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    3824282 View commit details
    Browse the repository at this point in the history
  53. Configuration menu
    Copy the full SHA
    655c534 View commit details
    Browse the repository at this point in the history
  54. solving problem of 'some pyra scales are too big for planes.' pruning…

    … scales that are too big. added some additional error checking too.
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    ef6fa03 View commit details
    Browse the repository at this point in the history
  55. Configuration menu
    Copy the full SHA
    071051e View commit details
    Browse the repository at this point in the history
  56. debugging voc5 + densenet

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    6b10cf6 View commit details
    Browse the repository at this point in the history
  57. Configuration menu
    Copy the full SHA
    d1ca61e View commit details
    Browse the repository at this point in the history
  58. Configuration menu
    Copy the full SHA
    0393fe1 View commit details
    Browse the repository at this point in the history
  59. Configuration menu
    Copy the full SHA
    019cfbf View commit details
    Browse the repository at this point in the history
  60. add layer_strides() vector/accessor to net.{cpp,h}

    ... and use it to compute sbin / convnet_subsampling_ratio in get_sbin() in featpyra_common.hpp
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    79021c4 View commit details
    Browse the repository at this point in the history
  61. Configuration menu
    Copy the full SHA
    c4961d9 View commit details
    Browse the repository at this point in the history
  62. Configuration menu
    Copy the full SHA
    d1220a7 View commit details
    Browse the repository at this point in the history
  63. use get_sbin(net_) to get sbin in pycaffe and matcaffe.

    but, TODO/FIXME the hard-coded usage in Patchwork.cpp
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    515ff5e View commit details
    Browse the repository at this point in the history
  64. Configuration menu
    Copy the full SHA
    a2a178e View commit details
    Browse the repository at this point in the history
  65. Configuration menu
    Copy the full SHA
    99e3a83 View commit details
    Browse the repository at this point in the history
  66. enabling user-configurability of 'minimum desired scale' in the form …

    …of feat_minHeight,feat_minWidth. this is now usable in the the Python wrapper. We should add it to Matlab wrapper soon.
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    2c2ec64 View commit details
    Browse the repository at this point in the history
  67. Configuration menu
    Copy the full SHA
    eacacdb View commit details
    Browse the repository at this point in the history
  68. matcaffe: almost-minimal commit to fix/add feat_min{Width,Height} sup…

    …port
    
    note that matcaffe was broken (would compile, but would have incorrect behavior) when feat_min{Width,Height} were added these since the function that should have been taking them has 5 int args, all with defaults, and new args were added in middle of the arg list.
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    688419f View commit details
    Browse the repository at this point in the history
  69. Configuration menu
    Copy the full SHA
    0d1cfb2 View commit details
    Browse the repository at this point in the history
  70. Configuration menu
    Copy the full SHA
    cbaea77 View commit details
    Browse the repository at this point in the history
  71. Configuration menu
    Copy the full SHA
    294054f View commit details
    Browse the repository at this point in the history
  72. Configuration menu
    Copy the full SHA
    30d999a View commit details
    Browse the repository at this point in the history
  73. testing out the 'user-selectable min image scale' stuff in python and…

    … matlab. also, commenting out InitGoogleLogging() in matcaffe until we decide how to avoid multiple calls to InitGoogleLogging
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    42dde72 View commit details
    Browse the repository at this point in the history
  74. improve google logging init for matcaffe but note that it is still wr…

    …ong.
    
    at a minimum, maybe we should have a way to disable trying to init logging (i.e. as a param to caffe('init')) as a workaround for the multiple-library usage case?
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    67ffe15 View commit details
    Browse the repository at this point in the history
  75. simplified demo

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    0c83487 View commit details
    Browse the repository at this point in the history
  76. Configuration menu
    Copy the full SHA
    745c0f7 View commit details
    Browse the repository at this point in the history
  77. fix paths in demo

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    869ef4d View commit details
    Browse the repository at this point in the history
  78. Configuration menu
    Copy the full SHA
    7c9966f View commit details
    Browse the repository at this point in the history
  79. remove 'keyboard' call

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    41b3e9b View commit details
    Browse the repository at this point in the history
  80. Configuration menu
    Copy the full SHA
    1b634f8 View commit details
    Browse the repository at this point in the history
  81. Configuration menu
    Copy the full SHA
    ea449b1 View commit details
    Browse the repository at this point in the history
  82. various cpu mode tweaks

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    4db11fa View commit details
    Browse the repository at this point in the history
  83. sped stitch_pyramid up a bit (maybe 2x?) by avoiding calls to uninlin…

    …ed image.bits().
    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    cd364b2 View commit details
    Browse the repository at this point in the history
  84. tweaks to model and training script

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    819aaf4 View commit details
    Browse the repository at this point in the history
  85. less restrictive check on filename

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    8e8c3a0 View commit details
    Browse the repository at this point in the history
  86. pyramid padding calculation

    forresti authored and moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    25a399d View commit details
    Browse the repository at this point in the history
  87. Configuration menu
    Copy the full SHA
    d208df7 View commit details
    Browse the repository at this point in the history
  88. fix Makefile to use $(SHARED_LDFLAGS) instead of a hard-coded '-share…

    …d' for building pycaffe
    moskewcz committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    d342fca View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2014

  1. Configuration menu
    Copy the full SHA
    3c85b8f View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2014

  1. update README.md with DenseNet arXiv paper link; fix/polish attributi…

    …on/license note there too.
    moskewcz committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    bd3dfa8 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    Added some DenseNet API documentation. This will probably percolate from this top-level README.md to the caffe.berkeleyvision.org gh-pages.
    forresti committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    8717483 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2014

  1. Configuration menu
    Copy the full SHA
    cbc7d8c View commit details
    Browse the repository at this point in the history