Skip to content

Commit

Permalink
addressed CR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfma61 committed Jun 7, 2017
1 parent 5ecc834 commit 2582b9e
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 12 deletions.
5 changes: 3 additions & 2 deletions Examples/Evaluation/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#EvalClients

The folder contains some examples using the CNTK to evalaute a trained model in your application. Please note that Visual Studio 2015 update 3 is required, and only the 64-bit target is supported.
The folder contains some examples using the CNTK to evaluate a trained model in your application. Please note that Visual Studio 2015 update 3 is required, and only the 64-bit target is supported.

The [CNTK Eval Examples](https://docs.microsoft.com/en-us/cognitive-toolkit/CNTK-Eval-Examples) page provides more details of these examples.

Expand All @@ -10,7 +10,8 @@ The CNTKLibraryEvalExamples.sln contains code samples demonstrating how to use t

* CNTKLibraryCSEvalCPUOnlyExamples uses the CNTK Library CPU-Only Nuget package to evaluate models on CPU-only devices in C#.
* CNTKLibraryCSEvalGPUExamples uses the CNTK Library GPU Nuget package to evaluate models on GPU devices in C#.
* CNTKLibraryCPPEvalCPUOnlyExamples uses the CNTK Library C++ API to evaluate models on CPU-only devices. It uses the CNTK Library CPU-Only Nuget package.*- CNTKLibraryCPPEvalGPUExamples uses the CNTK Library C++ API to evaluate models on GPU devices. It uses the CNTK Library GPU Nuget package.
* CNTKLibraryCPPEvalCPUOnlyExamples uses the CNTK Library C++ API to evaluate models on CPU-only devices. It uses the CNTK Library CPU-Only Nuget package.
* CNTKLibraryCPPEvalGPUExamples uses the CNTK Library C++ API to evaluate models on GPU devices. It uses the CNTK Library GPU Nuget package.

After a successful build, the executable is saved under the $(SolutionDir)..\..$(Platform)$(ProjectName).$(Configuration)\ folder, e.g. ..\..\X64\CNTKLibraryCSEvalCPUOnlyExamples.Release\CNTKLibraryCSEvalCPUOnlyExamples.exe.
On Linux, only C++ is supported. Please refer to Makefile for building samples. The target name CNTKLIBRARY_CPP_EVAL_EXAMPLES is used to build CNTKLibraryCPPEvalExamples.
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ endif
ifneq ("$(wildcard $(BUILD_TOP)/Config.make)","")
include $(BUILD_TOP)/Config.make
else
$(error Cannot find $(BUILD_TOP)/Config.make. Please see the CNTK documentation at https://docs.microsoft.com/en-us/cognitive-toolkit for configuration instructions.)
$(error Cannot find $(BUILD_TOP)/Config.make. Please see the CNTK documentation at https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Linux for configuration instructions.)
endif

ifndef BUILDTYPE
Expand Down Expand Up @@ -993,7 +993,7 @@ endif
ifeq ("$(CNTK_ENABLE_ASGD)","true")
ifeq (,$(wildcard Source/Multiverso/include/multiverso/*.h))
$(error Build with Multiverso was requested but cannot find the code. Please check https://docs.microsoft.com/en-us/cognitive-toolkit/Multiple-GPUs-and-machines#24-data-parallel-asgd to learn more.)
$(error Build with Multiverso was requested but cannot find the code. Please check https://docs.microsoft.com/en-us/cognitive-toolkit/Multiple-GPUs-and-machines#8-data-parallel-training-with-parameter-server to learn more.)
endif
lMULTIVERSO:=-lmultiverso
Expand Down
2 changes: 1 addition & 1 deletion Scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ 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 xamples/Image/MNIST/Data/Train-28x28_cntk_text.txt
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
Expand Down
2 changes: 1 addition & 1 deletion Source/Readers/UCIFastReader/UCIFastReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class UCIFastReader : public DataReaderBase
fprintf(stderr, "********** DEPRECATED **********\n"
"UCIFastReader is no longer actively maintained.\n"
"It is known to have defects, proceed with caution (better yet, switch to CNTKTextFormatReader)!\n"
"For more details please see https://docs.microsoft.com/en-us/cognitive-toolkit \n");
"For more details please see https://docs.microsoft.com/en-us/cognitive-toolkit/Brainscript-CNTKTextFormat-Reader \n");

m_pMBLayout = make_shared<MBLayout>();
m_pMBLayout->SetUniqueAxisName(L"UCIFastReader");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="Build" Condition="$(HasSwig)" DependsOnTargets="$(BuildDependsOn)" />
<Target Name="CheckDependencies">
<Warning Condition="!$(HasSwig)" Text="The project requires SWIG to be installed. Please see https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Windows#SWIG for installation instructions." />
<Warning Condition="!$(HasSwig)" Text="The project requires SWIG to be installed. Please see https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Windows#swig for installation instructions." />
<Error Condition="'$(CntkCsAssemblyVersion)' != '$(CntkComponentVersion)'" Text="The CntkCsAssemblyVersion in this project must be the same as the CntkComponentVersion in CNTK.Common.props." />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion Tutorials/CNTK_102_FeedForward.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@
"\n",
"[softmax function]: https://www.cntk.ai/pythondocs/cntk.ops.html#cntk.ops.softmax\n",
"\n",
"[found here]: https://docs.microsoft.com/en-us/cognitive-toolkit/Activation-Functions"
"[found here]: https://docs.microsoft.com/en-us/cognitive-toolkit/Brainscript-Activation-Functions"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion Tutorials/SLUHandsOn/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ This hands-on lab shows how to implement a recurrent network to process text, fo

## Tutorial

Please find a detailed tutorial that uses the data and configurations in this folder on out website at https://docs.microsoft.com/en-us/cognitive-toolkit/Hands-On-Labs-Language-Understanding.
Please find a detailed tutorial that uses the data and configurations in this folder on our website at https://docs.microsoft.com/en-us/cognitive-toolkit/Hands-On-Labs-Language-Understanding.

Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="Build" Condition="$(HasSwig)" DependsOnTargets="$(BuildDependsOn)" />
<Target Name="CheckDependencies">
<Warning Condition="!$(HasSwig)" Text="The project requires SWIG to be installed. Please see https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Windows#SWIG for installation instructions." />
<Warning Condition="!$(HasSwig)" Text="The project requires SWIG to be installed. Please see https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Windows#swig for installation instructions." />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 1 addition & 1 deletion bindings/csharp/Swig/CNTKLibraryCSBinding.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<None Include="std_unordered_map.i" />
</ItemGroup>
<Target Name="CheckDependencies">
<Warning Condition="!$(HasSwig)" Text="The project requires SWIG to be installed. Please see https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Windows#SWIG for installation instructions." />
<Warning Condition="!$(HasSwig)" Text="The project requires SWIG to be installed. Please see https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Windows#swig for installation instructions." />
</Target>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="Build" Condition="$(HasSwig)" Outputs="$(TargetPath)" DependsOnTargets="$(BuildDependsOn)" />
Expand Down
2 changes: 1 addition & 1 deletion bindings/java/Swig/CNTKLibraryJavaBinding.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<None Include="std_unordered_map.i" />
</ItemGroup>
<Target Name="CheckDependencies">
<Warning Condition="!$(HasSwig)" Text="The project requires SWIG to be installed. Please see https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Windows#SWIG for installation instructions." />
<Warning Condition="!$(HasSwig)" Text="The project requires SWIG to be installed. Please see https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Windows#swig for installation instructions." />
<Warning Condition="!$(HasJava)" Text="The project requires the Java JDK to be installed. Please see https://docs.microsoft.com/en-us/cognitive-toolkit/Setup-CNTK-on-Windows#optional-java for installation instructions." />
</Target>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down

0 comments on commit 2582b9e

Please sign in to comment.