Integrate mahilleb/PostReleaseMerges into master

This commit is contained in:
Project Philly 2016-12-22 09:33:24 -08:00
Родитель b786087c57 c1311b8706
Коммит de767e373a
18 изменённых файлов: 50 добавлений и 47 удалений

Просмотреть файл

@ -49,7 +49,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="EvalWrapper, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta5\lib\net45\x64\EvalWrapper.dll</HintPath>
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta7\lib\net45\x64\EvalWrapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -85,11 +85,11 @@
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta5\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta5\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta7\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta7\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta5\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta5\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta7\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.0-beta7\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
</Target>
</Project>

Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.0-beta5" targetFramework="net45" />
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.0-beta7" targetFramework="net45" />
</packages>

Просмотреть файл

@ -13,7 +13,7 @@ from cntk.learner import sgd, learning_rate_schedule, UnitType
from cntk.ops import input_variable, cross_entropy_with_softmax, classification_error, sequence
abs_path = os.path.dirname(os.path.abspath(__file__))
sys.path.append(os.path.join(abs_path, "..", "..", "..", "_PyTests", "common"))
sys.path.append(os.path.join(abs_path, "..", "..", "..", "common"))
from nn import LSTMP_component_with_self_stabilization, embedding, linear_layer, print_training_progress
# Creates the reader

Просмотреть файл

@ -46,7 +46,7 @@ CNTK_EXAMPLES_PATH="$PWD/Examples"
CNTK_TUTORIALS_PATH="$PWD/Tutorials"
CNTK_BINARY="$CNTK_BIN_PATH/cntk"
CNTK_PY_ENV_FILE="$SCRIPT_DIR/conda-linux-cntk-py$PY_VERSION-environment.yml"
CNTK_WHEEL_PATH="cntk/python/cntk-2.0.beta6.0-cp$PY_VERSION-cp${PY_VERSION}m-linux_x86_64.whl"
CNTK_WHEEL_PATH="cntk/python/cntk-2.0.beta7.0-cp$PY_VERSION-cp${PY_VERSION}m-linux_x86_64.whl"
test -d "$CNTK_BIN_PATH" && test -d "$CNTK_LIB_PATH" && test -d "$CNTK_DEP_LIB_PATH" &&
test -d "$CNTK_TUTORIALS_PATH" &&
test -d "$CNTK_EXAMPLES_PATH" && test -x "$CNTK_BINARY" &&

Просмотреть файл

