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

434 Коммитов

Автор SHA1 Сообщение Дата
Ivan Rodriguez 41fb7ade94 Fix for linux build 2016-08-17 08:12:03 +02:00
Jasha Droppo 80d077054d Merge branch 'master' into jdroppo/cudnn-rnn-lstm 2016-08-15 16:11:16 -07:00
Qiwei Ye 5b86ad3709 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp 2016-08-08 15:43:27 +08:00
Qiwei Ye eff143e5ba Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/CNTK/prebuild.bat
	configure
2016-08-08 15:40:37 +08:00
Amit Agarwal ca2f33f6e5 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library 2016-08-07 16:33:51 -07:00
Zhou Wang b6cfca3bd2 fix missing path for nvidia-ml in brainscripttests 2016-08-05 15:58:10 +01:00
Ivan Rodriguez 63a5580d8b Update linux build 2016-08-03 12:56:19 +02:00
Zhou Wang 01915bcfb1 Link libcntkmath to libeval
Use GDK_NVML_LIB_PATH
Simplify Boost libraries
Use ORIGINDIR in rpath of libeval

remove GDK_NVML_LIB_PATH from cppevalclient and Add -lcntkmath to libeval.so

Use GDK_NVML_LIB_PATH to avoid using system-wide one, Simplify

use  in libeval.so
2016-08-03 08:43:47 +02:00
Amit Agarwal 0854708400 CNTK v2 library: a) Convolution b) Mean variance normalization c) Added Cifar resnet test 2016-07-30 16:16:41 -07:00
Mark Hillebrand 018877f8ed Linux: Makefile/configure: split GDK_PATH setting into two, include and NVML path 2016-07-29 12:09:27 +01:00
Zhou Wang 182b0377db Use ORIGINLIBDIR instead of LIBDIR in rpath
Add $LIBPATH to unit test eval
2016-07-29 11:13:10 +02:00
Zhou Wang 3c3862a20a Install Boost at /usr/local/boost-x.y.z on Docker
Build unit tests only when Boost is available
Configure Boost path in configure
Address CR comments
fix #678

This is a combination of 10 commits.
Adapt makefile to work with Docker container on Linux

This is a combination of 7 commits.
enable unit tests build

remove -liomp5 from math unit test

enable openmp

add -ldl

fix space error

add -dl for reader test

change order of -l

remove gdk installation

use /usr/local/lib as boost library path

Adapt path in unit tests on Linux
adapt path for Linux

adapt path on other test projects for Linux

remove extra blank line

add BOOST_PATH,and build unit tests based on BOOST_PATH

configure boost path

install Boost 1.60.0; use version variable instead of hardcoding.

add comments for different paths on Linux than on Windows.

restore installation of gdk, because the removal of gdk needs more changes and will be done in a separate check-in

use ifdef, fix typos
2016-07-29 11:13:10 +02:00
Zhou Wang 180f593af6 Add Boost to Dockerfiles 2016-07-29 11:13:10 +02:00
U-FAREAST\fseide 6a6ebc48ab Merge branch 'master' of https://github.com/Microsoft/CNTK into fseide/clonebs 2016-07-27 10:36:18 -07:00
Mark Hillebrand 24cb169a9a Makefile: cppevalclient: link to stub libnvidia-ml.so (if real one not present)
Fixes build of Tools/docker/Dockerfile-GPU (with regular docker).
2016-07-27 13:05:02 +01:00
Qiwei Ye 4bc342edcf adding dl for link 2016-07-27 15:23:18 +08:00
Frank Seide 9dbf806c39 merged from master 2016-07-26 16:51:19 -07:00
Qiwei Ye 5a33a35eac Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/1BitSGD
	Source/SGDLib/SGD.cpp
2016-07-25 20:13:27 +08:00
Amit Agarwal 4164856b1f CNTK v2 library: Use dynamic loading of CompositeDataReader instead of a static dependency 2016-07-24 18:50:10 -07:00
Amit Agarwal 4828b57ddb Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library 2016-07-21 10:04:57 -07:00
Frank Seide 39a9175097 merged from master 2016-07-19 16:40:51 -07:00
Jasha Droppo a4e42744c2 Merge branch 'master' into jdroppo/cudnn-rnn-lstm
Conflicts:
	Makefile
	Source/CNTK/BrainScript/CNTKCoreLib/CNTK.core.bs
	Source/Math/CuDnnBatchNormalization.cu
	Source/Math/CuDnnConvolutionEngine.cu
	Source/Math/Math.vcxproj
	Source/SGDLib/SGD.cpp
2016-07-18 11:11:58 -07:00
Amit Agarwal 9ba93ab84e CNTK v2 library: Added support for loading legacy v1 format models and saving models in v1 format 2016-07-17 16:44:44 -07:00
Zhou Wang c747b28437 temporarily not build unit tests as docker image does not include boost. 2016-07-16 17:55:38 +01:00
Project Philly 4d14065627 Integrate zhouwang/unittests-linux into master 2016-07-14 10:17:30 -07:00
Zhou Wang 94a39eb6bb fix NVMLLIBPATH 2016-07-13 16:03:06 +02:00
Zhou Wang e3927bb717 Add math unit tests and adapt them for Linux
This is a combination of 7 commits.
minor format changes

adapt makefile and math tests

enable sse4.1 support

adapt to linux

fix shadow param, and adjust order of functions

netowrk tests need .cu

