microsoft
/
CNTK
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixed up where some header files showed up in the CNTK Project after the directory move

This commit is contained in:
Frank Seide 2015-12-16 13:59:18 -08:00
Родитель eb14fb767d
Коммит 583f10e4f1
2 изменённых файлов: 57 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

77
Source/CNTK/CNTK.vcxproj.filters
Просмотреть файл

@ -139,30 +139,66 @@
<ClInclude Include="..\Common\Include\ProgressTracing.h">
<Filter>Common\Include</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\CompositeComputationNodes.h" />
<ClInclude Include="..\ComputationNetworkLib\MatrixPool.h" />
<ClInclude Include="..\SGDLib\DataReaderHelpers.h" />
<ClInclude Include="..\SGDLib\IComputationNetBuilder.h" />
<ClInclude Include="..\SGDLib\MultiNetworksSGD.h" />
<ClInclude Include="..\SGDLib\SGD.h" />
<ClInclude Include="..\SGDLib\SimpleEvaluator.h" />
<ClInclude Include="..\SGDLib\SimpleOutputWriter.h" />
<ClInclude Include="..\ComputationNetworkLib\ComputationNetwork.h" />
<ClInclude Include="..\ComputationNetworkLib\ComputationNetworkBuilder.h" />
<ClInclude Include="..\ComputationNetworkLib\ComputationNode.h" />
<ClInclude Include="..\ComputationNetworkLib\ConvolutionalNodes.h" />
<ClInclude Include="..\ComputationNetworkLib\EvaluationCriterionNodes.h" />
<ClInclude Include="..\ComputationNetworkLib\InputAndParamNodes.h" />
<ClInclude Include="..\ComputationNetworkLib\LinearAlgebraNodes.h" />
<ClInclude Include="..\ComputationNetworkLib\NonlinearityNodes.h" />
<ClInclude Include="..\ComputationNetworkLib\RecurrentNodes.h" />
<ClInclude Include="..\ComputationNetworkLib\TrainingCriterionNodes.h" />
<ClInclude Include="BrainScript\BrainScriptEvaluator.h">
<Filter>BrainScript</Filter>
</ClInclude>
<ClInclude Include="BrainScript\BrainScriptParser.h">
<Filter>BrainScript</Filter>
</ClInclude>
<ClInclude Include="..\SGDLib\SimpleOutputWriter.h">
<Filter>from SGDLib\SGD</Filter>
</ClInclude>
<ClInclude Include="..\SGDLib\SGD.h">
<Filter>from SGDLib\SGD</Filter>
</ClInclude>
<ClInclude Include="..\SGDLib\SimpleEvaluator.h">
<Filter>from SGDLib\SGD</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\MatrixPool.h">
<Filter>from ComputationNetworkLib\Network</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\CompositeComputationNodes.h">
<Filter>from ComputationNetworkLib\Nodes</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\ComputationNode.h">
<Filter>from ComputationNetworkLib\Nodes</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\ConvolutionalNodes.h">
<Filter>from ComputationNetworkLib\Nodes</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\ComputationNetwork.h">
<Filter>from ComputationNetworkLib\Network</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\ComputationNetworkBuilder.h">
<Filter>from ComputationNetworkLib\Network</Filter>
</ClInclude>
<ClInclude Include="..\SGDLib\DataReaderHelpers.h">
<Filter>from ComputationNetworkLib\Network</Filter>
</ClInclude>
<ClInclude Include="..\SGDLib\IComputationNetBuilder.h">
<Filter>from ComputationNetworkLib\Network</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\EvaluationCriterionNodes.h">
<Filter>from ComputationNetworkLib\Nodes</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\InputAndParamNodes.h">
<Filter>from ComputationNetworkLib\Nodes</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\LinearAlgebraNodes.h">
<Filter>from ComputationNetworkLib\Nodes</Filter>
</ClInclude>
<ClInclude Include="..\SGDLib\MultiNetworksSGD.h">
<Filter>from ComputationNetworkLib\Network</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\NonlinearityNodes.h">
<Filter>from ComputationNetworkLib\Nodes</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\RecurrentNodes.h">
<Filter>from ComputationNetworkLib\Nodes</Filter>
</ClInclude>
<ClInclude Include="..\ComputationNetworkLib\TrainingCriterionNodes.h">
<Filter>from ComputationNetworkLib\Nodes</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="modelEditor.txt">
@ -203,9 +239,6 @@
<Filter Include="from SGDLib">
<UniqueIdentifier>{d3d5900a-8c5e-45f1-a2b7-f82f0e31994d}</UniqueIdentifier>
</Filter>
<Filter Include="from SGDLib\SGD Parallelization">
<UniqueIdentifier>{8531d7fb-a673-491a-988a-012c92fafbfd}</UniqueIdentifier>
</Filter>
<Filter Include="from SGDLib\SGD">
<UniqueIdentifier>{4f06ac18-7b30-490c-b801-128bdaa99450}</UniqueIdentifier>
</Filter>
@ -236,4 +269,4 @@
<Filter>BrainScript\Doc</Filter>
</None>
</ItemGroup>
</Project>
</Project>

4
Source/Math/TensorView.h
Просмотреть файл

@ -51,12 +51,12 @@ namespace Microsoft { namespace MSR { namespace CNTK {
// -------------------------------------------------------------------
// elementwise operations
// Result goes into 'this'.
// Result goes into 'this', and can optionally be added to the existing value.
// E.g. c.DoSumOf(beta,a,b,alpha) means c := beta * c + alpha * (a + b).
// and c.DoDiffOf(0, c, a, 1) means c -= a.
// All operators support elementwise in-place operations, i.e. a, b, and c
// may all reference the same underlying SOB.
// If beta == 0, c is not read out.
// If beta == 0, c is not read out, i.e. it can be uninitialized or contain NaNs.
// -------------------------------------------------------------------
void DoSumOf(ElemType beta, const TensorView & a, const TensorView & b, ElemType alpha) { DoBinaryOpOf(beta, a, b, alpha, 0); }