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

346 Коммитов

Автор SHA1 Сообщение Дата
Philipp Kranen 1ab395aa76 Added Flowers data set and scripts 2017-02-07 23:37:37 +01:00
Wolfgang Manousek 9c968d6c92 removed dangling ; 2017-02-07 10:29:32 +01:00
Wolfgang Manousek 26da2a5c5b fix Opencv download, added NoConfirmation option 2017-02-07 09:42:56 +01:00
Mark Hillebrand 0c93428c84 Tools/make_binary_drop_linux: fix wrt updated cudnn location 2017-02-01 18:13:30 +01:00
Mark Hillebrand b871e83de1 Tools/samples.json, bindings/python/doc/tutorials.rst: updated 2017-02-01 18:13:18 +01:00
Thilo Will 59b41e4ead Tutorial CNTK_207: adding to samples.json. Adding 'from __future__' 2017-02-01 10:20:36 +01:00
Guenther Schmuelling aa884114cd added cntk-106b 2017-01-30 13:27:56 -08:00
REDMOND\sayanpa 2126d008b1 Merge branch 'master' of https://github.com/Microsoft/CNTK into sayanpa/gantut 2017-01-27 17:38:27 -08:00
REDMOND\sayanpa 2e4b4b559c Merge branch 'master' of https://github.com/Microsoft/CNTK into sayanpa/gantut 2017-01-27 11:15:43 -08:00
Cha Zhang e13224113b Update based on CR comments. 2017-01-27 10:30:59 -08:00
Wolfgang Manousek 96050ad86b addresses CR comments
fix parameter set definition
2017-01-27 11:58:33 +01:00
Wolfgang Manousek d87439b568 check that the 64bit version of powershell is used to run the script
added PyEnvironmentName as an optional parameter
removed text from readme to limit duplication with wiki
fix minor code formatting issues
2017-01-27 11:58:33 +01:00
Wolfgang Manousek 9df7fcb213 fix issue with path specification at the command line terminated with a backslash
check download with hash instead of filesize
don't report error if hash doesn't match, make this into a warning
2017-01-27 11:58:33 +01:00
REDMOND\sayanpa 9964293f8f Added GAN tutorial with CR feedback 2017-01-26 17:57:57 -08:00
REDMOND\sayanpa f94ebcf4f6 Adding basic GAN tutorial 2017-01-25 16:07:19 -08:00
Wolfgang Manousek 167734c56b download cudnn directly from github archive 2017-01-24 13:53:28 +01:00
Philipp Kranen e57a497723 Added test for Python deconv example 2017-01-24 09:52:37 +01:00
Mark Hillebrand 373a436cb1 Tools/docker/CNTK-GPU*/Dockerfile: fix base image
Also in Tests/Install/linux/Dockerfile-*-GPU.
2017-01-23 15:16:06 +01:00
Wolfgang Manousek d15bec5a5b remove size verification for cudnn download 2017-01-21 09:42:08 +01:00
Wolfgang Manousek 0a2303a242 move default to python35 2017-01-21 08:54:42 +01:00
REDMOND\sayanpa 6f1909d6b8 Merge branch 'master' of https://github.com/Microsoft/CNTK into sayanpa/cntk206 2017-01-19 13:05:50 -08:00
REDMOND\sayanpa f514609836 Updated tutorial with CR feedback 2017-01-19 13:05:33 -08:00
Project Philly bcf0e9cb58 Integrate mahilleb/LinPyDefault into master 2017-01-19 11:13:04 -08:00
Project Philly a745f3489f Integrate v-lelu/bn-inception-bs into master 2017-01-19 10:42:13 -08:00
Mark Hillebrand 7ad880669d Linux: Py 3.5 default at various places 2017-01-19 15:22:00 +01:00
Otto Lu b88158b893 Add bn-inception and fix inception-v3 in 'Tools/samples.json' 2017-01-19 17:27:45 +08:00
Philipp Kranen cde6154b24 Added test, addressed CR comments 2017-01-19 09:50:23 +01:00
REDMOND\sayanpa cf6f50cc26 addressed comments from CR 2017-01-18 19:36:30 -08:00
REDMOND\sayanpa c6147735a9 Added timeseries with LSTM basics tutorial 2017-01-18 13:12:24 -08:00
REDMOND\sayanpa bfd9829554 Replace tab with spaces 2017-01-13 11:16:52 -08:00
REDMOND\sayanpa 80321d9148 Added CNTK105 autoencoder tutorial 2017-01-13 11:12:47 -08:00
Mark Hillebrand b3e7bb2e8b Python: include all wheels in drop 2017-01-12 15:11:19 +01:00
Wolfgang Manousek ec475cf5f3 adressed CR comments 2017-01-12 13:59:16 +01:00
Wolfgang Manousek 0389f772d0 fix the Anaconda installer invocation (no quotes allowed around path)
clean up DoProcess function
2017-01-12 13:59:16 +01:00
Wolfgang Manousek f160085550 addressed CR comments 2017-01-11 19:31:32 +01:00
Wolfgang Manousek c1684a7a4e more cr changes 2017-01-11 19:31:32 +01:00
Wolfgang Manousek 89f9a54eca addressed CR comments 2017-01-11 19:31:31 +01:00
Wolfgang Manousek f9292628b6 variouse bug fixes, environment variable settings, etc. Removed dead code 2017-01-11 19:31:31 +01:00
Project Philly 9ebd46dd04 Integrate pkranen/featExtract into master 2017-01-11 07:31:03 -08:00
Mark Hillebrand 18f35d7da6 Address CR comments 2017-01-11 13:22:47 +00:00
Philipp Kranen 319386f528 addressed CR comments 2017-01-11 12:48:43 +01:00
Mark Hillebrand ad587941f4 Linux: Docker: fix build
- CNTKCustomMKL is now on version 3
- CNTK build with OpenBlas was broken because of additional OpenMP
  dependencies in test binaries.
2017-01-11 10:15:46 +00:00
Wolfgang Manousek 172293b54d moved to tools directory, minor bug fix in build-batch files 2017-01-10 16:47:16 +01:00
Mark Hillebrand 7cb1db6620 Merge remote-tracking branch 'origin/master' into mahilleb/vs2015fi
Conflicts:
    Source/CNTKv2LibraryDll/Utils.cpp
2017-01-10 11:29:03 +01:00
Mark Hillebrand 911b2ca82e Windows: switch to Visual Studio 2015 2017-01-10 10:47:35 +01:00
Mark Hillebrand 4b31eda24f Merge remote-tracking branch 'origin/master' into mahilleb/Mnist13 2017-01-10 08:05:44 +01:00
Mark Hillebrand 6dc09565bb CNTK_103B_MNIST_FeedForwardNetwork.ipynb: add test
Also, let run MNIST tests against the default (end-user) data location.
2017-01-10 05:42:30 +01:00
Junjie Qian 71c5aaba06 MPI_info: Path check and error handling for MPI exec
MPI_check: Check and selection of the installed MPI

MPI_info: default unknown fix for MPI name and version
2017-01-06 10:03:01 -08:00
Chris Basoglu 6a34b9a944 Update new example descriptions 2017-01-03 11:10:55 -08:00
Mark Hillebrand 38d14a6c59 Tools/samples.json: edited 2017-01-03 14:12:37 +01:00
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