move constant definition into a .cpp file, instead of .h
2016-07-13 16:03:06 +02:00
Zhou Wang 8147ed8169 Add unit tests on Linux, adapt tests to work on Linux.
This is a combination of 25 commits.

Add unit tests

make them work on Linux

add to build eval unit tests.

adapt for Linux

fix incompatablity issues on linux

using runtime_error() instead of exception to make linux happy

add library and path

change order of included files

use dynmaic library on linux

link with boost dynamic libraries

minor changes

use BOOSTLIBS to specify all required boost libraries

Add reader unit tests

add .phony unittests to only build unit tests. (will be removed later)

fix errors

add ifdef for platform specifc stuff

fix for linux

adapt makefile for unit tests

adapt reader test to work on Linux

add missing files for the networks unit test

adapt the networks unit test

add the math unit tests

fix errors

minor changes

remove unexpected tab
2016-07-13 16:03:06 +02:00
Alexey Reznichenko 1b0548fdde Add v2 Learners (standalone) 2016-07-13 11:10:02 +02:00
Qiwei Ye 67998341be Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/1BitSGD
	Source/SGDLib/SGDLib.vcxproj
2016-07-07 15:59:07 +08:00
Project Philly dd1410e957 Integrate zhouwang/nvmlpath-makefile into master 2016-07-05 09:48:52 -07:00
Zhou Wang 999df5d70d use NVMLLIBPATH instead of NVMLPATH 2016-06-30 12:14:34 +01:00
Zhou Wang 7537b49054 Added NVMLPATH when building eval 2016-06-28 13:13:59 +02:00
Zhou Wang a5a5139f9e define RPATH only once, as it is not changed. 2016-06-28 10:58:21 +02:00
Zhou Wang 4ed2cb211a Remove pre-complier headers, simlify namings in Makefile
remvoed pre-compiler headers and addressed CR comments

simplify naming comments from CR

delete unused files, minor changes

Changes in comments and Todo
2016-06-27 17:44:21 +02:00
Zhou Wang c367e6cc4f Add building libeval.so and cppevalclient on Linux;
Adapt cppevalcient to build both on Windwos and Linux

Add comment for using "this->" explicitly

Add to build LibEval.so in Makefile

minor changes

EvalSample on Linux

Add EvalSampleClient to Makefile

fix errors in Makefile

fix compilation error on Linux

fix more errors

add main function for Linux

Fix captial case for Eval.h on Linux

build cppevalclient

Add dependency processing for .cu

replace \ with / in the file path on Linux

Adapt path on Linux

fix path on Linux

Use main() on Windows, remvoe unused files and path in Makefile
remove unused files

Use main() on Windows, and remove the wrapper for Linux

further remvoe unused files

fine tuning on lib and path

