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

CUDNN v4 upgrade. Optionally, CNMEM used for GPU pool allocation. #42

Merged
merged 65 commits into from
Oct 21, 2015
Merged

CUDNN v4 upgrade. Optionally, CNMEM used for GPU pool allocation. #42

merged 65 commits into from
Oct 21, 2015

Commits on Sep 25, 2015

  1. Add argmax_param axis

    @timmeinhardt
    timmeinhardt committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    6c02c8b View commit details
    Browse the repository at this point in the history

  2. Implement ArgMaxLayer forward_cpu and reshape for axis param

    @timmeinhardt
    timmeinhardt committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    c77d5e5 View commit details
    Browse the repository at this point in the history

  3. Update ArgMaxLayer documentation for axis param

    @timmeinhardt
    timmeinhardt committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    9b2d267 View commit details
    Browse the repository at this point in the history

  4. Generalise ArgMaxLayerTest bottom blob shape

    @timmeinhardt
    timmeinhardt committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    a2a5e22 View commit details
    Browse the repository at this point in the history

  5. Implement ArgMaxLayerTest for axis param

    @timmeinhardt
    timmeinhardt committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    def3d3c View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2015

  1. test

    @drnikolaev
    drnikolaev committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    9b903b5 View commit details
    Browse the repository at this point in the history

  2. Initial cuDNN v3 support

    @slayton58 @drnikolaev
    slayton58 authored and drnikolaev committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    c8073dc View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2015

  1. cuDNN v4 compatibility fix

    @drnikolaev
    drnikolaev committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    c089a2e View commit details
    Browse the repository at this point in the history

  2. Merge pull request BVLC#3069 from timmeinhardt/argmax 

    Add argmax_param "axis" to maximise output along the specified axis
    @shelhamer
    shelhamer committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    01e15d0 View commit details
    Browse the repository at this point in the history

  3. Add CNMeM support 

    488f126

Conflicts:
	Makefile
	Makefile.config.example
	src/caffe/layers/cudnn_conv_layer.cpp
	src/caffe/layers/cudnn_conv_layer.cu
	src/caffe/layers/cudnn_lcn_layer.cpp
	src/caffe/layers/cudnn_lcn_layer.cu
    @NV-slayton @drnikolaev
    NV-slayton authored and drnikolaev committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    441bddc View commit details
    Browse the repository at this point in the history

  4. Cmake support for CNMeM 

    438add5

Conflicts:
	CMakeLists.txt
	cmake/Templates/CaffeConfig.cmake.in
    @slayton58 @drnikolaev
    slayton58 authored and drnikolaev committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    fd0d640 View commit details
    Browse the repository at this point in the history

  5. Move to centralized cuDNN handle 

    38d6baf

Conflicts:
	src/caffe/layers/cudnn_conv_layer.cpp
	src/caffe/layers/cudnn_conv_layer.cu
    @slayton58 @drnikolaev
    slayton58 authored and drnikolaev committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    6aaf7b1 View commit details
    Browse the repository at this point in the history

  6. Turn off cuDNN in TravisCI script

    @lukeyeager @drnikolaev
    lukeyeager authored and drnikolaev committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    4a57fff View commit details
    Browse the repository at this point in the history

  7. Fix potential CNMEM_NOT_INITIALIZED errors 

    dummy alloc / free in MemoryHandlerActivator to ensure that
