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

1191 Коммитов

Автор 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 30edcc0dac Use original build targets when PREFIX is not supplied. 2015-08-06 15:28:56 -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 8bd3eece79 Merge remote-tracking branch 'origin/linux-gcc' into sls
Prepare for merge back to linux-gcc
2015-08-06 09:26:33 -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
Scott Cyphers 48ecaf6c34 Fix some format strings. 2015-08-05 18:36:26 -04:00
Dong Yu 69c780d18f Merge branch 'linux-gcc' of https://git01.codeplex.com/cntk into linux-gcc 2015-08-05 15:35:26 -07:00
Dong Yu 9b484dbdee Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc
Conflicts:
	MachineLearning/CNTK/NetworkDescriptionLanguage.cpp
2015-08-05 15:35:06 -07:00
Dong Yu d9cfb6b90b Merge branch 'master' of https://git01.codeplex.com/cntk 2015-08-05 15:29:19 -07:00
Dong Yu 16a542663e added RowElementTimes and ColumnElementTimes nodes.
Revoke back ElementTimes node to do element-wise multiplication since the implementation there for column element-wise multiplication is incorrect.
2015-08-05 15:13:11 -07:00
Vladimir Ivanov ae5152989f Preventing creation of corrupted checkpoint and model files if CNTK terminates during write 2015-08-05 12:24:21 -07:00
Vladimir Ivanov 3e07f58875 Added end-to-end test for CNTK speech workloads using AN4 dataset 2015-08-05 12:17:09 -07:00
chenguoguo 501ee3bc8e Small fix to sequence training 2015-08-04 19:45:16 -04:00
Dong Yu 8d844eae24 Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-08-04 13:36:45 -07:00
Dong Yu d30e674958 Merge branch 'linux-gcc' of https://git01.codeplex.com/cntk into linux-gcc 2015-08-04 13:36:32 -07:00
Dong Yu e76df5ec2e move GetNumSamplesWithLabel from node to network. 2015-08-04 13:36:14 -07:00
Jasha Droppo edaa92eb73 Fix Windows bug where global mutex not properly released. 2015-08-04 10:55:07 -07:00
Frank Seide b6e5ce010e Merge branch 'master' of https://git.codeplex.com/cntk 2015-08-04 12:29:23 +08:00
Frank Seide 2b51121e3d merged the two versions (Win32, Linux) of CrossProcessMutex back into a single header file that contains both versions;
removed nvml.lib from the Windows linker command line (it is already listed inside the source code, but there it is conditional on CPUONLY mode);
added a missing #include to Profiler.cpp to make it compile in CPUONLY mode;
fixed the post-build action to copy nvml.dll to not fail if no NVSMI is installed (assuming CPUONLY mode)
2015-08-04 12:29:14 +08:00
chenguoguo e8c0a2320c Merge remote-tracking branch 'origin/master' into linux-gcc 2015-08-03 21:50:29 -04:00
erw ee9817ee1f Move m_BoundaryInfo in PastValudeNode and FutureValueNode to CPUDEVICE
Before this commit, m_BoundaryInfo is constructed on default device, usually
0. This may result in a single processor creating contexts on multiple GPU
devices.
2015-08-03 15:48:41 -07:00
chenguoguo d2fdf84b55 Bug fix: fixing dimensionality mismatch after using MEL for sequence training model 2015-08-03 18:30:51 -04:00
Scott Cyphers e3e62ff893 Fix multiple-free problem.
Use of static constructors in headers cause the constructors/destructors to be
run in each compilation unit that includes the headers.  The multiple
constructors runs are leaks, the multiple destructor runs are multiple-frees
at program exit time.  These string constructors can instead use const char*
with little impact on the methods that reference them.
2015-08-03 14:41:18 -04:00
Scott Cyphers 984f5b82f7 Fix memory leak.
Remove a small leak to redice noise in leak checkers.
2015-08-03 14:39:21 -04:00
Scott Cyphers 45566e273d Fix g++ compilation warnings
sprintf_s is snprintf, not sprintf
Need to use more symbols from SGD
Add externs for missing file name generators that seem to be not reachable
   and not defined.
