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

Add & test regularizer class hierarchy: L1, L2 & skeleton of MaxNorm #113

Closed
wants to merge 98 commits into from
Closed

Add & test regularizer class hierarchy: L1, L2 & skeleton of MaxNorm #113

wants to merge 98 commits into from

Commits on Mar 19, 2014

  1. Add and test Net::HasBlob and GetBlob to simplify feature extraction

    Inspired by @kencoken's commit f36e715
    kencoken@f36e715
    
    Related issues:
    kloudkl committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    cd953c8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    760d098 View commit details
    Browse the repository at this point in the history
  3. Add image retrieval example

    kloudkl committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    e76f7dc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f0336e1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b7b9dd8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    fc740a3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4de8280 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    dfe6380 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    01bb481 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    cfb2f91 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    23eecde View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    dd13fa0 View commit details
    Browse the repository at this point in the history
  13. Change feature binarization threshold to be the mean of all the values

     rather than zero in the feature binarization example
    kloudkl committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    706a926 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    f97e87b View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    c60d551 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    8e7153b View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    5bcdebd View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    6a60795 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    25b6bcc View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    a2ad3c7 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    a967cf5 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    44ebe29 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    c7201f7 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    72c8c9e View commit details
    Browse the repository at this point in the history
  25. change specification of forward/backward function and fix layer

    definitions appropriately
    jeffdonahue committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    748aaff View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    aee5f54 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    305e731 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    5e98253 View commit details
    Browse the repository at this point in the history
  29. gradient checker optimization with forward pass loss: only need to run

    backward pass to compute analytic gradient (the thing being checked) now
    jeffdonahue committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    d54833e View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    74ed9e0 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    8a3f0c2 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    ed23b68 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    44fbb82 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    0551d93 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    a6ae5be View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2014

  1. Merge pull request #161 from kloudkl/simplify_feature_extraction

    Feature extraction, feature binarization and image retrieval examples
    sergeyk committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    c10ba54 View commit details
    Browse the repository at this point in the history
  2. Fix to #161

    - signficantly change the documentation file
    - link to it from index.md
    - remove the image resizing script, since (a) it does not work, (b) is obviated by using ImagesLayer
    - add sample prototxt that uses ImagesLayer.
    sergeyk committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    3b51aab View commit details
    Browse the repository at this point in the history
  3. Back-merge documentation and script fixes

    fix script path incantation
    convert css indentation to spaces
    fix cifar10 leveldb creation path
    wget without checking certificate for dropbox (dodge complaint on linux)
    docs: added list of contributors
    minor style update of docs
    shelhamer committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    5086288 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2014

  1. Merge pull request #209 from jeffdonahue/loss-in-forward-pass

    Compute loss in the forward pass
    jeffdonahue committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    e6ef9ca View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a123130 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #247 from jeffdonahue/loss-in-forward-window-data-…

    …layer
    
    Loss in forward pass fix for window data layer
    jeffdonahue committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    510b3c0 View commit details
    Browse the repository at this point in the history
  4. compile caffe without MKL (dependency replaced by boost::random, Eigen3)

    - examples, test and pycaffe compile without problem (matcaffe not tested)
    - tests show some errors (on cpu gradient tests), to be investigated
    - random generators need to be double checked
    - mkl commented code needs to be removed
    rodrigob authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    e4e93f4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    04ca88a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d666bdc View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    38457e1 View commit details
    Browse the repository at this point in the history
  8. Fix math funcs, add tests, change Eigen Map to unaligned for lrn_layer

    [shelhamer: removed math function tests, since they were merged via
    other branches]
    kloudkl authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    788f070 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d37a995 View commit details
    Browse the repository at this point in the history
  10. nextafter templates off one type

    Alejandro Dubrovsky authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    2ae2683 View commit details
    Browse the repository at this point in the history
  11. mean_bound and sample_mean need referencing with this

    Alejandro Dubrovsky authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    b925739 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    93c9f15 View commit details
    Browse the repository at this point in the history
  13. use boost variate_generator to pass tests w/ boost 1.46 (Gaussian filler

    previously filled in all NaNs for me, making many tests fail)
    jeffdonahue authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    4b1fba7 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b3e4ac5 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    6cbf9f1 View commit details
    Browse the repository at this point in the history
  16. fix bernoulli generator bug

    jeffdonahue authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    4f6b266 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    1cf822e View commit details
    Browse the repository at this point in the history
  18. major refactoring allow coexistence of MKL and non-MKL cases

    Rowland Depp authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    a8c9b66 View commit details
    Browse the repository at this point in the history
  19. rewrite MKL flag note, polish makefile

    add MKL dirs conditioned on USE_MKL
    include libraries before making LD_FLAGS
    shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    c028d09 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    f6cbe2c View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    ff27988 View commit details
    Browse the repository at this point in the history
  22. Fixed order of cblas and atlas linker flags

    They were the wrong way round, causing linking to fail in some cases
    jamt9000 authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    40aa12a View commit details
    Browse the repository at this point in the history
  23. Added extern C wrapper to cblas.h include

    This ensures that it works with ATLAS's header file, which doesn't include such
    a guard itself (whereas the reference version from Ubuntu's libblas-dev does)
    jamt9000 authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    a9e772f View commit details
    Browse the repository at this point in the history
  24. clean up residual mkl comments and code

    The FIXMEs about RNG were addressed by caffe_nextafter for
    uniform distributions and the normal distribution concern is surely a
    typo in the boost documentation, since the normal pdf is correctly
    stated elsewhere in the documentation.
    shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    453fcf9 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2014

  1. lint

    shelhamer committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    aaa2646 View commit details
    Browse the repository at this point in the history
  2. Hide boost rng behind facade for osx compatibility

    Split boost random number generation from the common Caffe singleton and
    add a helper function for rng. This resolves a build conflict in OSX
    between boost rng and nvcc compilation of cuda code.
    
    Refer to #165 for a full discussion.
    
    Thanks to @satol for suggesting a random number generation facade rather
    than a total split of cpp and cu code, which is far more involved.
    shelhamer committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    19bcf2b View commit details
    Browse the repository at this point in the history
  3. Set copyright to BVLC and contributors.

    The exact details of the contributions are recorded by versioning.
    shelhamer committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    bece205 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2014

  1. Merge pull request #165 from BVLC/boost-eigen

    MKL/non-MKL Reconciliation
    
    Caffe no longer requires MKL. By default it builds without it, relying on atlas and cblas instead. Set the `USE_MKL` var in your Makefile.config accordingly.
    shelhamer committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    699b557 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e2685eb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e2beba9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dd9e05b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2b28b20 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    910f312 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    348a338 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f634899 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ccae3fa View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    b458b41 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    b1f6eb0 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    dc552e0 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    a288d95 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    4d53804 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2014

  1. Configuration menu
    Copy the full SHA
    ebf90c3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #252 from kloudkl/hdf5_output_layer

    Hdf5 output layer
    sergeyk committed Mar 24, 2014
    Configuration menu
    Copy the full SHA
    d3e4c21 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #201 from kloudkl/more_math_functions

    Add more convenience math functions and all tests pass
    shelhamer committed Mar 24, 2014
    Configuration menu
    Copy the full SHA
    91483ae View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2014

  1. Configuration menu
    Copy the full SHA
    474899e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8c6ee8c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    493cbc1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6b6c60f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    877f8f6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a9f355f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bd071dd View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7e5b516 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e165972 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    610ac2b View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    1a69f4b View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    ae9699b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    57441fd View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    454fc0e View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    ac68ed4 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    3140448 View commit details
    Browse the repository at this point in the history