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

346 Коммитов

Автор SHA1 Сообщение Дата
Thiago Crepaldi 0f28edf814 Fix CNTK build and tests after 1bitSGD merge 2018-03-07 15:31:25 -08:00
Manik Jindal 461b82d69f Move hard-coded CNTK version to a common place
This will help to build CNTK for nighlty builds with required CNTK
version. If environment variable 'BUILD_CNTK_VERSION' is set, then CNTK
will be build for that version as a public release('+' won't be appended
to CNTK version). Otherwise hard-coded CNTK version will be used as a
private build (2.4+).
2018-02-20 13:22:59 -08:00
Thiago Crepaldi c5abe7f9b0 Add KERA_BACKGROUND=cntk into CNTK Dockerfiles 2018-02-07 10:34:51 -08:00
Manik Jindal fbbbaa92f6 Merge release/2.4
Squashed commit of the following:

commit 82e025bbe319008c535741a9fc78367032cc3be0
Merge: 0702c09c3 ed5451c83
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 21:23:23 2018 -0800

    Merge branch 'release/2.4' into manikj/merge-release-2.4

commit 0702c09c3c3cc1ae1e4cba28df3ce64f091a8c3e
Merge: 32f6844ca 1afe40461
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 21:23:11 2018 -0800

    Merge branch 'release/2.4' (early part) into manikj/merge-release-2.4

commit 32f6844ca84797db2dac8959eeb72576692986d0
Merge: 42a47a326 1f15d4649
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 21:21:55 2018 -0800

    Merge branch 'release/2.4' (early part) into manikj/merge-release-2.4

commit ed5451c834
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 19:32:04 2018 -0800

    MakeBinaryDrop: Fix lib names

commit c528a56d4a
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 12:35:40 2018 -0800

    Update README.md

commit 490a58e4a9
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 12:08:57 2018 -0800

    Add Halide to Release notes

commit 2196299a71
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 11:48:45 2018 -0800

    MakeBinaryDrop: Change Cuda libs to 9.0

commit 3df48ddd3a
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 06:06:29 2018 -0800

    Add release notes

commit 1afe404611
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 06:05:05 2018 -0800

    Replace 2.4+ with 2.4

commit 1f15d46496
Author: Manik Jindal <manikj@microsoft.com>
Date:   Wed Jan 31 06:04:24 2018 -0800

    Bump version to 2.4
2018-01-31 21:38:52 -08:00
Manik Jindal e129bcf5de MakeBinaryDrop: Change Cuda libs to 9.0 2018-01-31 18:48:12 -08:00
Manik Jindal 343f38350a Remove Python 3.4 support 2018-01-26 14:55:22 -08:00
KeDengMS 851ea5d90a Fix linux binary drop script for nccl 2018-01-23 22:18:32 -08:00
KeDengMS 387725d645 Merge branch 'kedeng/fixDocker2' 2018-01-23 19:28:47 -08:00
KeDengMS 9f6cced082 Fix Dockerfiles under Tools/docker 2018-01-23 13:44:01 -08:00
Thiago Crepaldi a40285c90c Rename default Anaconda python environment
Depending on the CNTK setup steps followed, either cntk-py<version> or
<cntkdev-py<version> is installed. cntk-py<version> will be adopted as
the default from now on.
2018-01-23 10:43:51 -08:00
KeDengMS 3cf3af5df6 CNTK support for CUDA 9
CNTK now supports CUDA 9/cuDNN 7. This requires an update to build environment to Ubuntu 16/GCC 5 for Linux, and Visual Studio 2017/VCTools 14.11 for Windows. With CUDA 9, CNTK also added a preview for 16-bit floating point (a.k.a FP16) computation.

Please check out the example of FP16 in ResNet50 at /Examples/Image/Classification/ResNet/Python/TrainResNet_ImageNet_Distributed.py

Notes on FP16 preview:
* FP16 implementation on CPU is not optimized, and it's not supposed to be used in CPU inference directly. User needs to convert the model to 32-bit floating point before running on CPU.
* Loss/Criterion for FP16 training needs to be 32bit for accumulation without overflow, using cast function. Please check the example above.
* Readers do not have FP16 output unless using numpy to feed data, cast from FP32 to FP16 is needed. Please check the example above.
* FP16 gradient aggregation is currently only implemented on GPU using NCCL2. Distributed training with FP16 with MPI is not supported.
* FP16 math is a subset of current FP32 implementation. Some model may get Feature Not Implemented exception using FP16.
* FP16 is currently not supported in BrainScript. Please use Python for FP16.