2015-08-03 14:36:33 -04:00
Dong Yu 786b0952db Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-08-03 10:53:53 -07:00
Scott Cyphers f80ac6a2e3 Clean up warnings from G++
Use %zd for printing size_t
    %ls for wide strings
Use SGDBase as name for base class instead of redefining templated base
2015-08-03 11:05:33 -04:00
Frank Seide f6e0fc3201 Merge branch 'master' of https://git.codeplex.com/cntk 2015-08-03 09:20:39 +08:00
chenguoguo 145e7c43ec Fixing mixing LSTM state when buffering minibatches 2015-08-01 01:11:53 +00:00
Scott Cyphers 18ec6538c1 Merge branch 'linux-gcc' into sls 2015-07-30 14:51:56 -04:00
chenguoguo 27e32a8ee9 Some cosmetic change in Kaldi2Reader 2015-07-30 18:00:05 +00:00
Scott Cyphers e8de73a144 Add the appropriate math -rpath to shared libraries link. 2015-07-30 13:35:50 -04:00
chenguoguo de33865a3a Limit number of overflow warnings in Kaldi2Reader; Add configuration for setting overflow value 2015-07-30 17:16:32 +00:00
Chris Basoglu 4c24c7655e Fix printouts when doing Adaptive Minibatch sizing 2015-07-30 08:39:47 -07:00
Hakan Erdogan 7898ab61f1 comment out unnecessary output check and print in Kaldi2Reader that causes problems with non-probability outputs 2015-07-30 04:31:33 -04:00
Dong Yu c301487d97 add support to count NoLabel samples in the simpleEvaluator. Does not change complicated evaluator in SimpleEvaluator.h though. 2015-07-29 17:58:11 -07:00
Marko Radmilac 502fcde685 Fix build script permissions 2015-07-29 10:48:53 -07:00
Dong Yu a996f300c8 Merge branch 'linux-gcc' of https://git01.codeplex.com/cntk into linux-gcc 2015-07-29 10:40:57 -07:00
Dong Yu 35589fe0ad refine PastValueNode and FutureValueNode. Fixed a bug in FutureValueNode When it's not inside a loop. 2015-07-29 10:40:45 -07:00
chenguoguo 1c5c7532f7 Bug fixing regarding m_uttDerivBuffer is NULL 2015-07-29 16:04:21 +00:00
Dong Yu 02b2f705a5 change the pastValueNode and FutureValueNode to support NO_FEATURE and NO_LABEL cases better. 2015-07-28 23:55:21 -07:00
Dong Yu 6dad2edebf Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-07-28 22:26:13 -07:00
chenguoguo 85f5777a52 Adding interface for utterance derivative computation in the Kaldi2Reader 2015-07-29 03:30:56 +00:00
kaisheny 791d384c04 update global.config for LSTM LM 2015-07-28 16:00:50 -07:00
kaisheny 9d226d1672 Merge branch 'master' of https://git01.codeplex.com/cntk 2015-07-28 15:10:22 -07:00
kaisheny da299c2701 Scripts/build-and-test 2015-07-28 15:10:13 -07:00
Amit Agarwal c6a6da5296 Fixed a build break on Windows 2015-07-27 16:53:40 -07:00
Chris Basoglu e4ef6681af Fix bugs in adaptive minibatch size 2015-07-27 16:25:51 -07:00
Dong Yu 17eae08d98 Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc
Conflicts:
	MachineLearning/CNTK/SGD.h
2015-07-27 15:41:18 -07:00
Dong Yu d306bbea17 Merge branch 'master' of https://git01.codeplex.com/cntk 2015-07-27 14:51:54 -07:00