minor changes
2016-06-27 12:43:21 +02:00
Project Philly d39410d2fc Integrate anthaue/addblockmultiplier into master 2016-06-24 16:50:41 -07:00
anthonyaue 8ea48ecb22 Add -mssse3 flag (-msse3 and -mssse3 both need to be specified apparently 2016-06-21 15:55:21 -07:00
anthonyaue 6a07bcfe5e Add -msse3 flag to CUFLAGS 2016-06-21 15:41:27 -07:00
anthonyaue f6bd20fd76 Play with spacing to help make find endif 2016-06-21 15:02:36 -07:00
anthonyaue 523731635f Remove line-continuation backslash in makefile 2016-06-21 13:59:26 -07:00
anthonyaue 7527dd0154 Make AVX2 flag conditional on SUPPORT_AVX2 macro in linux build file 2016-06-21 13:02:39 -07:00
anthonyaue 1043f45466 Specify AVX instead of AVX2. TODO: Figure out story for conditional
compilation
2016-06-21 12:22:46 -07:00
anthonyaue 1e6fb55338 Add Stdafx.h headers to fix release win build breaks; add -mavx2 flag to
fix linux build break
2016-06-21 10:43:29 -07:00
Anthony Aue 12140c993b Makefile and *.vcxproj changes 2016-06-17 08:57:55 -07:00
Marko Radmilac 8835d4f61b Remove SM20 support 2016-06-15 13:16:29 -07:00
Amit Agarwal a9f769884a Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library 2016-06-15 11:11:37 -07:00
Mark Hillebrand 0cd50e0edf Fix build with active codepage 936 (non-ASCII characters in files without BOM)
This closes #487, closes #47.
2016-06-15 14:24:17 +02:00
Qiwei Ye d17ff5d9eb Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/CNTK/CNTK.cpp
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
2016-06-15 20:22:12 +08:00
Amit Agarwal 0ec5b27404 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
Conflicts:
	CNTK.sln
2016-06-14 11:36:37 -07:00
Mark Hillebrand 52ae07279d CNTK custom MKL support 2016-06-14 17:39:24 +02:00
Amit Agarwal a47c3d877f Temporarily add the CNTK v2 library tests as an end-to-end test. This will be switched to the BOOST unit test framework later when the framework is setup for linux too. 2016-06-13 09:45:51 -07:00
Mark Hillebrand cc296fc0dc Makefile: rename MAKEFILES -> BUILD_CONFIGURATION
MAKEFILES is special and automatically inherited in sub makes.
2016-06-13 16:08:40 +02:00
Amit Agarwal e875771784 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
Conflicts:
	CNTK.sln
2016-06-12 09:14:03 -07:00
Amit 26c2006541 CNTKv2Library: Linux port 2016-06-11 16:50:26 -07:00
Eldar Akchurin 5d474c4d57 Renaming to HTKDeserializers 2016-06-06 15:23:39 +02:00
Eldar Akchurin 5d5d29ac6c Fixing file type 2016-06-06 14:02:25 +02:00
Eldar Akchurin 3d5bfcab27 Fixing forgoten rename 2016-06-06 14:02:25 +02:00
Eldar Akchurin 290139c4d7 Renaming ExperimentalHTKMLFReader into HTKMLFDeserializer 2016-06-06 14:02:25 +02:00
Jasha Droppo 5558144363 Merge remote-tracking branch 'origin/master' into jdroppo/cudnn-rnn-lstm
Conflicts:
	Source/Math/Math.vcxproj
	Source/Math/Math.vcxproj.filters
	Source/Math/MathCUDA.vcxproj.filters
2016-05-20 11:20:07 -07:00
Alexey Reznichenko d3130e721a Add a few improvements to CNTKTextFormatReader.
* Move caching into a stand-alone ChunkCache class.
    Add a config flag 'keepDataInMemory' to cache the whole dataset.
    * Allow both tabs and spaces as separators.
    * Couple loading/indexing retries with file re-opening (if there was a
    file error and the file handle is stale).
    * Break 'randomize' config parameter into boolean 'randomize' and
    integer 'randomizationWindow'.
    * Add 'frameMode' config flag.
    * Add an extra check and verify that the expected sequence length
    (calculated during indexing) matches the actual length (maximum
    number of samples in an input).
2016-05-18 15:50:04 +02:00
Qiwei Ye 6b47558bfa Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
2016-05-09 12:15:34 +08:00
Amit Agarwal f4204ce1cd Change in dropout randomization implementation to ensure reproducability across checkpoints 2016-05-05 12:17:10 -07:00
Qiwei Ye 16e890ea75 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
	configure
2016-05-03 10:58:07 +08:00
Yongqiang Wang 29e464a96e Merge branch 'master' of https://github.com/Microsoft/CNTK into erw/bm_rc 2016-05-02 11:57:31 -07:00
Yongqiang Wang d87b1d4f3d (Address CR feedback) 2016-05-02 11:51:25 -07:00
Yongqiang Wang aadeb32304 Changes to enable Block Momentum release
(Adding an initial test case for Block Momentum)
2016-05-02 11:51:13 -07:00
Marko Radmilac 63c7fad4c8 Add support for gcov code coverage builds 2016-05-02 09:48:46 -07:00
Eldar Akchurin 4cca2126a1 Fixing wrong reference file 2016-05-02 09:55:11 +02:00
Eldar Akchurin 61f2cc120a Adapting the makefile 2016-05-02 09:55:11 +02:00
Marko Radmilac 0b35c4646c Add support for new CU 2016-04-28 12:06:34 -07:00
Qiwei Ye 679b55df50 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/ActionsLib/ActionsLib.vcxproj
	Source/Readers/HTKMLFReader/utterancesourcemulti.h
	Source/SGDLib/SGDLib.vcxproj
2016-04-28 13:56:19 +08:00
Alexey Reznichenko 0651892cc7 Do not create a new packer for each epoch 2016-04-22 11:33:31 +02:00
Qiwei Ye 9760990506 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/ActionsLib/ActionsLib.vcxproj
	Source/CNTK/CNTK.cpp
	Source/CNTK/CNTK.vcxproj
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
	Source/SGDLib/SGDLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj.filters
	Tools/generate_build_info
	configure
2016-04-16 10:41:47 +08:00
Clemens Marschner ca4afe5c67 Address review comments 2016-04-13 14:30:06 +02:00
Mark Hillebrand d184028dbd Address CR comment 2016-04-11 20:24:24 +01:00
Mark Hillebrand 2138dfc2f7 Makefile: Add Config.make to object dependencies 2016-04-11 09:19:45 +01:00
Alexey Reznichenko 14de27d114 Enable sequences for sparse input.
Extend sequence and frame packers to support sparse input.
    	Create a tightly filled layout and base packing off of it.
    	Add a number of unit test for sequence packing (both sparse and
    	dense, no randomization, using CNTK text format for input).
2016-04-07 14:34:42 +02:00
Frank Seide e080d2c561 moved LearnableParameterNode implementation to a CPP file 2016-04-03 17:03:35 -07:00
Frank Seide 7784350f29 merged with master 2016-04-03 00:59:10 -07:00
Frank Seide 531f5538b6 updated seq-2-seq decoder to match updated training;
new operation Trace() (TraceNode) as a debugging aid;
WriteMinibatchWithFormatting() can now log by FrameRange;
WriteFormattingOptions now in ComputationNode.h
2016-04-02 23:29:40 -07:00
Eldar Akchurin 694a259991 Refactoring of bptt packer 2016-04-01 09:43:24 +02:00
Alexey Kamenev 0d23b5308d Fixed merge issue in Makefile. 2016-03-30 10:00:49 -07:00
Alexey Kamenev da0ef59e56 Updated Makefile and samples. 2016-03-30 10:00:36 -07:00
Alexey Kamenev 4faeca8c6f Fixed gcc build issues. 2016-03-30 09:58:04 -07:00
Mark Hillebrand 4f38bb48eb Linux: buildinfo.h-related fixes
Only update buildinfo.h if changed. Fix parameter passing in
Tools/generate_build_info.
2016-03-29 21:04:11 +02:00
Eldar Akchurin c22f6cc950 Initial implementation for full utterance packer 2016-03-29 13:51:20 +02:00
Mark Hillebrand f4432575ae Makefile: fix dependency for buildinfo.h
* Use .d files for CNTK binary
* Pre-declare dependency for CNTK.o on buildinfo.h
2016-03-29 08:19:00 +01:00
Amit e65ec4a1f5 Fixed LUSequenceReader build on linux: Added missing LUSequenceWriter.cpp file to the list of sources for the reader 2016-03-24 11:33:14 -07:00
U-FAREAST\fseide f188493589 Merge branch 'master' of https://github.com/Microsoft/CNTK into fseide/pack 2016-03-22 09:00:59 -07:00
Frank Seide 76543e8708 bug fix: InferMBLayoutFromInputsForStandardCase() must test isFinalValidationPass 2016-03-21 21:34:41 -07:00
Eldar Akchurin 0cdc149a2c Updating makefile 2016-03-21 09:51:03 +01:00
Eldar Akchurin 40ea419e49 Refactoring of the randomizer into sequence and chunk ones 2016-03-21 09:51:03 +01:00
Mark Hillebrand 18fad62e74 Fix Linux 2016-03-21 09:51:03 +01:00
Frank Seide 34531d8920 merged from master 2016-03-17 13:06:32 -07:00
Alexey Reznichenko 23839659b8 Fix makefile (re-add lost changes) 2016-03-17 15:11:44 +01:00
Frank Seide 527c61ba95 merged from master 2016-03-15 18:48:29 -07:00
Gaizka Navarro f8be2e4eec Renames SynchronouseExecutionEngine to NDLBuilderImpl
Renames SynchronousNodeEvaluator to NDLNodeEvaluatorImpl
Merges SynchronousExecutionEngine.h into NDLNetworkBuilder.h
Renames SynchronousExecutionEngine.cpp into NDLNetworkBuilder.cpp
2016-03-14 09:55:05 +01:00
Gaizka Navarro 576eeb5f87 Moves SynchronouseExecutionEngine to ActionsLib 2016-03-14 09:55:00 +01:00
Gaizka Navarro 75364c8936 Relocates Network building files from ComputationNetworkLib to ActionsLib. 2016-03-14 09:54:58 +01:00
Gaizka Navarro e2f31ff658 Addresses CR : Rename NetworkCreator to NetworkFactory 2016-03-14 09:54:57 +01:00
Gaizka Navarro 27667a13d2 Make gcc happy 2016-03-14 09:54:33 +01:00
Frank Seide 63c50f6364 added new node Where (only BS) 2016-03-11 16:57:14 -08:00
Frank Seide 8a517d0c6d added an experimental seq-2-seq auto-encoder 2016-03-06 17:40:58 -08:00
Frank Seide 2ae9eea1a7 added first batch of BS standard operations 2016-03-06 00:25:39 -08:00
Frank Seide ecc8deb5b5 implemented include-path traversal for BrainScript and turned CNTK standard BS into an include file CNTK.core.bs;
bug fix for Issue #210: PreComputeNodeBase must infer layout from input after loading;
ImageReader post-build events now consistently use xcopy
2016-03-05 21:27:04 -08:00
U-FAREAST\fseide f7865837e3 Merge branch 'master' of https://github.com/Microsoft/CNTK into fseide/s2s 2016-03-01 13:32:44 -08:00
Yongqiang Wang 7ce997c726 Per Amit's suggestion, add NO_SYNC to debug build as well. Now it is consistent
with Windows build.
2016-03-01 11:29:10 -08:00
Yongqiang Wang 8bb5aa89e2 Turn NO_SYNC on in the release build. 2016-03-01 11:29:09 -08:00
Frank Seide 5304784b6c fixed NoGPU build re do_sync;
updated ExperimentalHTKMLFReader w.r.t. file naming
2016-02-29 21:27:49 -08:00
Frank Seide 7d3e84e773 merged from master 2016-02-29 19:17:35 -08:00
Frank Seide 67f12739bc Fixed Issue #176: random number used for random_shuffle() had an int overflow on gcc, which caused uncaught out-of-bounds accesses. 2016-02-29 11:58:13 -08:00
Mark Hillebrand 4d5566d5ac Experimental HTKMLF Reader (currently only supports frame mode) 2016-02-29 15:54:39 +01:00
Frank Seide e54b352822 removed template parameter ElemType from (I)DataReader and (I)DataWriter 2016-02-28 19:01:07 -08:00
Alexey Kamenev 246907dbb6 Addressed code review comments. 2016-02-25 10:56:42 -08:00
Alexey Kamenev 5d6a468278 Fixed ImageReader Linux build. 2016-02-25 09:47:15 -08:00
Alexey Kamenev bbf67cf03b Added libzip support on Linux. 2016-02-25 09:47:14 -08:00
Gaizka Navarro 09dea188f5 Adds ExceptionWithCallStack class to wrap native exceptions (runtime_error, logic_error, invalid_arguent), so that the call stack can be provided to the managed layer.
Moves DebugUtil functions (PrintCallStack, GetCallStack) to ExceptionWithCallStack
Refactors the PrintCallStack and GetCallStack functions in ExceptionWithCallBack to re-use the common functionality.
Make gcc happy
2016-02-23 09:11:12 +01:00
Qiwei Ye 1b9a83617f Merge branch 'master' into qiwye/asgd-dev 2016-02-17 13:37:16 +08:00
Alexey Kamenev c0a20b379d Added SM3.0 to Linux Debug build. Added serialization of new fields to BN node. 2016-02-16 12:31:28 -08:00
Qiwei Ye b14d6576a2 make gcc happy for the multiverso lib 2016-02-15 21:01:04 +09:00
Qiwei Ye 492e2735de Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/ActionsLib/ActionsLib.vcxproj
	Source/CNTK/CNTK.cpp
	Source/CNTK/CNTK.vcxproj
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGDLib.vcxproj
2016-02-14 11:56:26 +08:00
Project Philly e1093b9537 Integrate f0d8a23b26 into master 2016-02-13 07:28:20 -08:00
Alexey Kamenev e8ab337235 Refactored Makefile to include defines both to NVCC and g++. 2016-02-12 09:33:47 -08:00
Ross Wightman f0d8a23b26 Add experimental support for OpenBLAS library
* Add 'openblas' as mathlib option in configure. Not added to auto-search so
must be specified using --with-openblas

* configure script searches empty tail so that libraries located at default_path_list
roots (ie /usr/local/ + include/openblas_config.h) are found

* Treat ACML as the odd library out in ifdefs since it doesn't conform to typical
BLAS standard. Other libraries like ATLAS should be able to share
OpenBLAS/MKL variants. Add default USE_ACML define in VS projects to match

* Fix 'max' macro define colliding with C++ std::max once openblas headers are included

Usage Notes:

* For best performance, build OpenBLAS with USE_OPENMP=1. When running CNTK, set
OPENBLAS_NUM_THREADS environment var or set numCPUThreads CNTK config variable to the
physical core count or performance will suffer

* OpenBLAS 2.16 (git HEAD) tested in Linux with GCC 4.8.4 and in Windows with
OpenBLAS 2.15 (pre-built binary release + MingGW 64-bit support dlls)

* For Windows, in Math.vcxproj, replace libacml_mp_dll.lib with libopenblas.dll.a and change
USE_ACML define to USE_OPENBLAS. Change ACML_PATH environment variable to your OpenBLAS path.
Modify openblas_config.h as per https://github.com/xianyi/OpenBLAS/issues/708

* On current generation Intel processors, OpenBLAS measures a little faster than
AMD ACML and slower than Intel MKL on MNIST and other examples
2016-02-11 13:40:18 -08:00
Qiwei Ye 6fe2f8e464 Merge branch 'master' into qiwye/multiverso 2016-02-03 19:31:38 +08:00
Clemens Marschner 0e5ad89a15 Reapply fix in Makefile for SparsePCReader
Reapply name changes in Makefile that had been resolved but
got lost during excessive rebasing.
2016-02-03 01:15:34 -08:00
Mark Hillebrand 2251188bef Fix ReaderLib.lib (and references) 2016-02-02 13:31:59 +01:00
Mark Hillebrand 93fb8d8283 Rename Source/Readers/{{New -> }ImageReader,Reader{ -> Lib}} 2016-02-02 13:24:37 +01:00
Qiwei Ye 397614801c Adding macros for the multiverso submodule 2016-02-02 19:11:02 +08:00
Mark Hillebrand 52d6444920 Add new image reader under new reader architecture 2016-02-02 11:30:15 +01:00
Qiwei Ye c69c2d50f2 Merge branch 'master' into qiwye/multiverso 2016-02-02 12:04:35 +08:00
Chris Basoglu 69112d13c8 Simplified clean 2016-02-01 12:56:54 -08:00
Chris Basoglu 31a212579e Fix progress when epochsize is 0 and fix the git hash built into the exe 2016-02-01 12:56:47 -08:00
Clemens Marschner a8e807658f Fix Merge Problem 2016-02-01 17:42:44 +01:00
Clemens Marschner 3b3d8998a5 Fix reader on Linux 2016-02-01 17:42:43 +01:00
Clemens Marschner 734baf94c7 Fix #define
Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Fix reader on Linux

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows

Activate LibSparsePCReader on Linux build

Make file name consistent with Windows
2016-02-01 17:42:42 +01:00
Clemens Marschner 0bbf3c4901 Fix reader on Linux 2016-02-01 17:42:38 +01:00
Clemens Marschner 46ce1e55d3 Make file name consistent with Windows 2016-02-01 17:42:35 +01:00
Clemens Marschner bd0b68d11b Activate LibSparsePCReader on Linux build 2016-02-01 17:42:34 +01:00
Eldar Akchurin e514d1fb0c Fixing linking against open cv 3.0 2016-02-01 13:47:59 +01:00
Qiwei Ye 99cf8cbbbb Merge branch 'master' into qiwye/multiverso
Conflicts:
	Source/SGDLib/SGD.cpp
2016-02-01 11:14:55 +08:00
Mark Hillebrand 263a3176a0 Makefile: exit early if 1Bit-SGD headers not found in 1Bit-SGD build 2016-01-29 12:07:22 +00:00
Qiwei Ye c7bfebe740 Merge branch 'master' into qiwye/multiverso 2016-01-29 14:23:04 +08:00
Qiwei Ye 7b495bdf9c change makefile for Linux work with multiverso 2016-01-29 14:20:21 +08:00
Alexey Orlov cd1bb59125 Fixed wrong ld OpenCV path in Linux Makefile 2016-01-28 16:32:23 +01:00
Qiwei ye f8d0d4b182 Merge branch 'master' into qiwye/multiverso
Conflicts:
	Source/ActionsLib/ActionsLib.vcxproj
	Source/CNTK/CNTK.vcxproj
	Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
	Source/EvalDll/EvalDll.vcxproj
	Source/SGDLib/SGDLib.vcxproj
2016-01-28 22:41:07 +08:00
Amit 621637e5b3 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/releaseModeCallStacks 2016-01-25 22:07:12 -08:00
Amit aace504d8c Added -g and -rdynamic compiler/linker options for release mode builds on linux to enable call stack generation in release builds 2016-01-25 21:55:48 -08:00
Qiwei ye 6446a2fa79 Merge branch 'master' into qiwye/multiverso
Conflicts:
	.gitignore
	CNTK.sln
	Source/CNTK/CNTK.cpp
	Source/CNTK/CNTK.vcxproj
	Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
	Source/EvalDll/EvalDll.vcxproj
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
	Source/SGDLib/SGDLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj.filters
2016-01-25 16:56:12 +08:00
Frank Seide 6d31cda88a removed two more Multinetworks configs from SimpleNetworkBuilder 2016-01-22 09:42:57 -08:00
Alexey Orlov 89a2b0dac0 Fixed Linux Makefile error message 2016-01-22 16:27:50 +01:00
Amit Agarwal e32329a85c Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/separate1bitDataParallelSGD 2016-01-15 00:08:17 -08:00
Philipp Kranen 135b992df9 fixed Linux Makefile wrt deleted files 2016-01-14 09:06:40 +01:00
Amit Agarwal 18528f15b4 Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/separate1bitDataParallelSGD 2016-01-13 22:43:27 -08:00
Amit 9cf113de6f Made 1bit support an optionally configurable build option for CNTK which is off by default 2016-01-13 14:29:19 -08:00
Marko Radmilac ba61abd79e Disable popups on Windows 2016-01-13 10:11:28 -08:00
Qiwei Ye 6c2ee1aa51 Merge branch 'master' into qiwye/multiverso
Conflicts:
	Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj.filters
2016-01-07 16:57:09 +08:00
Amit 21fceca779 Fixed linux build 2016-01-06 19:00:13 -08:00
Amit 96e03050a6 Fixed linux build error 2016-01-05 10:42:38 -08:00
Frank Seide da8f560043 made gcc happy 2015-12-28 20:03:50 -08:00
Qiwei Ye 9664daccb0 Merge branch 'master' into qiwye/multiverso 2015-12-19 12:43:46 +08:00
Mark Hillebrand 679c3c5298 Source/Readers/LMSequenceReader/: also build SequenceWriter on Linux 2015-12-18 11:59:40 +00:00
Qiwei Ye 254b45e680 Merge branch 'master' into qiwye/multiverso
Conflicts:
	Source/CNTK/CNTK.vcxproj
	Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
	Source/EvalDll/EvalDll.vcxproj
	Source/SGDLib/SGDLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj.filters
2015-12-17 10:35:08 +08:00
thhoens 3ab0ddace2 Fix for LibSVMBinaryReader to add prefetching, microbatches, and Linux support. 2015-12-16 12:13:38 -08:00
Mark Hillebrand a9c4922a5e Makefile: adapt to new location of generate_build_infop script 2015-12-16 14:24:49 +00:00
Mark Hillebrand caf67c74fc Adapt Linux build 2015-12-16 08:05:32 +00:00
Frank Seide aec884a4d3 started the TensorView class by adding header and CPP to math lib 2015-12-15 15:02:43 -08:00
Qiwei Ye 1d12689b58 Merge branch 'qiwye/dev' into qiwye/multiverso 2015-12-15 14:31:49 +08:00
yzhang87 b8eb51d4a3 Fix kaldi Reader. 1) Using the new MBLayout interface. 2) Modify the configParameter to configRecordType to consistent with HTKMLFReader. 3) Clean the warning message. Next: refactor to make it consistent with HTKMLFReader. 2015-12-14 11:00:20 -05:00
Alexey Kamenev 254b04c9b5 cudnn: added OpenCV libs to Linux build. 2015-12-12 10:00:01 -08:00
Alexey Kamenev 3023f11e6e cudnn: enabled build on Linux with cuDNN. 2015-12-12 09:59:09 -08:00
Qiwei Ye 07e48cd667 adding runtime libraries 2015-12-12 18:27:55 +09:00
Frank Seide 896b0476a0 renamed commandArgUtil.h to Config.h and ConfigFile.cpp to Config.cpp;
bug fix in previous refactoring of sub-minibatching
2015-12-04 22:31:47 -08:00
Frank Seide 0eb77f8e2f Step 2 of moving LSTMNode to EsotericNodes.h: deleted it from RecurrentNodes.h;
made gcc happy
2015-12-04 20:56:33 -08:00
Alexey Kamenev 93a0872069 Added NDEBUG to Linux Release build. 2015-12-03 11:20:50 -08:00
Qiwei Ye e3a8caca88 add NVMLPATH to the linking target cntk for the libnvidia-ml.so 2015-11-26 07:34:37 -05:00
Amit 77da34e8d5 Added call stack printing functionality for Linux 2015-11-25 17:20:56 -08:00
Yongqiang Wang 377c8223d4 Fix a bug in Scripts/genrate_build_info 2015-11-24 21:34:30 -08:00
Yongqiang Wang 33cf6a013f Enable PrintBuildInfo for both Windows and Linux 2015-11-24 16:38:37 -08:00
Frank Seide ab0dcf3434 simplified DeviceFromConfig() by removing PTasks-specific configuration options. Also added an overload for BrainScript;
added a dummy DataReader constructor from BrainScript (currently not implemented);
had to disable DelayLoadNofify() as that suddenly caused link errors (seems because DeviceFromConfig() is now called from a different place?);
further unified DoTrain() w.r.t. old CNTK config and BrainScript. Added a new BrainScriptBuilder (but the builders will go away next and get replaced by a lambda). DoTrain now accessible from BS (but not functional yet, too many pieces missing);
all builders now can be constructed from both old ConfigParameters and BrainScript IConfigRecord;
suddenly gcc got very picky, had to fix several places
2015-11-21 00:16:36 -08:00
Frank Seide ae778f6be4 added more scaffolding (empty CPP files) for moving actions to CNTKActionsLib. Updated Linux Makefile 2015-11-17 23:22:33 -08:00
Frank Seide 1a754b968c Eliminated NetworkBuilderFromConfig.cpp. Instead, the few surviving lines--the lines registering ComputationNode as a scriptable object--are now in ComputationNode.cpp;
fixed Linux Makefile after change of GPUMatrixCUDAKernels.cu to GPUMatrixCUDAKernels.cuh. It used to explicitly compile this in the GCC build, although it was included
2015-11-17 22:37:43 -08:00
Frank Seide 4036a52f63 BrainScript: ComputationNetwork can now construct itself from BS (the special MakeRuntimeObject() function is gone);
new source file ComputationNetworkScripting.cpp;
changed ComputationNetwork::SetDeviceId(). Now just takes the input and sets that as the device. Before it did somethinf funky with m_deviceId, which looks like a bug;
in LSTM test config, removed remnants of old NDL, now completely based on BS
2015-11-16 09:57:01 -08:00
Frank Seide 3b2068ead6 added CNTKActionsLib to Linux include path;
moved DisableLegacyTruncationSettings() away from being the very first piece of code in CNTK.cpp, hiding it close to where it is used. Also fixed its spelling and made it 'static'
2015-11-12 13:23:54 -08:00
Mark Hillebrand 88026d547c Fix two perf problems
1. On Linux, use ACML MP as default ACML library.
2. For the parallel end-to-end tests, limit concurrency based on
   available hardware threads.