the memory pool has been set up before any potential operations
    @slayton58 @drnikolaev
    slayton58 authored and drnikolaev committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    62582cb View commit details
    Browse the repository at this point in the history

  8. add badge for travis build and license

    @kashefy
    kashefy committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    98cc023 View commit details
    Browse the repository at this point in the history

  9. Merge pull request BVLC#3133 from kashefy/badge 

    add badge for travis build and license
    @shelhamer
    shelhamer committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    6eae122 View commit details
    Browse the repository at this point in the history

  10. unused variables warning

    @drnikolaev
    drnikolaev committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    f0d6549 View commit details
    Browse the repository at this point in the history

  11. Fix invalid argument error in tests

    @NV-slayton @drnikolaev
    NV-slayton authored and drnikolaev committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    848bfda View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2015

  1. Add a caffe.io.write_mean function to the MATLAB interface 

    Useful for exporting models from MATLAB (e.g. MatConvNet) to Caffe
    zoharby authored and zoharby committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    552a84a View commit details
    Browse the repository at this point in the history

  2. Merge pull request BVLC#3058 from zoharby/master 

    Add a caffe.io.write_mean function to the MATLAB interface
    @ronghanghu
    ronghanghu committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    92dc4e6 View commit details
    Browse the repository at this point in the history

  3. SilenceLayer Backward bugfix (fixes BVLC#3151)

    @jeffdonahue
    jeffdonahue committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    64f948a View commit details
    Browse the repository at this point in the history

  4. Merge pull request BVLC#3152 from jeffdonahue/silence-backward-fix 

    SilenceLayer Backward bugfix (fixes BVLC#3151)
    @jeffdonahue
    jeffdonahue committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    8ef3d63 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2015

  1. fixes BVLC#3163

    @eerwitt
    eerwitt committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    e061546 View commit details
    Browse the repository at this point in the history

  2. Merge pull request BVLC#3164 from eerwitt/layer-documentation-sample-… 

    …fixes

Documentation References ImageNet Sample Location
    @ronghanghu
    ronghanghu committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    04c7c36 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2015

  1. CUDNN config improved

    @borisfom
    borisfom committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    02630e0 View commit details
    Browse the repository at this point in the history

  2. Initial cuDNN v3 support

    @slayton58
    slayton58 committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    ffee008 View commit details
    Browse the repository at this point in the history

  3. Fixing memory handler

    @borisfom
    borisfom committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    17b90a2 View commit details
    Browse the repository at this point in the history

  4. Fixing memory handler

    @borisfom
    borisfom committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    ee9ab75 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2015

  1. CNMEM fix

    @borisfom
    borisfom committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    dfd65ed View commit details
    Browse the repository at this point in the history

  2. Renamed handler class

    @borisfom
    borisfom committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    cda2e18 View commit details
    Browse the repository at this point in the history

  3. Reverted rename for now

    @borisfom
    borisfom committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    36eaec8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from borisfom/caffe-0.14-cnmem 

    Caffe 0.14 cnmem
    @borisfom
    borisfom committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    636998d View commit details
    Browse the repository at this point in the history

  5. restored missed functions

    @borisfom
    borisfom committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    ab8a646 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from borisfom/caffe-0.14-cnmem 

    restored missed functions
    @borisfom
    borisfom committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    f642fb6 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2015

  1. restored use_pool check

    @borisfom
    borisfom committed Oct 10, 2015
    Configuration menu
    Copy the full SHA
    46cc594 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from borisfom/caffe-0.14-cnmem 

    restored use_pool check
    @borisfom
    borisfom committed Oct 10, 2015
    Configuration menu
    Copy the full SHA
    8740cce View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2015

  1. Merged diffs from NVIDIA/caffe-0.14 and made all tests work.

    @drnikolaev
    drnikolaev committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    d82e665 View commit details
    Browse the repository at this point in the history

  2. perparing for merge

    @borisfom
    borisfom committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    ba10864 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'slayton/cudnnV3' into caffe-0.14

    @slayton58
    slayton58 committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    2b395e9 View commit details
    Browse the repository at this point in the history

  4. Merged Simon's V3 branch and fixed compiler warnings

    @drnikolaev
    drnikolaev committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    3931c20 View commit details
    Browse the repository at this point in the history

  5. 488f126 

    Add CNMeM support

Conflicts:
	Makefile
	Makefile.config.example
	src/caffe/layers/cudnn_conv_layer.cpp
	src/caffe/layers/cudnn_conv_layer.cu
	src/caffe/layers/cudnn_lcn_layer.cpp
	src/caffe/layers/cudnn_lcn_layer.cu
    @NV-slayton @drnikolaev
    NV-slayton authored and drnikolaev committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    908f082 View commit details
    Browse the repository at this point in the history

  6. 438add5 

    Cmake support for CNMeM

Conflicts:
	CMakeLists.txt
	cmake/Templates/CaffeConfig.cmake.in
    @slayton58 @drnikolaev
    slayton58 authored and drnikolaev committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    f1928b9 View commit details
    Browse the repository at this point in the history

  7. 38d6baf 

    Move to centralized cuDNN handle

Conflicts:
	src/caffe/layers/cudnn_conv_layer.cpp
	src/caffe/layers/cudnn_conv_layer.cu
    @slayton58 @drnikolaev
    slayton58 authored and drnikolaev committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    83b4124 View commit details
    Browse the repository at this point in the history

  8. Fix potential CNMEM_NOT_INITIALIZED errors 

    dummy alloc / free in MemoryHandlerActivator to ensure that
the memory pool has been set up before any potential operations
    @slayton58 @drnikolaev
    slayton58 authored and drnikolaev committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    350658d View commit details
    Browse the repository at this point in the history

  9. cnmem merge

    @borisfom
    borisfom committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    5a02f49 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2015

  1. cnmem merge

    @borisfom
    borisfom committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    6ba96ee View commit details
    Browse the repository at this point in the history

  2. Merged CNMEM, tests passed

    @borisfom
    borisfom committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    14eaf93 View commit details
    Browse the repository at this point in the history

  3. CNMEM case checked

    @borisfom
    borisfom committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    0b70f2a View commit details
    Browse the repository at this point in the history

  4. peer/self ordering fix

    @drnikolaev
    drnikolaev committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    9405436 View commit details
    Browse the repository at this point in the history

  5. Polished MemoryHandler

    @borisfom
    borisfom committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    5dcff36 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2015

  1. LINT fixes

    @borisfom
    borisfom committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    d5b7d26 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2015

  1. CPU_ONLY fix

    @borisfom
    borisfom committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    00d6a1b View commit details
    Browse the repository at this point in the history

  2. macro redefinition fix

    @borisfom
    borisfom committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    b2daa56 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2015

  1. Names normalized

    @borisfom
    borisfom committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    906002c View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2015

  1. deleted submodule

    @borisfom
    borisfom committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    d12b5cc View commit details
    Browse the repository at this point in the history

  2. Squashed '.3rdparty/cnmem/' content from commit e817a7a 

    git-subtree-dir: .3rdparty/cnmem
git-subtree-split: e817a7a2889389eaf934fe66a9744878b900acba
    @borisfom
    borisfom committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    6480847 View commit details
    Browse the repository at this point in the history

  3. Merge commit '6480847b61b0f004bfd69616cd82761a64711b61' as '.3rdparty… 

    …/cnmem'
    @borisfom
    borisfom committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    d25e6a5 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2015

  1. CNMEM integration

    @borisfom
    borisfom committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    8a16cbd View commit details
    Browse the repository at this point in the history

  2. Travis build has Cmake 2.8.7

    @borisfom
    borisfom committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    8635051 View commit details
    Browse the repository at this point in the history

  3. Removing Cmake

    @borisfom
    borisfom committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    ce1c463 View commit details
    Browse the repository at this point in the history

  4. CNMEM conditional include fixed

    @borisfom
    borisfom committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    3f462d1 View commit details
    Browse the repository at this point in the history

  5. Rectified cnmem cmake, renamed 3rd party targets

    @borisfom
    borisfom committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    80af4b1 View commit details
    Browse the repository at this point in the history

  6. Fixing CUDNN options

    @borisfom
    borisfom committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    7d5d1cf View commit details
    Browse the repository at this point in the history

  7. Cleanup for PR submission

    @borisfom
    borisfom committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    e191830 View commit details
    Browse the repository at this point in the history

  8. Removed submodules remainders

    @borisfom
    borisfom committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    0792af7 View commit details
    Browse the repository at this point in the history