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

346 Коммитов

Автор SHA1 Сообщение Дата
Mark Hillebrand e792cfa44d Tools/test-samples-json.ps1: added 2017-01-03 14:12:37 +01:00
Mark Hillebrand 1877508d6e Tools/samples.json: initial 2017-01-03 14:12:37 +01:00
Marko Radmilac 08d908133b Add MPI version to CNTK informational message
Fix Windows script
2016-12-30 12:01:07 -08:00
Mark Hillebrand c3f00dde28 Tools/make_binary_drop_windows.ps1: fix syntax 2016-12-22 10:53:08 +01:00
Mark Hillebrand 8f4cad8f40 Enable Python 2.7 2016-12-19 13:49:05 +01:00
Mark Hillebrand 3864db1f99 Scripts/install/linux/install-cntk.sh: add --py-version option
Python 3.4 is still default; use `--py-version 35' to make the
install script install a Python 3.5 based environment.
2016-12-12 11:15:33 +01:00
Mark Hillebrand a013911ee2 Tools/make_binary_drop_linux: fix cudnn copy 2016-12-07 16:36:05 +01:00
Mark Hillebrand c068cac23e Tools/make_binary_drop_linux: update wrt CUDA-8 2016-12-07 15:37:16 +01:00
Mark Hillebrand 28615d15db Tools/docker/CNTK-GPU-*Image: update to CUDA-8 based image.
Note: to run, you may need to update your NVIDIA GPU driver and/or the
nvidia-docker utility.

Also, compile OpenCV with CUDA off, as we currently do not take
advantage of it anyway.
2016-12-07 13:41:32 +01:00
Alexey Orlov c9fb80945f Remove unnnecessary files from Linux Binary Drops 2016-12-03 16:49:17 +01:00
Mark Hillebrand fa96612cb6 Allow to test against multiple Python versions; add support for Py 3.5 on Linux
Contains some changes towards Python 2.7 support as well.
2016-12-02 04:06:30 +01:00
Nikos Karampatziakis ccc9412337 more CR feedback 2016-11-25 11:19:54 -08:00
Nikos Karampatziakis 2ef7108b5a incorporated CR feedback 2016-11-24 13:14:50 -08:00
Nikos Karampatziakis 7d2e72d023 Support for NCCL in Dockerfiles. 2016-11-23 17:05:58 -08:00
Mark Hillebrand a3b46190de Tools/make_binary_drop_linux: fix copy of libcudnn 2016-11-17 15:09:07 +01:00
Mark Hillebrand 9a57aebfca Tools/make_binary_drop_linux: adapt wrt new Linux images 2016-11-16 15:46:45 +01:00
Wolfgang Manousek 9f0d79bdd3 move install files into new install subdirectory beneath the script directory, remove obsolete files, update readme in script directory 2016-11-15 15:59:24 +01:00
Alexey Orlov 9f3a510c26 Add root Tutorials folder to Binary drop. Linux 2016-11-14 16:24:48 +01:00
Alexey Orlov adbe62f157 Add root Tutorials folder to Binary drop. Windows 2016-11-14 16:24:47 +01:00
Philipp Kranen 9231ece8ce Restructuring examples and tutorials 2016-11-14 16:24:45 +01:00
Mark Hillebrand b89762fe96 Tools/docker/CNTK-CPUOnly-Image/: init Multiverso submodule as well 2016-11-14 10:16:02 +00:00
Takuma Yoshida b03cea93c3 Fix missing space and submodule 2016-11-13 15:13:13 +09:00
unknown a62037dbc7 Merge branch 'master' into qiwye/asgd-dev 2016-11-11 11:01:05 +08:00
Nikos Karampatziakis 8f7eb6e37e removed tmp_ld_library_path from dockerfile 2016-11-10 15:58:37 -08:00
Nikos Karampatziakis 452bd0f28a Incorporated most CR feedback 2016-11-09 19:09:18 -08:00
Nikos Karampatziakis c406520b47 incorporated some cr feedback 2016-11-09 13:17:08 -08:00
Nikos Karampatziakis a72e05b0ee Merge branch 'fiskio-master' into fiskio2 2016-11-08 15:30:04 -08:00
Nikos Karampatziakis f3272f9d37 Modified python paths 2016-11-08 14:55:10 -08:00
Nikos Karampatziakis ad753521dc Added readme on Dockerfiles 2016-11-08 14:52:28 -08:00
Nikos Karampatziakis 2d74d6900c Added build-arg to 1bit image 2016-11-08 14:39:17 -08:00
Marco Fiscato 6b22d38ea9 Python build install packages from default file list 2016-11-07 12:12:05 +00:00
Qiwei Ye 551956c310 altering check-git-head for multiverso 2016-11-06 20:47:43 -08:00
Qiwei Ye f1da36427f Merge branch 'master' into qiwye/asgd-dev 2016-11-06 12:49:20 +08:00
Marco Fiscato 81056ac161 Fix LD_LIBRARY_PATH 2016-11-05 21:24:52 +00:00
Marco Fiscato abb5aeed9a fiskio -> Microsoft 2016-11-04 12:09:59 +00:00
Marco Fiscato fb0994a1e1 Added 1bit-SGD docker file 2016-11-04 12:00:08 +00:00
Marco Fiscato 4f81a1ed72 Fix CPU docker file 2016-11-04 12:00:08 +00:00
Marco Fiscato f835b4095b fix for python in docker 2016-11-04 12:00:08 +00:00
Mark Hillebrand 72b28630fd Normalize line endings 2016-10-27 12:46:02 +02:00
Mark Hillebrand 9f8f87c896 Tools/check-git-head.sh: check for illegal characters in file names (on Windows) 2016-10-27 10:05:43 +01:00
Mark Hillebrand 83db0ef022 Tools/check-git-head.sh: add git attributes check 2016-10-27 10:04:41 +01:00
Qiwei Ye 4be2822a65 Merge branch 'master' into qiwye/asgd-dev 2016-10-27 16:31:48 +08:00
Mark Hillebrand 0b31ea51a9 Tools/docker: include Protobuf library.
Closes: #949.
2016-10-27 09:55:34 +02:00
Mark Hillebrand 2bac5028d5 Fix references to renamed CifarDownload.py and mnist_convert.py scripts
Related: #928.
2016-10-27 09:55:34 +02:00
Mark Hillebrand b1197c1e2f Tools/cntk-binary-drop/linux: update text files 2016-10-25 13:07:51 +02:00
Qiwei Ye a1b7a5cec7 code review: removing unnecessary files/tabs 2016-10-25 11:50:58 +08:00
Qiwei Ye 19844ed9dd Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Makefile
	Source/SGDLib/SGDLib.vcxproj.filters
2016-10-25 11:31:42 +08:00
Alexey Orlov 120cf2b1d2 Add Python artefacts to Linux binary drop 2016-10-22 15:04:36 +02:00
Alexey Orlov 1a947079ee Add Python artefacts to Windows binary drop 2016-10-22 14:51:13 +02:00
Zhou Wang 0c1641675a fix error 2016-10-21 21:37:51 +02:00
Zhou Wang fa72ab55c1 add cntklibrary-2.0.lib to drop; disable debug build for CPPEvalV2client project. 2016-10-21 20:09:55 +02:00
Project Philly e4a8cf4163 Integrate alexeyo/Linux-Binary-Drop-Script-Beta-2.0 into master 2016-10-21 08:30:49 -07:00
Alexey Orlov 3385afeb59 Add CPPEvalV2Client examples to Windows drop script 2016-10-20 17:01:04 +02:00
Alexey Orlov 8c1fdfe81d Add CPPEvalV2Client examples to Linux drop script 2016-10-20 16:56:08 +02:00
Alexey Orlov c6b1be0077 Add 2.0 include files to Linux drop script 2016-10-20 16:26:06 +02:00
Alexey Orlov 88ad84d419 Add 2.0 include files to Windows drop script 2016-10-20 16:15:14 +02:00
Alexey Orlov 320c951edf Modifying Windows Binary Drop script for 2.0 Beta 2016-10-20 15:04:17 +02:00
Alexey Orlov 66a42dddaa Modifying Linux Binary Drop script for 2.0 Beta 2016-10-20 12:56:49 +02:00
Project Philly d3a073b7a4 Integrate alexeyo/Binary-Drop-Script-Linux-Add-Kaldi into master 2016-10-19 06:15:43 -07:00
Qiwei Ye a5d7b7f369 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	CNTK.sln
2016-10-18 16:03:09 +08:00
Mark Hillebrand 643cc3aec2 Merge remote-tracking branch 'origin/master' into mahilleb/PyBuildUpdate 2016-10-14 13:05:37 +02:00
Alexey Orlov 2eb3a48164 Add Kaldi dependencies to Linux drop 2016-10-13 16:53:55 +02:00
Alexey Orlov dc8d527584 Removing unneeded libzip.so from drop 2016-10-12 16:28:20 +02:00
Mark Hillebrand ddb1434e50 Linux: CNTK v2 Python build support through Makefile 2016-10-12 16:12:25 +02:00
Alexey Orlov b1895581e1 Add libzip.so.4 to binary drop 2016-10-11 15:41:35 +02:00
Qiwei Ye 2ab22c55d7 Merge branch 'master' into qiwye/asgd-dev 2016-10-09 16:02:34 +08:00
Zhou Wang f00eb56655 remove V2 python from drop 2016-09-30 12:32:13 +02:00
Qiwei Ye 5059e931d1 Merge branch 'qiwye/asgd-dev' into feiga/multiverso
Conflicts:
	Source/SGDLib/SGD.cpp
2016-09-29 11:05:11 +08:00
feiga d7463fe507 Refine Makefile 2016-09-27 22:17:42 +09:00
Qiwei Ye 8a2e67aba8 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/1BitSGD
	Source/SGDLib/SGD.cpp
2016-09-27 17:04:03 +08:00
Fei Gao c073fb0b17 Solve the multiversotests loader library path issue 2016-09-26 04:54:53 -07:00
Eldar Akchurin bec52b7ca1 Bumping MKL version in the docker 2016-09-26 11:55:39 +02:00
Mark Hillebrand a45a120843 make_binary_drop_linux: bump CNTKCustomMKL version number 2016-09-26 11:55:39 +02:00
Zhou Wang 5fc85f9404 fix missing path 2016-09-26 10:39:37 +02:00
Zhou Wang f3d77f5a76 remove EvalV2Examples from the binary drop for now, until V2 is published. 2016-09-24 22:25:43 +02:00
Mark Hillebrand 69c3575294 Windows: place unit test binaries in build directory directly 2016-09-22 12:51:33 +02:00
Fei Gao 804d79286d Enable ASGD make 2016-09-20 21:45:14 -07:00
Fei Gao f5671d86c1 Build with Multiverso and ASGD 2016-09-19 03:07:15 -07:00
Mark Hillebrand b57445ad18 Tools/check-git-head.sh: run basic checks against Git HEAD 2016-09-19 09:13:31 +02:00
Qiwei Ye fab018435c Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
Conflicts:
	Source/CNTK/CNTK.cpp
2016-09-18 13:34:42 +08:00
Qiwei Ye b938d9a603 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	CNTK.sln
2016-09-13 14:34:05 +08:00
Zhou Wang f464f05a63 remove CSEvalClientTest.exe.config and other eval test executables 2016-09-05 17:24:11 +02:00
Qiwei Ye 0d077ff592 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/SGDLib/SGD.cpp
2016-09-01 12:55:44 +08:00
Zhou Wang 329ab101d2 no need to remove CPP(CS)EvalClient-CntkSln directories, as they are moved to Tests/Evaltests/ 2016-08-30 18:41:54 +02:00
Zhou Wang a758f2c923 The CPP(CS)EvalClient-CntkSln has been moved out of the directory, so no need to delete them during binary drop 2016-08-30 18:36:55 +02:00
Mark Hillebrand 2f9c73cab1 Tools/make_binary_drop_linux: exclude Examples/Evaluation/{CPP,CS}EvalClient-CntkSln 2016-08-30 15:08:01 +02:00
Zhou Wang f61c01c1d1 add Recurse to enforce remove dir 2016-08-30 08:03:26 +02:00
Mark Hillebrand 82d19034be Merge remote-tracking branch 'origin/zhouwang/evalsdk' into mahilleb/CifarDownload 2016-08-29 14:59:12 +02:00
Mark Hillebrand 8b5cbd1c6c Tools/make_binary_drop_linux: exclude unit test binaries from publishing 2016-08-29 14:58:32 +02:00
Zhou Wang 16009f1388 rename project files, address CR comments 2016-08-29 14:16:12 +02:00
Mark Hillebrand a8135e1808 Fix inconsistent naming for CIFAR download script 2016-08-29 11:37:50 +01:00
Mark Hillebrand 7f934e70dd Examples/Evaluation: published eval clients all in same directories
When included from CNTK.sln, use {CS,CPP}EvalExamples-FromCntkSln.
Change Windows binary drop script to remove the latter.
2016-08-29 11:21:19 +02:00
Mark Hillebrand 3d60894b64 configure: prefer cudnn-5.1 over cudnn-5.0 2016-08-26 15:37:00 +02:00
Mark Hillebrand 39eb15a723 Tools/make_binary_drop_linux: libcudnn 4.0 -> 5.0 2016-08-26 15:35:53 +02:00
Qiwei Ye e20626af7c Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
Conflicts:
	Source/Multiverso
2016-08-23 19:42:36 +08:00
Qiwei Ye c5ccb2a10d Merge branch 'master' into qiwye/asgd-dev 2016-08-23 19:35:31 +08:00
Frank Seide 54f096083d merged from mahilleb/CuDnn5Test 2016-08-22 18:51:22 -07:00
Mark Hillebrand f76afa2b7e Switch to CuDNN v5
For batch normalization, running inverse standard deviation becomes
running variance. We mirror this CuDNN v5 change in the CNTK batch
normalization engine. Model version is bumped. When old models are
loaded, this parameter is (approximately) converted.

In the same model version change, let batch normalization count
samples seen rather minibatches (this deals with incorrect averaging
when minibatch size is varied across epochs).

For batch normalization averaging and blending handle initialization
cases, don't rely on mean and variance initial values (set in
NDL/BrainScript).

Update Windows / Linux / Docker build.
With this commit, CuDNN v4 is not supported anymore.
2016-08-22 17:55:10 +02:00
Wolfgang Manousek 79cfcf7d4f more acml removal 2016-08-17 10:04:56 +02:00
Nikos Karampatziakis 52126c39e2 adjust LD_LIBRARY_PATH in Dockerfile 2016-08-09 16:10:53 -07:00
Nikos Karampatziakis 0f9eadf7c5 update GPU Dockerfile to cuda 7.5 and add test dependencies to both CPU and GPU Dockerfiles 2016-08-09 15:58:16 -07:00
Zhou Wang 15d4045a1e Add libzip path to LD_LIBRARY_PATH 2016-08-08 22:05:09 +02: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
Mark Hillebrand efd5cba2d4 Tools/docker/Dockerfile-GPU: use pre-installed GDK
Closes #629.
2016-07-29 12:09:51 +01: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
Qiwei Ye 07b7993300 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
Conflicts:
	Source/Multiverso
2016-07-26 14:02:06 +08: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
Project Philly 8d50459a58 Integrate alexeyo/Binary-Drop-Extras-Update-Linux into master 2016-07-13 06:42:19 -07:00
Project Philly 310b81576e Integrate alexeyo/Binary-Drop-Script-Include-Windows into master 2016-07-13 06:38:51 -07:00
Alexey Orlov de20e9d3ef Modified 1bit-SGD License description 2016-07-13 14:33:21 +02:00
Alexey Orlov 30ff5bc41c Modified Linux Binary Drops Linux for 1.6 Release 2016-07-13 14:20:11 +02:00
Alexey Orlov 5604705379 Fixed Include path for binary drop. Windows 2016-07-12 14:49:17 +02:00
Alexey Orlov 0a9c095197 Fix Include folder makeing in Binary drop. Windows 2016-07-12 14:42:55 +02:00
Alexey Orlov 2dc246f489 Fixed Include file name for binary drop. Windows 2016-07-12 14:36:24 +02:00
Alexey Orlov 024e0ed560 Add Include file to Binary drop. Windows 2016-07-12 14:25:56 +02:00
Alexey Orlov 2544ae9102 Fixing Include Path in Binary Drop script. Linux 2016-07-12 11:36:57 +02:00
Alexey Orlov 2bb3fba2dc Fixing console message in Binary Drop script. Linux 2016-07-12 11:30:05 +02:00
Alexey Orlov 7af1709687 Fixing errors in Binary Drop script. Linux 2016-07-12 11:27:34 +02:00
Alexey Orlov 21c8ba092e Polishing Binary Drop script. Linux 2016-07-12 11:22:38 +02:00
Alexey Orlov 80802ea884 Add Include to Binary Drop. Linux 2016-07-12 11:11:45 +02:00
Alexey Orlov 39e32b1226 Corrected Scripts path 2016-07-07 14:45:28 +02:00
Alexey Orlov 4faaccb140 Binary Drop script Windows. New version 2016-07-07 14:15:03 +02:00
Alexey Orlov 9907d68e7c Addressed reviewers comments 2016-07-07 11:06:38 +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
Alexey Orlov 15487535d9 Changed rm to rm -r in Scripts cleanup 2016-07-07 09:17:08 +02:00
Alexey Orlov 1a9ff644f0 Fixed rm in Scripts copy 2016-07-06 16:32:37 +02:00
Alexey Orlov fbd39b1a3d Add cleanup of Scripts 2016-07-06 16:15:50 +02:00
Alexey Orlov 0b3e01a92e Add copying Scripts to Binary Drops 2016-07-06 15:57:25 +02:00
Mark Hillebrand fdcfc02ca6 Tools/make_binary_drop_linux: MKL replaces ACML; opencv-3.1 2016-07-06 12:40:49 +02:00
Alexey Orlov d412ea0aaf Fixed Install-Linux.txt for Binary Drop 2016-07-02 15:30:22 +02:00
Mark Hillebrand e04a9bd7f3 Update Tools/docker/Dockerfile-*
- Open MPI 1.10.3
- OpenBLAS 0.2.18, also compile with OpenMP and LAPACK
- OpenCV 3.1.0 (also support in ./configure)
- CNTK custom MKL, version 1
- MKL build (in /cntk/build-mkl/*/release)
- Add python-yaml package, so TestDriver.py can be run
2016-06-23 18:49:20 +01:00
Qiwei Ye 53a50b75ef Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
Conflicts:
	Source/CNTK/CNTK.cpp
	Source/Common/Include/MultiversoWrapper.h
	Source/Multiverso
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
2016-06-21 22:07:49 +08: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
Mark Hillebrand 52ae07279d CNTK custom MKL support 2016-06-14 17:39:24 +02:00
Qiwei Ye 05272367a7 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
Conflicts:
	Source/Common/Include/MultiversoWrapper.h
2016-05-14 14:49:29 +08: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
Qiwei Ye d192bc7690 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
Conflicts:
	.gitmodules
	Source/Multiverso
	Source/Readers/HTKMLFReader/utterancesourcemulti.h
2016-05-03 19:55:06 +08: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
Frank Seide a503048de0 merged with master 2016-05-02 15:35:52 -07:00
Marko Radmilac 63c7fad4c8 Add support for gcov code coverage builds 2016-05-02 09:48:46 -07:00
Alexey Orlov 9632b1da6a License files extension fix 2016-04-29 09:57:55 +02: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 Orlov 7bf098257a ReadMe files - fixed formatting 2016-04-21 10:44:41 +02:00
Alexey Orlov 020150c673 ReadMe files 2016-04-21 10:36:45 +02:00
Alexey Orlov 6258338abd License Files 2016-04-18 17:52:07 +02:00
Alexey Orlov 5d0d656084 License Files 2016-04-18 17:45:16 +02:00
Alexey Orlov 1b8f482777 License files 2016-04-18 17:36:53 +02:00
Alexey Orlov 2526c528c0 Install instructions 2016-04-18 17:15:01 +02:00
Alexey Orlov f40736733e Binary drop script Linux. CUDA 7.5 2016-04-18 14:45:48 +02:00
Qiwei Ye 0b654e580f fix linux build 2016-04-17 17:28:13 +08: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
Gaizka Navarro 911f5ce4d5 This commit fixes issues with files marked as "modified" by Visual Studio. The offending extensions are added to the .gitattributes marking them as "text" files.
The offending Output files and directory are removed
The offending will-be-license files are renamed to include a ".txt" extension.
2016-04-12 10:49:23 +02:00
Mark Hillebrand cf394a6bd6 Tools/build-and-test: use make -j `nproc`, not unlimited 2016-04-06 17:28:36 +02:00
Alexey Orlov 511046627b Format fix 2016-04-03 11:21:53 +02:00
Alexey Orlov afb385b204 Add libzip to binary drops script Linux 2016-03-31 20:27:27 +02:00
Project Philly 19e261541f Integrate 1ffe2c9bdd into master 2016-03-29 13:37:19 -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
John Ludwig 1ffe2c9bdd Revised based on review comments 2016-03-29 07:40:35 -07:00
John Ludwig 37ca497024 revised docker files 2016-03-26 16:41:25 -07:00
Mark Hillebrand 74d11faafa Remove accidentally checked in file: Tools/.make_binary_drop_linux.swp 2016-03-23 09:47:10 +01:00
Alexey Orlov 3fab27dfec Fix make_binary_drop_linux
execution attribute
2016-03-20 11:50:07 +01:00
Frank Seide 527c61ba95 merged from master 2016-03-15 18:48:29 -07:00
Alexey Orlov 294e370509 Binary drop script. Linux. Addressed Code Review comments 2016-03-11 13:19:01 +01:00
Alexey Orlov cac9e50ef8 Binary drop script. Linux. First version to test with Jenkins 2016-03-09 13:33:06 +01:00
Alexey Orlov ab26fcacf5 Linux extras for Binary Drop. Changed durectory structure 2016-03-08 18:30:26 +01:00
Alexey Orlov 5bb3eeddcc Linux extras for Binary Drop 2016-03-08 17:11:10 +01:00
Alexey Orlov d0ea391815 Binary drop script, Windows. Adding changes for the new Jenkins job 2016-03-03 13:46:11 +01:00
Alexey Orlov 8417afe518 Binary drop script, Windows. Adding command line parameters 2016-03-01 18:31:54 +01:00
Alexey Orlov b41414812d Binary drop script, Windows. Response to Code Review comments 2016-03-01 11:24:57 +01:00
Alexey Orlov 79f2612d63 Binary drop script, Windows. Response to Code Review comments - fixing errors in iteration 2016-02-26 13:02:37 +01:00
Alexey Orlov dce4a208d4 Binary drop script, Windows. Response to Code Review comments 2016-02-26 11:52:27 +01:00
Qiwei Ye 8ad04627d3 fixbug: to generate right tag for asgd support in build info 2016-02-25 21:54:35 +09:00
Alexey Orlov 93d371e436 Binary drop script, Windows. Final touches 2016-02-25 11:20:25 +01:00
Alexey Orlov 6c75b28fb9 Binary drop script, Windows. Next iteration 2016-02-25 11:04:10 +01:00
Alexey Orlov b96c85236c Binary drop script, Windows. Next iteration 2016-02-25 10:58:34 +01:00
Alexey Orlov dc42ff996b Binary drop script, Windows. Next iteration 2016-02-25 10:32:45 +01:00
Alexey Orlov b2d5f6515b Script. Next iteration 2016-02-24 18:31:10 +01:00
Alexey Orlov 0e874ee1c9 Script. Next iteration 2016-02-24 18:03:39 +01:00
Alexey Orlov a14c4e28a1 Script. Next iteration 2016-02-24 17:28:06 +01:00
Alexey Orlov 26f62147cc Script. Next iteration 2016-02-24 16:57:50 +01:00
Alexey Orlov 59c0416fbf Add Make Binary Drop Windows Script 2016-02-24 14:20:11 +01:00
Qiwei Ye edc2dd81e8 adding predefine macro for linux with ASGD support 2016-02-16 15:46:04 +08:00
Project Philly ab7d5f5575 Integrate mahilleb/BuildAndTestTuneNew into master 2016-02-03 07:02:45 -08:00
Mark Hillebrand fe75bb1650 Extend build information included / reported by CNTK
* Build target: GPU or CPU-only
   * Build type (Debug or Release), was missing for Windows
   * Whether or not 1bit-SGD was included
   * If there were local modifications in the Git working copy
   * Generate BUILD{ER,MACHINE,PATH} on Linux
2016-02-03 15:48:39 +01:00
Mark Hillebrand 0e7c6630db Tools/build-and-test: fixes and extensions
* Add --test-targets options to limit test to CPU / GPU
     CPU builds support testing only for CPU,
     GPU builds support testing for both.
   * Add --clean-build-after, hook-up and fix existing code.
   * Change build directories on Linux to build/$TARGET/$FLAVOR
   * Fix clean-up bug between test run.
   * More quoting for 'rm'
   * Support CPU-only build for Windows
   * MSbuild in parallel and with less output
   * Exit if both GPU and 1bit-SGD is requested on Windows (side-by-side
     not yet support)
   * GPU tests will specify device ID 0, not Auto
2016-02-03 15:39:14 +01:00
Mark Hillebrand b0a6e00b8a Use .cntk as default extension for CNTK configuration files 2016-02-01 10:19:48 +01:00
Mark Hillebrand 1aefd22f8a Change default targets for build-and-test 2016-01-22 15:46:46 +01:00
Amit 0f2786c4f1 Added support for 1BitSGD build flavor to build-and-test script. Also fixed a CPUONLY build error 2016-01-14 10:58:31 -08:00
Yongqiang Wang cba311ed72 Display CUB and CUDNN paths (if defined) in BuildInfo
Print BuildInfo at the very begining of the program. convenient for checking
build type.
2015-12-21 21:56:33 -08:00
Philipp Kranen 1527b89439 Adapted Readme files wrt new directory structure 2015-12-21 11:30:43 +01:00
pkranen 4ae7f76ac4 Fixed build-and-test script for Example move 2015-12-16 15:37:58 +01:00
Mark Hillebrand a9c4922a5e Makefile: adapt to new location of generate_build_infop script 2015-12-16 14:24:49 +00:00
Mark Hillebrand bfe490e273 Add execute permissions for Python and shell scripts 2015-12-16 13:54:33 +00:00
pkranen 4a888ad95d Renamed Scripts flder to Tools 2015-12-16 13:58:53 +01:00