@ -647,7 +647,7 @@ int wmainWithBS(int argc, wchar_t* argv[]) // called from wmain which is a wrapp
static void PrintBanner(int argc, wchar_t* argv[], const string& timestamp)
{
fprintf(stderr, "CNTK 2.0.beta6.0+ (");
fprintf(stderr, "CNTK 2.0.beta7.0+ (");
#ifdef _GIT_EXIST
fprintf(stderr, "%s %.6s, ", _BUILDBRANCH_, _BUILDSHA1_);
#endif

Просмотреть файл

@ -80,7 +80,7 @@ Remove-Item $baseDropPath\cntk\*.lib -Exclude EvalDll.lib, CNTKLibrary-2.0.lib
Remove-Item $baseDropPath\cntk\*.exp
Remove-Item $baseDropPath\cntk\*.metagen
# Remove specific items
If (Test-Path $baseDropPath\cntk\Python\cntk-*-cp27*.whl
If (Test-Path $baseDropPath\cntk\Python\cntk-*-cp27*.whl)
{
Remove-Item $baseDropPath\cntk\Python\cntk-*-cp27*.whl
}

Просмотреть файл

@ -10,7 +10,7 @@
"\n",
"This tutorial is targeted to individuals who are new to CNTK and to machine learning. In this tutorial, you will train a simple yet powerful machine learning model that is widely used in industry for a variety of applications. The model trained below scales to massive data sets in the most expeditious manner by harnessing computational scalability leveraging the computational resources you may have (one or more CPU cores, one or more GPUs, a cluster of CPUs or a cluster of GPUs), transparently via the CNTK library.\n",
"\n",
"The following notebook users Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Tutorials/HelloWorld-LogisticRegression). \n",
"The following notebook users Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Tutorials/HelloWorld-LogisticRegression). \n",
"\n",
"## Introduction\n",
"\n",

Просмотреть файл

@ -769,7 +769,7 @@
"\n",
"If you want to try running the tutorial from python command prompt. Please run the [FeedForwardNet.py][] example.\n",
"\n",
"[FeedForwardNet.py]: https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Tutorials/NumpyInterop/FeedForwardNet.py"
"[FeedForwardNet.py]: https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/NumpyInterop/FeedForwardNet.py"
]
},
{

Просмотреть файл

@ -12,7 +12,7 @@
"\n",
"CNTK 103 tutorial is divided into two parts:\n",
"- Part A: Familiarize with the [MNIST][] database that will be used later in the tutorial\n",
"- [Part B](https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Tutorials/CNTK_103B_MNIST_FeedForwardNetwork.ipynb): We will use the feedforward classifier used in CNTK 102 to classify digits in MNIST data set.\n",
"- [Part B](https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/CNTK_103B_MNIST_FeedForwardNetwork.ipynb): We will use the feedforward classifier used in CNTK 102 to classify digits in MNIST data set.\n",
"\n",
"[MNIST]: http://yann.lecun.com/exdb/mnist/\n",
"\n"

Просмотреть файл

@ -12,7 +12,7 @@
"\n",
"We assume that you have successfully completed CNTK 103 Part A.\n",
"\n",
"In this tutorial we will train a fully connected network on MNIST data. This notebook provides the recipe using Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Examples/Image/GettingStarted)\n",
"In this tutorial we will train a fully connected network on MNIST data. This notebook provides the recipe using Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Examples/Image/GettingStarted)\n",
"\n",
"## Introduction\n",
"\n",
@ -763,7 +763,7 @@
"source": [
"#### Code link\n",
"\n",
"If you want to try running the tutorial from python command prompt. Please run the [SimpleMNIST.py](https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Examples/Image/Classification/MLP/Python) example."
"If you want to try running the tutorial from python command prompt. Please run the [SimpleMNIST.py](https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Examples/Image/Classification/MLP/Python) example."
]
},
{

Просмотреть файл

@ -41,12 +41,12 @@
"In this tutorial we are going to use a (lightly preprocessed) version of the ATIS dataset. You can download the data automatically by running the cells below or by executing the manual instructions.\n",
"\n",
"#### Fallback manual instructions\n",
"Download the ATIS [training](https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Tutorials/SLUHandsOn/atis.train.ctf) \n",
"and [test](https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Tutorials/SLUHandsOn/atis.test.ctf) \n",
"Download the ATIS [training](https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/SLUHandsOn/atis.train.ctf) \n",
"and [test](https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/SLUHandsOn/atis.test.ctf) \n",
"files and put them at the same folder as this notebook. If you want to see how the model is \n",
"predicting on new sentences you will also need the vocabulary files for \n",
"[queries](https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Examples/LanguageUnderstanding/ATIS/BrainScript/query.wl) and\n",
"[slots](https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Examples/LanguageUnderstanding/ATIS/BrainScript/slots.wl)"
"[queries](https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Examples/LanguageUnderstanding/ATIS/BrainScript/query.wl) and\n",
"[slots](https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Examples/LanguageUnderstanding/ATIS/BrainScript/slots.wl)"
]
},
{
@ -88,7 +88,7 @@
" print(\"Reusing locally cached:\", item['file'])\n",
" else:\n",
" print(\"Starting download:\", item['file'])\n",
" url = \"https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/%s/%s?raw=true\"%(location, item['file'])\n",
" url = \"https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/%s/%s?raw=true\"%(location, item['file'])\n",
" download(url, item['file'])\n",
" print(\"Download completed\")\n"
]
@ -633,7 +633,7 @@
"> Note: training with Batch Normalization is currently only supported on GPU.\n",
"\n",
"So your task will be to insert batch-normalization layers before and after the recurrent LSTM layer.\n",
"If you have completed the [hands-on labs on image processing](https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Tutorials/CNTK_201B_CIFAR-10_ImageHandsOn.ipynb),\n",
"If you have completed the [hands-on labs on image processing](https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/CNTK_201B_CIFAR-10_ImageHandsOn.ipynb),\n",
"you may remember that the [batch-normalization layer](https://www.cntk.ai/pythondocs/layerref.html#batchnormalization-layernormalization-stabilizer) has this form:\n",
"```\n",
" BatchNormalization()\n",

Просмотреть файл

@ -158,7 +158,7 @@
" if os.path.exists(file):\n",
" print(\"Reusing locally cached: \", file)\n",
" else:\n",
" url = \"https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%file\n",
" url = \"https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%file\n",
" print(\"Starting download:\", file)\n",
" download(url, file)\n",
" print(\"Download completed\")\n"

Просмотреть файл

@ -63,9 +63,9 @@ author = 'Microsoft'
# built documents.
#
# The short X.Y version.
version = '2.0.beta6.0'
version = '2.0.beta7.0'
# The full version, including alpha/beta/rc tags.
release = '2.0.beta6.0'
release = '2.0.beta7.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

Просмотреть файл

@ -4,30 +4,30 @@ Examples
The best way to learn about the APIs is to look at the
following examples in the [CNTK clone root]/Examples directory:
- `MNIST <https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Examples/Image/Classification/MLP/Python/SimpleMNIST.py>`__:
- `MNIST <https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Examples/Image/Classification/MLP/Python/SimpleMNIST.py>`__:
A fully connected feed-forward model for classification of MNIST
images. (follow the instructions in
Examples/Image/DataSets/MNIST/README.md)
- `TrainResNet_CIFAR10 <https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Examples/Image/Classification/ResNet/Python/TrainResNet_CIFAR10.py>`__:
- `TrainResNet_CIFAR10 <https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Examples/Image/Classification/ResNet/Python/TrainResNet_CIFAR10.py>`__:
An image classification ResNet model for training on the CIFAR image
dataset. (follow the instructions in
Examples/Image/DataSets/CIFAR-10/README.md to get the CIFAR dataset
and convert it to the CNTK supported format)
- `SequenceClassification <https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Examples/SequenceClassification/SimpleExample/Python/SequenceClassification.py>`__:
- `SequenceClassification <https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Examples/SequenceClassification/SimpleExample/Python/SequenceClassification.py>`__:
An LSTM sequence classification model for text data.
- `Sequence2Sequence <https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Examples/SequenceToSequence/CMUDict/Python/Sequence2Sequence.py>`__:
- `Sequence2Sequence <https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Examples/SequenceToSequence/CMUDict/Python/Sequence2Sequence.py>`__:
A sequence to sequence grapheme to phoneme translation model that
trains on the CMUDict corpus.
- `NumpyInterop <https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Tutorials/NumpyInterop/FeedForwardNet.py>`__
- `NumpyInterop <https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/NumpyInterop/FeedForwardNet.py>`__
- NumPy interoperability example showing how to train a simple feed-forward
network with training data fed using NumPy arrays.
- `LanguageUnderstanding <https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Examples/LanguageUnderstanding/ATIS/Python/LanguageUnderstanding.py>`__
- `LanguageUnderstanding <https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Examples/LanguageUnderstanding/ATIS/Python/LanguageUnderstanding.py>`__
- Language Understanding.
- `Video <https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Examples/Video/GettingStarted/Python/Conv3D_UCF11.py>`__
- `Video <https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Examples/Video/GettingStarted/Python/Conv3D_UCF11.py>`__
- Basic 3D convolution networks for deep learning on video tasks.

Просмотреть файл

