move install files into new install subdirectory beneath the script directory, remove obsolete files, update readme in script directory

Scripts/README.md

@@ -1,30 +1,40 @@
-This directory contains different scripts for using CNTK.
+This directory contains different scripts to support CNTK.
 
-### CNTK Binary Installers
+## CNTK Binary Installers
 
-* `windows/install.ps1`: installation script for installing a Windows CNTK *binary* drop, cf. [here](https://github.com/Microsoft/CNTK/wiki/Automated-binary-install#installation-steps-for-windows).
-* `linux/install-cntk.sh`: installation script for installing a Linux CNTK *binary* drop, cf. [here](https://github.com/Microsoft/CNTK/wiki/Automated-binary-install#installation-steps-for-linux).
+The directory `install` contains scripts which are used in the CNTK binary download to install 
+CNTK on a users system. They are not intended to run from this location in the repository.
 
+* `install/windows` - A script for installing a Windows CNTK *binary* drop, cf. [here](https://github.com/Microsoft/CNTK/wiki/Setup-Windows-Binary-Script).
+* `install/linux` - A script for installing a Linux CNTK *binary* drop, cf. [here](https://github.com/Microsoft/CNTK/wiki/Setup-Linux-Binary-Script).
 
-### CNTK Text format Converters
-Two Python Scripts for converting Data to CNTK Text format for using as an input for CNTK Text Format Reader (see https://github.com/microsoft/CNTK/wiki/CNTKTextFormat-Reader).
-```
-txt2ctf.py 
-```
-Converts a set of dictionary files and a plain text file to CNTK Text format. Run ```python txt2ctf.py -h``` to see usage instructions. See the comments in the beginning of the script file for the specific usage example. 
+## CNTK Text format Converters
 
-```
-uci2ctf.py
-```
-Converts data stored in a text file in UCI format to CNTK Text format. Run ```python uci2ctf.py -h``` to see usage instructions and example. Also see a usage example below:
+Two Python Scripts for converting Data to CNTK Text format for using as an input for CNTK Text Format 
+Reader (see https://github.com/microsoft/CNTK/wiki/CNTKTextFormat-Reader).
+
+### Convert Dictionary to Text
+
+`txt2ctf.py` converts a set of dictionary files and a plain text file to CNTK Text format.
+
+Run `python txt2ctf.py -h` to see usage instructions. See the comments in the beginning of the script 
+file for the specific usage example. 
+
+### Convert UCI Format to Text
+
+`uci2ctf.py` converts data stored in a text file in UCI format to CNTK Text format. 
+
+Run `python uci2ctf.py -h` to see usage instructions and example. 
+
+For Example:
 ```
 python Scripts/uci2ctf.py --input_file Examples/Image/MNIST/Data/Train-28x28.txt --features_start 1 --features_dim 784 --labels_start 0 --labels_dim 1 --num_labels 10  --output_file Examples/Image/MNIST/Data/Train-28x28_cntk_text.txt
 ```
-```input_file``` – original dataset in the (columnar) UCI format
-```features_start``` – index of the first feature column (start parameter in the UCIFastReader config, see https://github.com/Microsoft/CNTK/wiki/UCI-Fast-Reader)
-```features_dim``` – number of feature columns (dim parameter in the UCIFastReader config)
-```labels_start``` - index of the first label column
-```labels_dim``` – number of label columns
-```num_labels``` – number of possible label values (labelDim parameter in the UCIFastReader config)
-```output_file``` – path and filename of the resulting dataset.
+- `input_file` – original dataset in the (columnar) UCI format
+- `features_start` – index of the first feature column (start parameter in the UCIFastReader config, see [here](https://github.com/Microsoft/CNTK/wiki/UCI-Fast-Reader)
+- `features_dim` – number of feature columns (dim parameter in the UCIFastReader config)
+- `labels_start` - index of the first label column
+- `labels_dim` – number of label columns
+- `num_labels` – number of possible label values (labelDim parameter in the UCIFastReader config)
+- `output_file` – path and filename of the resulting dataset.
 

Scripts/install/linux/install-cntk.sh

@@ -13,7 +13,7 @@ set -x -e -o pipefail
 SCRIPT_DIR="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"
 
 # Go to the drop root
-cd "$SCRIPT_DIR/../.."
+cd "$SCRIPT_DIR/../../.."
 
 CNTK_BIN_PATH="$PWD/cntk/bin"
 CNTK_LIB_PATH="$PWD/cntk/lib"

Scripts/install/windows/install.ps1

@@ -51,7 +51,7 @@ Param(
 
 $MyDir = Split-Path $MyInvocation.MyCommand.Definition
 
-$cntkRootDir = split-path $MyDir | split-path
+$cntkRootDir = split-path $MyDir | split-path | Split-Path
 
 $roboCopyCmd    = "C:\Windows\System32\robocopy.exe"
 $localCache     = "$MyDir\InstallCache"

Tools/docker/CNTK-CPUOnly-Image/Dockerfile

@@ -138,7 +138,7 @@ RUN wget -q https://repo.continuum.io/archive/Anaconda3-4.2.0-Linux-x86_64.sh &&
     bash Anaconda3-4.2.0-Linux-x86_64.sh -b && \
     rm Anaconda3-4.2.0-Linux-x86_64.sh
 
-RUN wget -q https://raw.githubusercontent.com/Microsoft/CNTK/master/Scripts/linux/conda-linux-cntk-py34-environment.yml -O /tmp/conda-linux-cntk-py34-environment.yml && \
+RUN wget -q https://raw.githubusercontent.com/Microsoft/CNTK/master/Scripts/install/linux/conda-linux-cntk-py34-environment.yml -O /tmp/conda-linux-cntk-py34-environment.yml && \
     /root/anaconda3/bin/conda env create -p /root/anaconda3/envs/cntk-py34/ --file /tmp/conda-linux-cntk-py34-environment.yml
 
 ENV PATH /root/anaconda3/envs/cntk-py34/bin:$PATH

Tools/docker/CNTK-GPU-1bit-Image/Dockerfile

@@ -158,7 +158,7 @@ RUN wget -q https://repo.continuum.io/archive/Anaconda3-4.2.0-Linux-x86_64.sh &&
     bash Anaconda3-4.2.0-Linux-x86_64.sh -b && \
     rm Anaconda3-4.2.0-Linux-x86_64.sh
 
-RUN wget -q https://raw.githubusercontent.com/Microsoft/CNTK/master/Scripts/linux/conda-linux-cntk-py34-environment.yml -O /tmp/conda-linux-cntk-py34-environment.yml && \
+RUN wget -q https://raw.githubusercontent.com/Microsoft/CNTK/master/Scripts/install/linux/conda-linux-cntk-py34-environment.yml -O /tmp/conda-linux-cntk-py34-environment.yml && \
     /root/anaconda3/bin/conda env create -p /root/anaconda3/envs/cntk-py34/ --file /tmp/conda-linux-cntk-py34-environment.yml
 
 ENV PATH /root/anaconda3/envs/cntk-py34/bin:$PATH

Tools/docker/CNTK-GPU-Image/Dockerfile

@@ -139,7 +139,7 @@ RUN wget -q https://repo.continuum.io/archive/Anaconda3-4.2.0-Linux-x86_64.sh &&
     bash Anaconda3-4.2.0-Linux-x86_64.sh -b && \
     rm Anaconda3-4.2.0-Linux-x86_64.sh
 
-RUN wget -q https://raw.githubusercontent.com/Microsoft/CNTK/master/Scripts/linux/conda-linux-cntk-py34-environment.yml -O /tmp/conda-linux-cntk-py34-environment.yml && \
+RUN wget -q https://raw.githubusercontent.com/Microsoft/CNTK/master/Scripts/install/linux/conda-linux-cntk-py34-environment.yml -O /tmp/conda-linux-cntk-py34-environment.yml && \
     /root/anaconda3/bin/conda env create -p /root/anaconda3/envs/cntk-py34/ --file /tmp/conda-linux-cntk-py34-environment.yml
 
 ENV PATH /root/anaconda3/envs/cntk-py34/bin:$PATH