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

24 Коммитов

Автор 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
Scott Cyphers b6109fe5d3 Simplified unified CPU/GPU/Kaldi Makefile
Modularize build specifications for each target, where each target
adds what it needs to paths.

Add rpath to cntkmath and plugins so they do not need LD_LIBRARY_PATH.

Remove object files from cntk that were already in cntkmath.

Organize build targets into UNIX-like bin and lib directories under a
configuration-specific directory.  Have .gitignore ignore these
directories.

Make it easy to keep sources in alphabetic order for easier comparison
with the Windows project definition.
2015-08-05 18:46:31 -04:00
Dong Yu 9f49788e65 Merge branch 'master' of https://git01.codeplex.com/cntk into dongyu/dev
Conflicts:
	.gitignore
	Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Adv_Chapter.lyx
	Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Programmer_Chapter.lyx
2015-06-19 13:30:22 -07:00
Dong Yu 8954c5eb58 in the mnistCheckIn.config change
labelMappingFile=$ConfigFolder$\mnistlabels.txt

to

labelMappingFile=$DataFolder$\mnistlabels.txt

so that consistent label file is always used.
----------------------
Changes in the CNTK book:

Add RowStack node to NDL section, and MultSeq related NDL, MEL, and programming changes to appropriate sections.
2015-06-19 13:23:50 -07:00
kaisheny fb282a297e Merge with new changes including RowStackNode 2015-06-16 16:01:19 -07:00
Marko Radmilac 95a3049829 Make default output directory under cntk for simplicity, and address code review feedback 2015-06-10 17:45:42 -07:00
kaisheny 973d96f683 Merge from master branch 2015-05-20 17:11:52 -07:00
erw 9af7e92d63 The commits 32391e1..2a7ab60 should not be pushed to public (since it enables MKL and MPI) revert them in this commit.
Reverted commit:

8404e9c8de        "Enable MKL"
64a37301f9        "Enable MPI_SUPPORT"
61c6d59e04        "add a unit test for CNTKEval"
2015-05-19 14:08:16 -07:00
erw 77d2a23843 Revise .gitignore so the buildinfo.h and buildinfo.h$$ can be ignored after project dir move 2015-05-19 13:55:45 -07:00
erw d02c80dbb4 add a unit test for CNTKEval
This unit test is used privately by erw.

Conflicts:
	CNTKSolution/EvalUnitTest/CNTKEValTest.cpp
	CNTKSolution/EvalUnitTest/EvalUnitTest.vcxproj
	CNTKSolution/EvalUnitTest/EvalUnitTest.vcxproj.filters
2015-05-19 12:31:46 -07:00
kaisheny e6e051f098 Merge with master branch 2015-04-22 23:20:34 -07:00
erw 6ee60aae57 Fix .gitignore issue. Previous version is a unfinished merged version. 2015-04-08 17:50:16 -07:00
Yu db9b222b4e Merge remote-tracking branch 'origin/master' into linux-gcc
Conflicts:
	.gitignore
	Common/TimerUtility.cpp
	DataReader/SequenceReader/SequenceParser.h
	DataReader/SequenceReader/SequenceReader.cpp
	MachineLearning/cn/SGD.h
	MachineLearning/cn/cn.cpp
	Math/Math/CPUSparseMatrix.cpp
	Math/Math/GPUMatrix.cu
	Math/Math/GPUSparseMatrix.cu
	Math/Math/GPUSparseMatrix.h
2015-02-08 00:31:32 -05:00
Mike Seltzer 2b4e746d32 Merge branch 'master' of https://git01.codeplex.com/cntk
Conflicts:
	DataReader/HTKMLFReader/HTKMLFReader.cpp
	DataReader/HTKMLFReader/HTKMLFReader.h
2015-02-06 16:14:47 -08:00
Yu 22e7ceb660 Merge remote-tracking branch 'origin/master' into linux-gcc 2015-02-06 14:45:31 -05:00
erw 3d733df978 Add a function such that cn.exe will print build signature (build path, builder, build time, build branch) on start-up.
(useful when there are a lot of versions)

It assumed environment "%USERNAME% is set and "hostname" is in path, which
should be true on most machines.

If users have not put "git" in their PATH, branch and commit SHA1 will not be
shown.
2015-02-01 23:57:55 -08:00
ascii991218 0c64fc8249 Merge branch 'master' of https://git.codeplex.com/cntk
Conflicts:
	.gitignore
	Common/Include/fileutil.h
2015-01-17 21:40:37 +08:00
ascii991218 5c368087db A large modification, allowing compilation of CNTK under linux g++
1. Add Common/Include/Platform.h for substitution of windows API and types
2. Fixed compile errors under g++, warning is not handled.
3. Compiles Readers into shared library, added code in *Reader/Export.cpp for dynamic linking and loading
4. Fixed msra::strfun::_strprintf to make it work under linux g++
5. Added makefiles for building (cpu and gpu)
2015-01-17 21:03:40 +08:00
Dong Yu 975e57906c Changes in the CNTK book:
1. corrected the parameter list for the Delay command in NDL.
2. added the options for the rmprop gradient update type.
3. added the ConvertDBN command.
2015-01-04 23:54:16 -08:00
Frank Seide 1ddfb28089 added .dep to .gitignore 2014-11-01 00:21:06 -07:00
Dong Yu 6cdc74628e fixed a bug in GPUMatrix::RowElementMultiplyWith and RowElementDivideBy. Changed ComputationNetwork.h to support loading nodes with number of children larger than 3. 2014-10-15 19:00:55 -07:00
Mike Seltzer 7786626956 added *.bak to gitignore 2014-10-01 13:29:44 -07:00
Dong Yu 466fd7643d add .gitignore file 2014-09-04 11:58:04 -07:00