merge with master

.gitignore

@@ -194,3 +194,4 @@ Tests/UnitTests/NetworkTests/Output/
 Dependencies/CNTKCustomMKL/Publish
 Dependencies/CNTKCustomMKL/CNTKCustomMKL-Linux-*.tgz
 Dependencies/CNTKCustomMKL/CNTKCustomMKL-Windows-*.zip
+/Documentation.zip

CNTK.sln

@@ -1133,6 +1133,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{6826
 	ProjectSection(SolutionItems) = preProject
 		Scripts\pytest.ini = Scripts\pytest.ini
 		Scripts\txt2ctf.py = Scripts\txt2ctf.py
+		Scripts\uci2ctf.py = Scripts\uci2ctf.py
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedEvalTests", "Tests\UnitTests\ManagedEvalTests\ManagedEvalTests.csproj", "{CC8DDDCB-D53A-4B30-8596-AEF1C493DB31}"

Source/Readers/CNTKTextFormatReader/CNTKTextFormatReader.vcxproj

@@ -110,9 +110,6 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="uci_to_cntk_text_format_converter.py" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>

Source/Readers/CNTKTextFormatReader/CNTKTextFormatReader.vcxproj.filters

@@ -47,13 +47,5 @@
     <Filter Include="Common\Include">
       <UniqueIdentifier>{C6F55578-121A-4D7C-8F57-4172BC5C463B}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Scripts">
-      <UniqueIdentifier>{cd70d891-88aa-40a4-8e47-0e31e4cac48e}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="uci_to_cntk_text_format_converter.py">
-      <Filter>Scripts</Filter>
-    </None>
-  </ItemGroup>
-</Project>
+</Project>

Tools/make_binary_drop_linux

@@ -106,11 +106,11 @@ fi
 
 # Dependency files
 
-# ACML
-declare -a acmlFiles=("libacml_mp.so" "libiomp5.so")
+# MKL
+declare -a mklFiles=("libmkl_cntk_p.so" "libiomp5.so")
 
 # Open CV
-declare -a opencvFiles=("libopencv_core.so.3.0" "libopencv_imgproc.so.3.0" "libopencv_imgproc.so.3.0" "libopencv_imgcodecs.so.3.0")
+declare -a opencvFiles=("libopencv_core.so.3.1" "libopencv_imgproc.so.3.1" "libopencv_imgproc.so.3.1" "libopencv_imgcodecs.so.3.1")
 
 # libzip
 declare -a libzipFiles=("libzip.so")
@@ -122,8 +122,8 @@ declare -a cudaFiles=("libcudart.so.7.5" "libcublas.so.7.5" "libcurand.so.7.5" "
 declare -a cudnnFiles=("libcudnn.so.4")
 
 # Set dependency sources paths
-acmlPath="/usr/local/acml5.3.1/ifort64_mp/lib"
-opencvPath="/usr/local/opencv-3.0.0/lib"
+mklPath="/usr/local/CNTKCustomMKL/1/x64/parallel"
+opencvPath="/usr/local/opencv-3.1.0/lib"
 libzipPath="/usr/local/lib"
 cudaPath="/usr/local/cuda/lib64"
 cudnnPath="/usr/local/cudnn-4.0/cuda/lib64"
@@ -143,11 +143,21 @@ mkdir -p $baseBinariesPath
 # Copy build binaries
 echo "Copying build binaries..." >&3
 cp -r $buildPath/* $baseBinariesPath
+# Remove unnessesary file(s) if exist(s)
+rm -f $baseBinariesPath/bin/v2librarytests
+rm -f $baseBinariesPath/bin/cppevalclient
+rm -f $baseBinariesPath/lib/libcntklibrary-2.0.so
 
 # Copy Examples
 echo "Copying Examples..." >&3
 cp -r Examples $baseDropPath
 
+# Copy Scripts (Scripts folder from the root of the Repo)
+echo "Copying Scripts..." >&3
+cp -r Scripts $baseDropPath
+# Remove test related file(s) if exist(s)
+rm -f $baseDropPath/Scripts/pytest.ini
+
 # Copy Extras
 echo "Copying Extras..." >&3
 cp -r $extrasPath/* $baseDropPath
@@ -158,9 +168,9 @@ echo "Copying Dependencies..." >&3
 # Make dependencies directory
 mkdir -p $baseDependenciesPath
 
-# Copy ACML
-echo "Copying ACML..." >&3
-CopyFilesFromList $acmlPath acmlFiles[@] $baseDependenciesPath
+# Copy MKL
+echo "Copying MKL" >&3
+CopyFilesFromList $mklPath mklFiles[@] $baseDependenciesPath
 
 # Copy Open CV
 echo "Copying Open CV..." >&3

contrib/Python/cntk/examples/MNIST/mnist_one_layer.py

@@ -8,8 +8,8 @@
 MNIST Example, one hidden layer neural network using training and testing data 
 through files. To generate the data first run fetch_mnist_data.py to fetch the data.
 Train and Test files obtained need to be converted to CNTKTextFormatReader format using
-`uci_to_cntk_text_format_converter.py 
-<https://github.com/Microsoft/CNTK/blob/master/Source/Readers/CNTKTextFormatReader/uci_to_cntk_text_format_converter.py>`_
+`uci2ctf.py 
+<https://github.com/Microsoft/CNTK/blob/master/Scripts/uci2ctf.py>`_
 Rename train data to Train-28x28_text.txt and test data to Test-28x28_text.txt
 """
 

contrib/Python/cntk/reader.py

@@ -102,7 +102,7 @@ class CNTKTextFormatReader(AbstractReader):
        with a label.
 
        If your data is in matrix format (one column per feature), you can use
-       `uci_to_cntk_text_format_converter.py <https://github.com/Microsoft/CNTK/blob/master/Source/Readers/CNTKTextFormatReader/uci_to_cntk_text_format_converter.py>`_
+       `uci2ctf.py <https://github.com/Microsoft/CNTK/blob/master/Scripts/uci2ctf.py>`_
        to convert it to the CNTKTextFormatReader format.
 
     Args: