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

198 Коммитов

Автор SHA1 Сообщение Дата
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
Frank Seide 9dbf806c39 merged from master 2016-07-26 16:51:19 -07: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
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
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
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
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
Amit Agarwal f4204ce1cd Change in dropout randomization implementation to ensure reproducability across checkpoints 2016-05-05 12:17:10 -07: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