35b0e71b5a
Merge branch 'master' of https://git01.codeplex.com/cntk into yu/memshare
...
Conflicts:
MachineLearning/CNTKComputationNetworkLib/CompositeComputationNodes.h
MachineLearning/CNTKComputationNetworkLib/ComputationNode.h
MachineLearning/CNTKComputationNetworkLib/EvaluationCriterionNodes.h
MachineLearning/CNTKComputationNetworkLib/LinearAlgebraNodes.h
Tests/Speech/LSTM/cntk.config
configure
2015-10-15 21:08:10 -07:00
a0e60f641b
Correct handling of OpenCV path.
2015-10-14 12:30:21 -07:00
bb62af7d13
ImageReader fixes for Linux build.
2015-10-14 12:30:11 -07:00
085c29ff13
Add CUB to Linux build.
2015-10-14 12:30:01 -07:00
04af449678
Disentangle cuda libraries from where they aren't needed
...
Allow nvidia gdk to be installed in /usr/local/gdk
2015-09-29 17:56:31 -04:00
cb6b0f5e5d
Removed CUDA 7.1 from list of CUDA versions to use in configure
2015-08-24 11:04:45 -04:00
6c4291e1ab
Fixed CUDA option parsing in cntk/configure
2015-08-24 10:39:15 -04:00
0ebdaedb35
Add a configure script for setting build parameters
...
Add a configure script for initializing build parameters, either
for in or out of source builds. The script generates a Config.make
in the build directory, and, for out of source builds, a trampoline
Makefile.
Make the build-and-test script to do an out of source build.
Add Config.make to .gitignore, as well as emacs temporary file patterns.
2015-08-07 13:03:27 -04:00
Amit Agarwal
Alexey Kamenev
Scott Cyphers
David Harwath
David Harwath