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.

Sign up for GitHub

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

Jump to bottom

MKL/non-MKL Reconciliation #165

Merged
merged 24 commits into from
Mar 23, 2014
Merged

MKL/non-MKL Reconciliation #165

merged 24 commits into from
Mar 23, 2014

Commits on Mar 21, 2014

  1. 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 @shelhamer
    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

  2. Fixed uniform distribution upper bound to be inclusive

    @kloudkl @shelhamer
    kloudkl authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    04ca88a View commit details
    Browse the repository at this point in the history

  3. Fixed FlattenLayer Backward_cpu/gpu have no return value

    @kloudkl @shelhamer
    kloudkl authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    d666bdc View commit details
    Browse the repository at this point in the history

  4. Fix test stochastic pooling stepsize/threshold to be same as max pooling

    @kloudkl @shelhamer
    kloudkl authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    38457e1 View commit details
    Browse the repository at this point in the history

  5. 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 @shelhamer
    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

  6. relax precision of MultinomialLogisticLossLayer test

    @shelhamer
    shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    d37a995 View commit details
    Browse the repository at this point in the history

  7. nextafter templates off one type

    @shelhamer
    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

  8. mean_bound and sample_mean need referencing with this

    @shelhamer
    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

  9. make uniform distribution usage compatible with boost 1.46

    @jeffdonahue @shelhamer
    jeffdonahue authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    93c9f15 View commit details
    Browse the repository at this point in the history

  10. 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 @shelhamer
    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

  11. change all Rng's to use variate_generator for consistency

    @jeffdonahue @shelhamer
    jeffdonahue authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    b3e4ac5 View commit details
    Browse the repository at this point in the history

  12. add bernoulli rng test to demonstrate bug (generates all 0s unless p == 

    1)
    @jeffdonahue @shelhamer
    jeffdonahue authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    6cbf9f1 View commit details
    Browse the repository at this point in the history

  13. fix bernoulli generator bug

    @jeffdonahue @shelhamer
    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

  14. Replace atlas with multithreaded OpenBLAS to speed-up on multi-core CPU 

    issue: #79
    @kloudkl @shelhamer
    kloudkl authored and shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    1cf822e View commit details
    Browse the repository at this point in the history

  15. major refactoring allow coexistence of MKL and non-MKL cases

    @shelhamer
    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

  16. rewrite MKL flag note, polish makefile 

    add MKL dirs conditioned on USE_MKL
include libraries before making LD_FLAGS
    @shelhamer
    shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    c028d09 View commit details
    Browse the repository at this point in the history

  17. make MKL switch surprise-proof

    @shelhamer
    shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    f6cbe2c View commit details
    Browse the repository at this point in the history

  18. comment out stray mkl includes

    @shelhamer
    shelhamer committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    ff27988 View commit details
    Browse the repository at this point in the history

  19. Fixed order of cblas and atlas linker flags 

    They were the wrong way round, causing linking to fail in some cases
    @jamt9000 @shelhamer
    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

  20. 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 @shelhamer
    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

  21. 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
    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
    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
    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
    shelhamer committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    bece205 View commit details
    Browse the repository at this point in the history