BVLC master + CUB Memory Manager + cuDNN v4 and v5 support

CPU mode fixed
BVLC · Mar 30, 2016 · d41bfbe · d41bfbe
1 parent be163be
commit d41bfbe
Show file tree

Hide file tree

Showing 127 changed files with 41,179 additions and 319 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,9 @@ env:
     - WITH_CUDA=true WITH_CMAKE=true WITH_IO=true
     - WITH_CUDA=false WITH_CMAKE=false WITH_IO=false
     - WITH_CUDA=false WITH_CMAKE=true WITH_IO=false PYTHON_VERSION=3
+#  Currently there is no way to install cudnn via apt-get. Uncomment when it's available.
+#    - WITH_CUDA=true WITH_CMAKE=false WITH_IO=true WITH_CUDNN=true
+#    - WITH_CUDA=true WITH_CMAKE=true WITH_IO=true WITH_CUDNN=true
 
 language: cpp
 

diff --git a/3rdparty/cub/cub/agent/agent_histogram.cuh b/3rdparty/cub/cub/agent/agent_histogram.cuh
diff --git a/3rdparty/cub/cub/agent/agent_radix_sort_downsweep.cuh b/3rdparty/cub/cub/agent/agent_radix_sort_downsweep.cuh