Граф коммитов

15 Коммитов

Автор SHA1 Сообщение Дата
Scott Cyphers f43874cd84 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
Scott Cyphers 0950188608 Remove site-specific paths from Makefile.
Change configuration to build to a specific PREFIX directory, where
a Config.make is located that contains build and site-specific information.
This also makes it easy to check just how an earlier build was configured.

Update the instructions in README.
2015-08-06 12:41:57 -04:00
chenguoguo d1df75ff36 Fixing feature and labels names in Kaldi2Reader; also adding some explanation in README of how to compile CNTK with Kaldi 2015-07-08 01:56:50 +00:00
Hakan Erdogan 738a553e2c removing my name from README for now. 2015-07-06 17:16:23 -07:00
Dong Yu 9bb13ad109 Merge branch 'master' of https://git01.codeplex.com/cntk into dongyu/dev
Conflicts:
	CNTK.sln
	MachineLearning/CNTK/CNTK.vcxproj
	MachineLearning/CNTK/CompositeComputationNodes.h
	MachineLearning/CNTK/ComputationNetwork.h
	MachineLearning/CNTK/SGD.h
	Makefile.gpu
2015-06-25 17:49:24 -07:00
Marko Radmilac 43e903515c Create common makefile, and remove cpu and gpu specific makefiles. Also do some cleanup. 2015-06-24 13:59:05 -07:00
kaisheny 973d96f683 Merge from master branch 2015-05-20 17:11:52 -07:00
amitaga 0460e9c8cb Merge branch 'master' of https://git.codeplex.com/cntk into linux-gcc
Conflicts:
	Common/Include/minibatchsourcehelpers.h
	DataReader/DSSMReader/DSSMReader.cpp
	DataReader/HTKMLFReader/HTKMLFReader.cpp
	DataReader/LMSequenceReader/SequenceReader.cpp
	DataReader/LMSequenceReader/minibatchsourcehelpers.h
	DataReader/LUSequenceReader/LUSequenceReader.cpp
	DataReader/LUSequenceReader/minibatchsourcehelpers.h
	DataReader/LibSVMBinaryReader/LibSVMBinaryReader.cpp
	DataReader/UCIFastReader/UCIFastReader.cpp
	MachineLearning/CNTK/ComputationNetwork.h
	MachineLearning/CNTK/SGD.h
	MachineLearning/CNTK/SimpleNetworkBuilder.h
	MachineLearning/CNTK/SynchronousExecutionEngine.h
	MachineLearning/cn/PTaskGraphBuilder.cpp
	Makefile.cpu
	Makefile.gpu
	Math/Math/NoGPU.cpp
2015-05-19 16:04:47 -07:00
Frank Seide 1247b704c7 various cleanups:
renamed cn.exe to CNTK.exe on Windows and "cntk" (no more .exe!) on Linux;
renamed 'cn' folder to 'CNTK';
moved CNTK.sln out from CNTKSolution folder, which now no longer needs to exist;
removed Win32 build target from Visual Studio Solution and all Projects;
added are documentation and Linux makefiles to the Visual Studio Solution for easy access;
removed unused PTasks files
2015-05-18 18:51:20 -07:00
kaisheny cdc087bf3f updated README 2015-05-06 16:43:28 -07:00
Yu 83619c69b4 Update the README file 2015-04-15 21:24:08 -04:00
Yu 3b2b698bcf README: add Kaldi reader section 2015-04-05 16:14:59 -04:00
Amit Agarwal f1a1a1a383 1) Added the missing CNTKMath project dependency to project LMSequenceReader to enforce correct ordering of the build. 2) A bunch of changesto fix the Windows build. 3) Changed Linux makefiles to use CUDA 7.0 2015-03-27 10:36:32 -07:00
Hakan Erdogan 5c6dddd81d Modified readme for ACML. 2015-01-24 13:39:40 -05:00
wengong_jin 2ecf63b683 Added README. 2015-01-20 14:41:29 +08:00