2015-11-05 22:15:51 +01:00
Vladimir Ivanov f2db77795e Applying workaround for race condition in OpenMPI on non-0 exit code from CNTK 2015-10-30 16:16:09 -07:00
Frank Seide 525f9be994 moved memshare functions from header to ComputationNetworkEvaluation.cpp;
created new ComputationNetworkEditing.cpp
2015-10-30 10:35:12 -07:00
Frank Seide c3328c00fa moved sets of functions from ComputationNetwork.cpp to ComputationNetworkEvaluation.cpp and ComputationNetworkAnalysis.cpp 2015-10-30 10:05:12 -07:00
Yu 9d26bfdcd9 Fix build for NoGPU. 2015-10-28 20:59:52 -04:00
Amit 69ccd3f64c Remove debug info generation option for CUDA compilation in debug flavor builds and also enable fast-math optimizations . These changes have been done to eliminate differences in GPU results for the E2E tests between debug and release flavors. Setting environment variable CNTK_CUDA_DEVICE_DEBUGINFO=1 will enable debug info generation. The baselines for all E2E tests have also been updated in accordance with this change 2015-10-24 14:34:01 -07:00
Amit Agarwal 4777f5f7d3 Rename SequenceTraining project to CNTKSequenceTrainingLib to be consistent with other libs 2015-10-18 12:40:43 -07:00
Alexey Kamenev bb62af7d13 ImageReader fixes for Linux build. 2015-10-14 12:30:11 -07:00
Alexey 78d2e0ba68 Add CUB path. 2015-10-14 12:29:51 -07:00
Amit 9a4c84beb4 Fixed Linux build 2015-10-09 23:54:37 -07:00
Guoguo Chen d6ae0b0adc Merge remote-tracking branch 'remotes/origin/master' into guoguo/linuxBuildFix 2015-10-07 18:19:11 -04:00
Alexey Kamenev b7d9ab9737 Refactor SequenceTraining to support CPUONLY. 2015-10-07 10:35:31 -07:00
Frank Seide 1b01fd6965 more cleanup on when Resize() ops are done;
renamed SimpleEvaluator::PreCompute() to EvaluateBatchModeNodes() because the original name was misleading;
Linux Makefile now defines _DEBUG in debug builds
2015-10-06 14:02:45 -07:00
Guoguo Chen ac70bfe47c fixing linux build for master branch; removed duplicated files in KaldiReader and Kaldi2Reader 2015-09-30 18:02:05 -04:00
Amit e736be8b6e Port the Sequence trainign code to Linux 2015-09-25 17:22:58 -07:00
Amit Agarwal 3212a55b35 Merge branch 'master' of https://git01.codeplex.com/forks/srehpycs/mitsls into srehpycs/mitsls 2015-09-24 10:50:00 -07:00
Alexey Kamenev f6acb1033e Add env vars to control CUDA codegen. 2015-09-17 16:57:26 -07:00
Alexey Kamenev c5c1537bd4 Change CUDA settings for Debug builds. 2015-09-17 16:37:00 -07:00
Scott Cyphers a654b6e3d5 Eradicate all possible warnings from g++
Replace hash_map with unordered_map
Fix size_t formatting (%zd)
Add some missing sprintf_s args
Some methods defined in base class need the base mentioned in templates
Don't use classname::methodname in class definitions
2015-09-17 16:00:48 -04:00
Scott Cyphers 9878959e3d Merge remote-tracking branch 'cntk/master' into merge 2015-09-17 09:32:17 -04:00
Amit Agarwal 1a9908bc8e Moved the parallel trainign guard when writing model/checkpoint files to the actual save functions instead of guarding at the call sites 2015-09-15 21:04:09 -07:00
Frank Seide 54a6b1d2ec made gcc happy again (mostly missing headers or wrong declaration orders);
Makefile adapted to new paths, but not yet building Network and SGD as separate libs
2015-09-06 09:20:28 -07:00
Frank Seide a4c32ac19f CNTKEval now builds (missed the new .cpp files) 2015-09-03 19:15:00 -07:00
Frank Seide 3066a16fe9 moved most <ElemType>-dependent functions out of ComputationNetwork into a ComputationNetworkBuilder class (added two files);
fixed the slew of dependencies, mostly SimpleNetworkBuilder.cpp;
ComputationNetwork no longer has to include all headers for all vairants of ComputationNodes;
a few ComputationNode derivates missed #includes
2015-09-03 18:41:59 -07:00
U-FAREAST\fseide 1219c24f60 Merge branch 'master' into fseide/bs 2015-09-03 15:05:46 -07:00
Frank Seide a4c480fd92 Merge branch 'master' into fseide/bs
Conflicts:
	Math/Math/NoGPU.cpp
