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

Cherry pick some commits for v0.14 #44

Merged
merged 7 commits into from
Oct 22, 2015
Merged

Cherry pick some commits for v0.14 #44

merged 7 commits into from
Oct 22, 2015

Commits on Oct 21, 2015

  1. Remove the 4D constraint of blobproto IO in python

    @sh1r0 @lukeyeager
    sh1r0 authored and lukeyeager committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    c3cb945 View commit details
    Browse the repository at this point in the history

  2. Allow old-style shape in blobproto_to_array 

    Fixes BVLC#3199
Bug introduced in BVLC#3170
    @lukeyeager
    lukeyeager committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    a0ac905 View commit details
    Browse the repository at this point in the history

  3. Fixed drawing problems with repeated convolution

    @DrSleep @lukeyeager
    DrSleep authored and lukeyeager committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    d2c063c View commit details
    Browse the repository at this point in the history

  4. clean up logging for Net init 

    - condense conditions by `LOG_IF`
- only log memory use once after all tops
    @shelhamer @lukeyeager
    shelhamer authored and lukeyeager committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    61379dc View commit details
    Browse the repository at this point in the history

  5. Qualify messages issued by CMake when CUDA is unavailable

    @eelstork @lukeyeager
    eelstork authored and lukeyeager committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    b1e2caf View commit details
    Browse the repository at this point in the history

  6. Re-ordering some lines in build files 

    Enforcing a consistent ordering - OpenCV, LevelDB, LMDB

This will allow me to add the ALLOW_LMDB_NOLOCK option just after the
USE_LMDB option, while keeping the IO dependency options together.
    @lukeyeager
    lukeyeager committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    6f57970 View commit details
    Browse the repository at this point in the history

  7. Add ALLOW_LMDB_NOLOCK build option 

    This option lets you open LMDB files with the MDB_NOLOCK flag. You
should not set this flag if you will be reading LMDBs with any
possibility of simultaneous read and write.
    @lukeyeager
    lukeyeager committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    749a636 View commit details
    Browse the repository at this point in the history