To setup build and runtime environment on Windows:
* Install [Visual Studio 2017](https://www.visualstudio.com/downloads/) with following workloads and components. From command line (use Community version installer as example):
    vs_community.exe --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.VisualStudio.Workload.Universal --add Microsoft.Component.PythonTools --add Microsoft.VisualStudio.Component.VC.Tools.14.11
* Install [NVidia CUDA 9](https://developer.nvidia.com/cuda-90-download-archive?target_os=Windows&target_arch=x86_64)
* From PowerShell, run:
    /Tools/devInstall/Windows/DevInstall.ps1
* Start VCTools 14.11 command line, run:
    cmd /k "%VS2017INSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64 --vcvars_ver=14.11
* Open /CNTK.sln from the VCTools 14.11 command line. Note that starting CNTK.sln other than VCTools 14.11 command line, would causes CUDA 9 [build error](https://developercommunity.visualstudio.com/content/problem/163758/vs-2017-155-doesnt-support-cuda-9.html).

To setup build and runtime environment on Linux using docker, please build Unbuntu 16.04 docker image using Dockerfiles /Tools/docker. For other Linux systems, please refer to the Dockerfiles to setup dependent libraries for CNTK.
2018-01-22 16:58:56 -08:00
Manik Jindal e4f80549a8 Fix IndexOutOfBound error in make_binary_drops 2017-12-28 16:25:07 -08:00
Eldar Akchurin fd74a5c133 Adding C header to the drop 2017-12-05 09:46:22 +01:00
KeDengMS 63f58ab1e1
Merge pull request #2627 from mogmod/CNTK-Dockerfile-libzip
Fix libzip download url
2017-11-17 13:47:40 -08:00
mogmod 928d583c4f Fix Dockerfiles --with-mkl path for Intel MKL-DNN(2017-11-10). 2017-11-17 00:24:23 -05:00
mogmod 87fb0bd3b7 Fix download url: http://nih.at/libzip is redirected to https://libzip.org 2017-11-17 00:14:29 -05:00
KeDengMS fbe030b0dc Switch from CNTKCustomMKL to Intel MKLML. MKLML is released with [Intel MKL-DNN](https://github.com/01org/mkl-dnn/releases) as a trimmed version of Intel MKL for MKL-DNN. To set it up:
On Linux:

    sudo mkdir /usr/local/mklml
    sudo wget https://github.com/01org/mkl-dnn/releases/download/v0.11/mklml_lnx_2018.0.1.20171007.tgz
    sudo tar -xzf mklml_lnx_2018.0.1.20171007.tgz -C /usr/local/mklml

On Windows:

    Create a directory on your machine to hold MKLML, e.g. mkdir c:\local\mklml
    Download the file [mklml_win_2018.0.1.20171007.zip](https://github.com/01org/mkl-dnn/releases/download/v0.11/mklml_win_2018.0.1.20171007.zip).
    Unzip it into your MKLML path, creating a versioned sub directory within.
    Set the environment variable `MKLML_PATH` to the versioned sub directory, e.g. setx MKLML_PATH c:\local\mklml\mklml_win_2018.0.1.20171007

This change also enables CPU convolution forward/backward using MKL, which leads to ~4x speedup in AlexNet training.
2017-11-10 11:48:16 -08:00
Sayan Pathak 16a41cef30 Added super resolution tutorial contributed by Borna with added code to minimize test downloads, fix tests, added documentation and small editorial changes to LSGAN tutorial 2017-11-02 09:10:10 -07:00
REDMOND\sayanpa c17eb82bf8 Adding WGAN and LSGAN tutorials 2017-10-17 13:05:16 -07:00
REDMOND\sayanpa 5dffd712e0 Added DSSM tutorial 2017-10-16 13:25:19 -07:00
liqfu a3f20af5e5 Add PretrainedModels to windows/linux/examples drops 2017-09-11 12:51:47 -07:00
Wolfgang Manousek 49cbd8555b remove cub download hash 2017-08-31 13:31:51 +02:00
Philipp Kranen 46452cf8bc added Faster R-CNN to samples.json 2017-08-30 17:16:29 +02:00
Lewei Lu 2dc645b8ea update sample.json 2017-08-05 00:13:50 +08:00
Zhou Wang 4d99e17dc0 check hard tabs also in .i and .cs files 2017-08-02 14:21:29 +02:00
Zhou Wang 852e13fba6 ad uwp sample entry 2017-08-01 10:56:13 +02:00
Wolfgang Manousek d817f8bda1 change install to cudnn6 2017-07-31 17:55:46 +02:00
Mark Hillebrand e908663058 Tools/make_*: include Manual/ folder in packaged content 2017-07-31 17:55:45 +02:00
Philipp Kranen 0ed295e653 proper loss normalization, roi pooling backprop only for index zero in ConvolutionalNodes.h 2017-07-26 22:58:46 +02:00
Mark Hillebrand f4264ec1cf Tools/samples.json: fix syntax 2017-07-25 14:01:30 +02:00
REDMOND\sayanpa 2f4bf7475e Added new example that uses the CNTK Keras backend to train a bird to fly through a cactus maze using reinforcement learning. 2017-07-25 09:42:49 +02:00
Qiwei Ye aac3c56f4b Merge branch 'qiwye/lightrnn' of https://github.com/Microsoft/CNTK into qiwye/lightrnn
Conflicts:
	Tests/EndToEndTests/Downloads/run-test
2017-07-21 03:36:52 -07:00
StillKeepTry b243d302c3 fix typo 2017-07-21 03:22:27 -07:00
Qiwei Ye 252a2af027 Merge branch 'master' of https://github.com/Microsoft/CNTK into qiwye/lightrnn 2017-07-21 12:54:18 +08:00
Mark Hillebrand 4833d05258 Tools/docker/CNTK-GPU-*/Dockerfile: FROM nvidia/cuda:8.0-cudnn6-devel-ubuntu14.04 2017-07-17 18:00:12 +02:00
Mark Hillebrand 25b5619c88 Tools/docker/*/Dockerfile: add COMMIT build argument 2017-07-17 18:00:12 +02:00
Mark Hillebrand 0b880c2e53 Tools/make_binary_drop_linux: change to make a CuDNN 6 based drop 2017-07-17 11:52:59 +02:00
StillKeepTry 7b7c1abb2d Fix bugs and add DLL complie method 2017-07-13 22:13:30 -07:00
Lewei Lu 95254021f5 update sample.json 2017-07-13 14:55:15 +08:00
Mark Hillebrand a2b4997796 Tools/devInstall/Linux/install-swig.sh: added
Moved and refreshed from bindings/python/swig_install.sh. Install
location now is /usr/local/swig-*, which ./configure picks up
automatically.

Specify --without-alllang for SWIG build, which should suppress building
tests and examples for specific languages.

Windows: Update source setup links for SWIG
2017-07-07 13:16:12 +02:00
Vadim Mazalov 23bfed558c Update samples.json and tutorials.rst 2017-06-25 22:03:05 -07:00
Big Data Tech. Lab 이태훈 1c1c70de90 Fix typos 2017-06-23 16:44:56 +09:00
Wolfgang Manousek 5ecc834722 updating links to old wiki - referencing now the doc site 2017-06-07 15:55:34 +02:00
Ivan Rodriguez 66ce7357c8 Adding VGG distributed examples and tests 2017-05-31 12:59:51 +02:00
Frank Seide 8acef57e09 merged from master 2017-05-25 13:46:15 -07:00
Frank Seide aac0ec4271 added defaults to train(), minibatch_size=32 and max_epochs=1, which both follow defaults familiar from other toolkits;
added 1stSteps examples to samples.json
2017-05-24 10:40:29 -07:00
Mark Hillebrand 8a802a2564 Examples/Image/Classification/VGG/Python: temporarily remove 2017-05-24 14:01:24 +02:00
Zhou Wang e51c927cad remove java\Main.class from binary drop 2017-05-17 15:46:04 +02:00
Mark Hillebrand c1912b449c Tools/docker/CNTK-*: enable to build Java binding 2017-05-15 15:25:16 +02:00
Morgan Funtowicz a76f253119 Added README with more context about this example 2017-05-05 11:31:45 +01:00