2015-09-03 13:50:03 -07:00
Marko Radmilac 4bbcca453e NVCC warnings as errors 2015-09-03 13:30:30 -07:00
Marko Radmilac fe3346b0bf Cleanup warnings in Linux 2015-09-03 09:24:03 -07:00
Frank Seide 8705dd0f02 Merge remote-tracking branch 'origin' into fseide/bs
Conflicts:
	DataReader/HTKMLFReader/ssematrix.h
	Math/Math/CUDAPageLockedMemAllocator.cpp
	Math/Math/Matrix.cpp
	Math/Math/NoGPU.cpp
	Math/Math/ValueQuantizer.h
2015-09-02 10:12:15 -07:00
Frank Seide 67464d22e0 some fixes to make gcc happy (one still missing);
somehow git lost 'Makefile'--readding, hoping it won't confuse the merge process
2015-09-02 08:43:31 -07:00
Frank Seide d4c3e4afb0 added BS to Linux Makefile--with lots of fallout that needs to be fixed 2015-09-01 13:44:20 -07:00
Amit Agarwal 8e85f07de3 Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/mergeHTKMLFReaders 2015-09-01 13:27:19 -07:00
Amit Agarwal 1df4e8e5e1 Merge the linux and windows forks of the HTKMLFReader fork into one. 2015-09-01 13:09:57 -07:00
Scott Cyphers 19506bc123 Merge remote-tracking branch 'cntk/master' 2015-09-01 13:57:24 -04:00
Amit Agarwal 7915fef15d Fixed CPUONLY build 2015-09-01 00:06:38 -07:00
Frank Seide 025e1323cd added BrainScript to Linux Makefile INCLUDEPATH 2015-08-31 21:06:28 -07:00
Scott Cyphers 7697c39294 Merge remote-tracking branch 'cntk/master' 2015-08-28 13:36:11 -04:00
Amit Agarwal acd24c738e Addressed code review feedback 2015-08-17 14:48:06 -07:00
Scott Cyphers ec14fd97b8 Cleanups, README improvements, missing Makefile dependency
Remove the no longer needed kaldi Makefiles.

