License change

KimKJ · Jan 18, 2016 · dcfc0e9 · dcfc0e9
1 parent 2f39fe3
commit dcfc0e9
Show file tree

Hide file tree

Showing 245 changed files with 640 additions and 941 deletions.
diff --git a/CNTK.sln b/CNTK.sln
@@ -46,7 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documents", "Documents", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "License", "License", "{63024704-A2D7-497E-AD4B-5C10C6AA1374}"
 	ProjectSection(SolutionItems) = preProject
-		license\MSR Computational Network Toolkit_MSR-LA (2014-03-28).md = license\MSR Computational Network Toolkit_MSR-LA (2014-03-28).md
+		LICENSE.md = LICENSE.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lyx", "lyx", "{F9BEB27E-8AF5-464E-8D45-0000D5AFA2D3}"

diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,61 @@
+# Microsoft Computational Network Toolkit (CNTK)
+
+Copyright (c) Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+## THIRD PARTY NOTICES
+
+This project is based on or incorporates material from the projects listed below (Third Party IP). The original copyright notice and the license under which Microsoft received such Third Party IP, are set forth below. Such licenses and notices are provided for informational purposes only. Where permitted, Microsoft licenses the Third Party IP to you under the licensing terms for the Microsoft product. Microsoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise.
+
+### a. BOOST C++ LIBRARIES
+
+Copyright Beman Dawes, David Abrahams, 1998-2005.  
+Copyright Rene Rivera 2004-2007.
+
+Provided for Informational Purposes Only
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+### b. ATIS DATASETS
+
+CNTK distribution contains a subset of ATIS Datasets:
+
+Hemphill, Charles, et al. ATIS0 Complete LDC93S4A. Web Download. Philadelphia: Linguistic Data Consortium, 1993.
+
+Garofolo, John, et al. ATIS2 LDC93S5. Web Download. Philadelphia: Linguistic Data Consortium, 1993.
+
+Dahl, Deborah, et al. ATIS3 Test Data LDC95S26. Web Download. Philadelphia: Linguistic Data Consortium, 1995.
+
+Dahl, Deborah, et al. ATIS3 Training Data LDC94S19. Web Download. Philadelphia: Linguistic Data Consortium, 1994.
+
+### c. TIMIT ACOUSTIC-PHONETIC CONTINUOUS SPEECH CORPUS
+
+CNTK distribution contains a subset of TIMIT Acoustic-Phonetic Continuous Speech Corpus:
+
+Garofolo, John, et al. TIMIT Acoustic-Phonetic Continuous Speech Corpus LDC93S1. Web Download. Philadelphia: Linguistic Data Consortium, 1993.
+
+### d. THE PENN TREEBANK PROJECT
+
+CNTK distribution contains a subset of the data of The Penn Treebank Project:
+
+Marcus, Mitchell, Beatrice Santorini, and Mary Ann Marcinkiewicz. Treebank-2 LDC95T7. Web Download. Philadelphia: Linguistic Data Consortium, 1995.
+
+### e. THE CMU AUDIO DATABASES
+
+CNTK distribution contains a subset of the CMU Audio Databases
+Copyright (c) 1991-2005 Carnegie Mellon University.  All rights reserved.
+
+### f. THE MNIST DATABASE OF HANDWRITTEN DIGITS
+
+CNTK distribution contains a subset of the MNIST Database of Handwritten Digits
diff --git a/License/MSR Computational Network Toolkit_MSR-LA (2014-03-28).md b/License/MSR Computational Network Toolkit_MSR-LA (2014-03-28).md
diff --git a/Source/ActionsLib/Actions.h b/Source/ActionsLib/Actions.h
@@ -1,7 +1,6 @@
 //
-// <copyright file="Actions.h" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 #pragma once
 

diff --git a/Source/ActionsLib/EsotericActions.cpp b/Source/ActionsLib/EsotericActions.cpp
@@ -1,8 +1,8 @@
-// EsotericActions.cpp -- CNTK actions that are deprecated
 //
-// <copyright file="EsotericActions.cpp" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
+//
+// EsotericActions.cpp -- CNTK actions that are deprecated
 //
 
 #define _CRT_NONSTDC_NO_DEPRECATE // make VS accept POSIX functions without _

diff --git a/Source/ActionsLib/EvalActions.cpp b/Source/ActionsLib/EvalActions.cpp
@@ -1,8 +1,8 @@
-// EvalActions.cpp -- CNTK evaluation-related actions
 //
-// <copyright file="EvalActions.cpp" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
+//
+// EvalActions.cpp -- CNTK evaluation-related actions
 //
 
 #define _CRT_NONSTDC_NO_DEPRECATE // make VS accept POSIX functions without _

diff --git a/Source/ActionsLib/OtherActions.cpp b/Source/ActionsLib/OtherActions.cpp
@@ -1,8 +1,8 @@
-// OtherActions.cpp -- more CNTK actions
 //
-// <copyright file="OtherActions.cpp" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
+//
+// OtherActions.cpp -- more CNTK actions
 //
 
 #define _CRT_NONSTDC_NO_DEPRECATE // make VS accept POSIX functions without _

diff --git a/Source/ActionsLib/TrainActions.cpp b/Source/ActionsLib/TrainActions.cpp
@@ -1,8 +1,8 @@
-// TrainActions.cpp -- CNTK training-related actions
 //
-// <copyright file="TrainActions.cpp" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
+//
+// TrainActions.cpp -- CNTK training-related actions
 //
 
 #define _CRT_NONSTDC_NO_DEPRECATE // make VS accept POSIX functions without _

diff --git a/Source/CNTK/CNTK.cpp b/Source/CNTK/CNTK.cpp
@@ -1,8 +1,8 @@
-// CNTK.cpp : Defines the entry point for the console application.
 //
-// <copyright file="CNTK.cpp" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
+//
+// CNTK.cpp : Defines the entry point for the console application.
 //
 
 #define _CRT_NONSTDC_NO_DEPRECATE // make VS accept POSIX functions without _

diff --git a/Source/CNTK/IExecutionEngine.h b/Source/CNTK/IExecutionEngine.h
@@ -1,7 +1,6 @@
 //
-// <copyright file="IExecutionEngine.h" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 #pragma once
 

diff --git a/Source/CNTK/ModelEditLanguage.cpp b/Source/CNTK/ModelEditLanguage.cpp
@@ -1,7 +1,6 @@
 //
-// <copyright file="ModelEditLanguage.cpp" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 // NetworkDescriptionLanguage.cpp : Code used to interpret the Network Description Language.
 //

diff --git a/Source/CNTK/ModelEditLanguage.h b/Source/CNTK/ModelEditLanguage.h
@@ -1,7 +1,6 @@
 //
-// <copyright file="ModelEditLanguage.h" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 #pragma once
 

diff --git a/Source/CNTK/NDLNetworkBuilder.h b/Source/CNTK/NDLNetworkBuilder.h
@@ -1,7 +1,6 @@
 //
-// <copyright file="NDLNetworkBuilder.h" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 #pragma once
 #include "NetworkDescriptionLanguage.h"

diff --git a/Source/CNTK/NDLUtil.h b/Source/CNTK/NDLUtil.h
@@ -1,7 +1,6 @@
 //
-// <copyright file="NDLUtil.h" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 
 #pragma once

diff --git a/Source/CNTK/NetworkDescriptionLanguage.cpp b/Source/CNTK/NetworkDescriptionLanguage.cpp
@@ -1,7 +1,6 @@
 //
-// <copyright file="NetworkDescriptionLanguage.cpp" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 // NetworkDescriptionLanguage.cpp : Code used to interpret the Network Description Language.
 //

diff --git a/Source/CNTK/NetworkDescriptionLanguage.h b/Source/CNTK/NetworkDescriptionLanguage.h
@@ -1,7 +1,6 @@
 //
-// <copyright file="NetworkDescriptionLanguage.h" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 #pragma once
 

diff --git a/Source/CNTK/SimpleNetworkBuilder.cpp b/Source/CNTK/SimpleNetworkBuilder.cpp
@@ -1,7 +1,6 @@
 //
-// <copyright file="SimpleNetworkBuilder.cpp" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 
 #define _CRT_SECURE_NO_WARNINGS // "secure" CRT not available on all platforms  --add this at the top of all CPP files that give "function or variable may be unsafe" warnings

diff --git a/Source/CNTK/SimpleNetworkBuilder.h b/Source/CNTK/SimpleNetworkBuilder.h
@@ -1,7 +1,6 @@
 //
-// <copyright file="SimpleNetworkBuilder.h" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
 #pragma once
 

diff --git a/Source/CNTK/SynchronousExecutionEngine.cpp b/Source/CNTK/SynchronousExecutionEngine.cpp
@@ -1,10 +1,9 @@
 //
-// <copyright file="SynchronousExecutionEngine.cpp" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-// </copyright>
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 //
-
 // Note: Despite its name, this file is really about parsing NDL into an actual ComputationNetwork.
+//
 
 #define _CRT_SECURE_NO_WARNINGS // "secure" CRT not available on all platforms  --add this at the top of all CPP files that give "function or variable may be unsafe" warnings