https://github.com/Microsoft/CNTK
Revision fbbbaa92f698d9cea65119c0ec61a922729fb0b6 authored by Manik Jindal on 01 February 2018, 05:35:22 UTC, committed by Manik Jindal on 01 February 2018, 05:38:52 UTC
Squashed commit of the following: commit 82e025bbe319008c535741a9fc78367032cc3be0 Merge: 0702c09c3 ed5451c83 Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 21:23:23 2018 -0800 Merge branch 'release/2.4' into manikj/merge-release-2.4 commit 0702c09c3c3cc1ae1e4cba28df3ce64f091a8c3e Merge: 32f6844ca 1afe40461 Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 21:23:11 2018 -0800 Merge branch 'release/2.4' (early part) into manikj/merge-release-2.4 commit 32f6844ca84797db2dac8959eeb72576692986d0 Merge: 42a47a326 1f15d4649 Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 21:21:55 2018 -0800 Merge branch 'release/2.4' (early part) into manikj/merge-release-2.4 commit ed5451c83416c5084dedf1a684f03653fe5863ee Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 19:32:04 2018 -0800 MakeBinaryDrop: Fix lib names commit c528a56d4a1fa12f967e4bbab022a0d06b5704ea Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 12:35:40 2018 -0800 Update README.md commit 490a58e4a9cf01d9114373b9444f0fbaf055581b Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 12:08:57 2018 -0800 Add Halide to Release notes commit 2196299a71325b0959dc626ce548035db0634e58 Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 11:48:45 2018 -0800 MakeBinaryDrop: Change Cuda libs to 9.0 commit 3df48ddd3ac38c24c5aa25bdb9b77d98116a3d8d Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 06:06:29 2018 -0800 Add release notes commit 1afe404611f1f9a7cde0f43923382101cf15b823 Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 06:05:05 2018 -0800 Replace 2.4+ with 2.4 commit 1f15d464960956a8192f137ebedf2753a36d83cc Author: Manik Jindal <manikj@microsoft.com> Date: Wed Jan 31 06:04:24 2018 -0800 Bump version to 2.4
1 parent 42a47a3
Tip revision: fbbbaa92f698d9cea65119c0ec61a922729fb0b6 authored by Manik Jindal on 01 February 2018, 05:35:22 UTC
Merge release/2.4
Merge release/2.4
Tip revision: fbbbaa9
CppCntk.vssettings
<UserSettings>
<ApplicationIdentity version="12.0"/>
<ToolsOptions>
<ToolsOptionsCategory name="TextEditor" RegisteredName="TextEditor">
<ToolsOptionsSubCategory name="C/C++" RegisteredName="C/C++" PackageName="Text Management Package">
<PropertyValue name="TabSize">4</PropertyValue>
<PropertyValue name="ShowChanges">true</PropertyValue>
<PropertyValue name="AutoListMembers">true</PropertyValue>
<PropertyValue name="ShowPreview">true</PropertyValue>
<PropertyValue name="ShowMarks">true</PropertyValue>
<PropertyValue name="IndentStyle">2</PropertyValue>
<PropertyValue name="ShowCaretPosition">true</PropertyValue>
<PropertyValue name="HideAdvancedMembers">true</PropertyValue>
<PropertyValue name="ShowNavigationBar">true</PropertyValue>
<PropertyValue name="UseMapMode">false</PropertyValue>
<PropertyValue name="VirtualSpace">false</PropertyValue>
<PropertyValue name="ShowAnnotations">true</PropertyValue>
<PropertyValue name="ShowVerticalScrollBar">true</PropertyValue>
<PropertyValue name="InsertTabs">false</PropertyValue>
<PropertyValue name="WordWrapGlyphs">true</PropertyValue>
<PropertyValue name="EnableLeftClickForURLs">false</PropertyValue>
<PropertyValue name="ShowErrors">true</PropertyValue>
<PropertyValue name="OverviewWidth">58</PropertyValue>
<PropertyValue name="ShowLineNumbers">false</PropertyValue>
<PropertyValue name="WordWrap">false</PropertyValue>
<PropertyValue name="IndentSize">4</PropertyValue>
<PropertyValue name="BraceCompletion">true</PropertyValue>
<PropertyValue name="ShowHorizontalScrollBar">true</PropertyValue>
<PropertyValue name="CutCopyBlankLines">true</PropertyValue>
<PropertyValue name="AutoListParams">true</PropertyValue>
</ToolsOptionsSubCategory>
<ToolsOptionsSubCategory name="C/C++ Specific" RegisteredName="C/C++ Specific" PackageName="Visual C++ Language Manager Package">
<PropertyValue name="SpaceAroundBinaryOperator">2</PropertyValue>
<PropertyValue name="SpaceAfterSemicolon">true</PropertyValue>
<PropertyValue name="NewlineFunctionBrace">0</PropertyValue>
<PropertyValue name="IndentBlockContents">true</PropertyValue>
<PropertyValue name="DisableAggressiveMemberList">false</PropertyValue>
<PropertyValue name="MaximumCachedTranslationUnits">15</PropertyValue>
<PropertyValue name="SpaceBeforeInitListBrace">false</PropertyValue>
<PropertyValue name="SpaceWithinCastParentheses">false</PropertyValue>
<PropertyValue name="NewlineInitListBrace">0</PropertyValue>
<PropertyValue name="IndentCaseContents">true</PropertyValue>
<PropertyValue name="RecreateDatabase">false</PropertyValue>
<PropertyValue name="SpaceAroundConditionalOperator">2</PropertyValue>
<PropertyValue name="SpaceWithinInitListBraces">false</PropertyValue>
<PropertyValue name="SpaceBeforeLambdaParenthesis">false</PropertyValue>
<PropertyValue name="NewlineEmptyFunctionCloseBrace">false</PropertyValue>
<PropertyValue name="DisablePreLoadNavigateToCache">false</PropertyValue>
<PropertyValue name="EnterOutliningModeWhenFilesOpen">true</PropertyValue>
<PropertyValue name="PreserveBlock">0</PropertyValue>
<PropertyValue name="SpaceBeforeConstructorColon">true</PropertyValue>
<PropertyValue name="NewlineKeywordWhile">true</PropertyValue>
<PropertyValue name="NewlineLambdaBrace">0</PropertyValue>
<PropertyValue name="DisableSharedIntelliSense">false</PropertyValue>
<PropertyValue name="AddSemicolonForClassTypes">true</PropertyValue>
<PropertyValue name="MemberListCommitCharacters">{}[]().,:;+-*/%&|^!=<>?@#\</PropertyValue>
<PropertyValue name="DisableReferenceHighlighting">false</PropertyValue>
<PropertyValue name="DoNotWarnIfFallbackLocationUsed">false</PropertyValue>
<PropertyValue name="DisableDatabaseImplicitAutoCleanup">false</PropertyValue>
<PropertyValue name="SpaceBeforeFunctionParenthesis">false</PropertyValue>
<PropertyValue name="NewlineNamespaceBrace">1</PropertyValue>
<PropertyValue name="AutoFormatOnSemicolon">true</PropertyValue>
<PropertyValue name="AutoTuneMaximumCachedTranslationUnits">true</PropertyValue>
<PropertyValue name="UseForwardSlashForIncludeAutoComplete">false</PropertyValue>
<PropertyValue name="DisableInactiveCodeOpacity">false</PropertyValue>
<PropertyValue name="HighlightMatchingTokens">true</PropertyValue>
<PropertyValue name="DisableDatabaseUpdates">false</PropertyValue>
<PropertyValue name="DisableIntelliSenseUpdating">false</PropertyValue>
<PropertyValue name="NewlineControlBlockBrace">0</PropertyValue>
<PropertyValue name="IndentNamespaceContents">false</PropertyValue>
<PropertyValue name="CompleteSlashStar">true</PropertyValue>
<PropertyValue name="FallbackLocation"/>
<PropertyValue name="DisableErrorReporting">false</PropertyValue>
<PropertyValue name="SpaceBeforeComma">false</PropertyValue>
<PropertyValue name="IndentAccessSpecifiers">false</PropertyValue>
<PropertyValue name="DisableBrowsingUpToDateCheck">true</PropertyValue>
<PropertyValue name="DisableDatabaseImplicitFiles">false</PropertyValue>
<PropertyValue name="SpaceAroundAssignmentOperator">2</PropertyValue>
<PropertyValue name="SmartMemberListCommitOnEnter">false</PropertyValue>
<PropertyValue name="DisableReferencesResolving">false</PropertyValue>
<PropertyValue name="DisableExternalDependenciesFolders">false</PropertyValue>
<PropertyValue name="DisableIntelliSense">false</PropertyValue>
<PropertyValue name="RemoveSpaceBeforeSemicolon">true</PropertyValue>
<PropertyValue name="SpaceBetweenEmptyLambdaBrackets">false</PropertyValue>
<PropertyValue name="SpaceBeforeControlBlockParenthesis">true</PropertyValue>
<PropertyValue name="SpaceBetweenEmptyFunctionParentheses">false</PropertyValue>
<PropertyValue name="PreserveParameterIndentation">false</PropertyValue>
<PropertyValue name="MemberListFilterInaccessible">true</PropertyValue>
<PropertyValue name="AutomaticOutliningOfStatementBlocks">false</PropertyValue>
<PropertyValue name="SpaceBeforeEmptyBracket">false</PropertyValue>
<PropertyValue name="SpaceWithinExpressionParentheses">false</PropertyValue>
<PropertyValue name="AutoFormatOnPaste">true</PropertyValue>
<PropertyValue name="LoggingLevel">5</PropertyValue>
<PropertyValue name="TrimSpaceUnaryOperator">true</PropertyValue>
<PropertyValue name="TrimSpaceAroundScope">true</PropertyValue>
<PropertyValue name="GroupBrackets">true</PropertyValue>
<PropertyValue name="SpaceBetweenEmptyBrackets">false</PropertyValue>
<PropertyValue name="SpaceWithinControlBlockParentheses">false</PropertyValue>
<PropertyValue name="NewlineTypeBrace">0</PropertyValue>
<PropertyValue name="MemberListFilterMode">3</PropertyValue>
<PropertyValue name="ColorizeInactiveBlocksDifferently">true</PropertyValue>
<PropertyValue name="SpaceAfterCastParenthesis">false</PropertyValue>
<PropertyValue name="RescanSolutionInterval">60</PropertyValue>
<PropertyValue name="AlwaysUseFallbackLocation">false</PropertyValue>
<PropertyValue name="DisableDatabaseAutoUpdates">false</PropertyValue>
<PropertyValue name="DisableSquiggles">false</PropertyValue>
<PropertyValue name="EnableQuickInfoToolTips">true</PropertyValue>
<PropertyValue name="IndentCaseBraces">false</PropertyValue>
<PropertyValue name="AlignParameters">true</PropertyValue>
<PropertyValue name="AutoFormatOnBraceCompletion">true</PropertyValue>
<PropertyValue name="AutoFormatOnClosingBrace">true</PropertyValue>
<PropertyValue name="CompleteParensInRawString">true</PropertyValue>
<PropertyValue name="DisableSemanticColoring">false</PropertyValue>
<PropertyValue name="InactiveCodeOpacityPercent">55</PropertyValue>
<PropertyValue name="IndentBraces">false</PropertyValue>
<PropertyValue name="SpaceBeforeInheritanceColon">true</PropertyValue>
<PropertyValue name="NewlineKeywordCatch">true</PropertyValue>
<PropertyValue name="NewlineKeywordElse">true</PropertyValue>
<PropertyValue name="IndentCaseLabels">false</PropertyValue>
<PropertyValue name="HideUnconfirmedReferencesResults">false</PropertyValue>
<PropertyValue name="AutoIndentOnTab">false</PropertyValue>
<PropertyValue name="SpaceWithinLambdaBrackets">false</PropertyValue>
<PropertyValue name="SpaceWithinBrackets">false</PropertyValue>
<PropertyValue name="DisableMemberListKeywords">false</PropertyValue>
<PropertyValue name="EnumerateCommentTasks">true</PropertyValue>
<PropertyValue name="AutomaticOutliningOfPragmaRegions">true</PropertyValue>
<PropertyValue name="SpaceAfterComma">true</PropertyValue>
<PropertyValue name="SpaceBetweenEmptyBraces">false</PropertyValue>
<PropertyValue name="IndentGotoLabels">1</PropertyValue>
<PropertyValue name="MemberListCommitAggressive">false</PropertyValue>
<PropertyValue name="DisableMemberListExpansions">false</PropertyValue>
<PropertyValue name="LoggingFilter">0</PropertyValue>
<PropertyValue name="RescanSolution">false</PropertyValue>
<PropertyValue name="DisableDatabase">false</PropertyValue>
<PropertyValue name="SpaceBeforeBracket">false</PropertyValue>
<PropertyValue name="SpaceWithinFunctionParentheses">false</PropertyValue>
<PropertyValue name="NewlineEmptyTypeCloseBrace">false</PropertyValue>
<PropertyValue name="DisableIncludeAutoComplete">false</PropertyValue>
<PropertyValue name="EnableLogging">false</PropertyValue>
</ToolsOptionsSubCategory>
</ToolsOptionsCategory>
</ToolsOptions>
</UserSettings>
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...