Fix some pre-configure references in the README that were missed, add
a missing step to the build instructions, remove some obsolete
information, be more specific about the acml library that works, and
reword a few sentences.

Add math library dependencies to the kaldi plugins so that make -j
doesn't try to build them before the math library is finished.
2015-08-11 16:58:18 -04:00
Amit Agarwal 1b025bc529 Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/parallelTraining
Conflicts:
	MachineLearning/CNTK/SGD.h
	Makefile
2015-08-11 10:36:15 -07:00
Scott Cyphers 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
Scott Cyphers 404f167938 Use original build targets when PREFIX is not supplied. 2015-08-06 15:28:56 -04:00
Scott Cyphers c54a045de2 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 25f8594d6e 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
Amit Agarwal 64fae7a0bc Implementation of data-parallel SGD with 1bit quantization of gradients for reduced communication costs 2015-08-05 09:23:33 -07:00
Scott Cyphers f5634aff70 Add the appropriate math -rpath to shared libraries link. 2015-07-30 13:35:50 -04:00
Marko Radmilac 1fb5918b13 Implement minibatch prefetching
This change implements a read-ahead (prefetch) of one minibatch on a separate thread to ensure that main thread always has enough work. This is done through coarse-level parallelism, where GetMinibatch is called from a separate thread and result is cached for main thread to consume. The synchronization is a simple producer/consumer model with a single mutex and a conditional variable.

This change also modifies how we measure time it takes to read and compute a minibatch worth of data.
2015-07-15 11:57:06 -07:00
Alexey Kamenev db64969c51 Add lib path for NVML, remove redundant lib references 2015-07-02 10:53:26 -07:00
Marko Radmilac c20ee5b882 Create common makefile, and remove cpu and gpu specific makefiles. Also do some cleanup. 2015-06-24 13:59:05 -07:00