@ -2,7 +2,7 @@
.. some aliases
.. _CNTK: http://cntk.ai/
Python API for CNTK (2.0.beta6.0)
Python API for CNTK (2.0.beta7.0)
===============================
CNTK_, the Microsoft Cognitive Toolkit, is a system for describing, training,
@ -10,7 +10,7 @@ and executing computational networks. It is also a framework for describing
arbitrary learning machines such as deep neural networks (DNNs). CNTK is an
implementation of computational networks that supports both CPU and GPU.
This page describes the Python API for CNTK_ version 2.0.beta6.0. This is an ongoing effort
This page describes the Python API for CNTK_ version 2.0.beta7.0. This is an ongoing effort
to expose such an API to the CNTK system, thus enabling the use of higher-level
tools such as IDEs to facilitate the definition of computational networks, to execute
them on sample data in real time.

Просмотреть файл

@ -20,13 +20,16 @@ Tutorials
#. CNTK 204: `Sequence to sequence basics`_ with CMU pronouncing dictionary
.. _`Logistic Regression`: https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Tutorials/CNTK_101_LogisticRegression.ipynb
.. _`Feed Forward Network`: https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Tutorials/CNTK_102_FeedForward.ipynb
.. _`MNIST data preparation`: https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Tutorials/CNTK_103A_MNIST_DataLoader.ipynb
.. _`Feed Forward classifier`: https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Tutorials/CNTK_103B_MNIST_FeedForwardNetwork.ipynb
.. _`Time Series basics`: https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Tutorials/CNTK_104_Finance_Timeseries_Basic_with_Pandas_Numpy.ipynb
.. _`CIFAR-10 Data preparation`: https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Tutorials/CNTK_201A_CIFAR-10_DataLoader.ipynb
.. _`VGG and ResNet classifiers`: https://github.com/Microsoft/CNTK/tree/v2.0.beta6.0/Tutorials/CNTK_201B_CIFAR-10_ImageHandsOn.ipynb
.. _`Language understanding`: https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Tutorials/CNTK_202_Language_Understanding.ipynb
.. _`Reinforcement learning basics`: https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Tutorials/CNTK_203_Reinforcement_Learning_Basics.ipynb
.. _`Sequence to sequence basics`: https://github.com/Microsoft/CNTK/blob/v2.0.beta6.0/Tutorials/CNTK_204_Sequence_To_Sequence.ipynb
#. CNTK 205: `Artistic Style Transfer`_
.. _`Logistic Regression`: https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Tutorials/CNTK_101_LogisticRegression.ipynb
.. _`Feed Forward Network`: https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Tutorials/CNTK_102_FeedForward.ipynb
.. _`MNIST data preparation`: https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Tutorials/CNTK_103A_MNIST_DataLoader.ipynb
.. _`Feed Forward classifier`: https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Tutorials/CNTK_103B_MNIST_FeedForwardNetwork.ipynb
.. _`Time Series basics`: https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Tutorials/CNTK_104_Finance_Timeseries_Basic_with_Pandas_Numpy.ipynb
.. _`CIFAR-10 Data preparation`: https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Tutorials/CNTK_201A_CIFAR-10_DataLoader.ipynb
.. _`VGG and ResNet classifiers`: https://github.com/Microsoft/CNTK/tree/v2.0.beta7.0/Tutorials/CNTK_201B_CIFAR-10_ImageHandsOn.ipynb
.. _`Language understanding`: https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/CNTK_202_Language_Understanding.ipynb
.. _`Reinforcement learning basics`: https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/CNTK_203_Reinforcement_Learning_Basics.ipynb
.. _`Sequence to sequence basics`: https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/CNTK_204_Sequence_To_Sequence.ipynb
.. _`Artistic Style Transfer`: https://github.com/Microsoft/CNTK/blob/v2.0.beta7.0/Tutorials/CNTK_205_Artistic_Style_Transfer.ipynb

Просмотреть файл

@ -159,7 +159,7 @@ else:
kwargs = dict(package_data = package_data)
setup(name="cntk",
version="2.0.beta6.0",
version="2.0.beta7.0",
url="http://cntk.ai",
ext_modules=[cntk_module],
packages=packages,