diff options
| author | Frank Seide <fseide@microsoft.com> | 2019-03-11 06:20:55 +0300 |
|---|---|---|
| committer | Martin Junczys-Dowmunt <Marcin.JunczysDowmunt@microsoft.com> | 2019-03-11 06:20:55 +0300 |
| commit | 842e378c0ff9b96edc48523b59e5b3e4043fafd1 (patch) | |
| tree | 3c9b8ab772525c727df674b51e5635d567c67c4f /vs | |
| parent | 35f225bd8003dffe2c764efd9f79f86005e90a4a (diff) | |
| parent | 16ff8a6aec79220ca7610a32f44fa7e477d86cb5 (diff) | |
Merged PR 6387: commented and simplified beam search
Added lots of comments to better understand beam search.
Plus:
* simplified/stratified the code a bit, e.g. made some variables more local;
* renamed some beam-search related methods to camelCase, to follow our coding convention;
* some warning fixes to make it build on Windows after latest changes to master.
Note; Most changes that need reviewing are in `beam_search.h`. Mostly everything else is just warning fixes and renaming to camelCase.
Best viewed in CodeFlow.
Related work items: #98143
Diffstat (limited to 'vs')
| -rwxr-xr-x[-rw-r--r--] | vs/Marian.vcxproj | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | vs/Marian.vcxproj.filters | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/vs/Marian.vcxproj b/vs/Marian.vcxproj index 3cb727a3..c899c242 100644..100755 --- a/vs/Marian.vcxproj +++ b/vs/Marian.vcxproj @@ -580,6 +580,7 @@ <ClCompile Include="..\src\microsoft\quicksand.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\src\models\transformer_stub.cpp" />
<ClCompile Include="..\src\rescorer\score_collector.cpp" />
<ClCompile Include="..\src\tensors\backend.cpp" />
<ClCompile Include="..\src\tensors\cpu\device.cpp" />
@@ -906,7 +907,7 @@ <ClInclude Include="..\src\models\nematus.h" />
<ClInclude Include="..\src\models\s2s.h" />
<ClInclude Include="..\src\models\states.h" />
- <ClCompile Include="..\src\models\transformer.h" />
+ <ClInclude Include="..\src\models\transformer.h" />
<ClInclude Include="..\src\models\experimental\lex_probs.h" />
<ClInclude Include="..\src\models\transformer_factory.h" />
<ClInclude Include="..\src\optimizers\clippers.h" />
diff --git a/vs/Marian.vcxproj.filters b/vs/Marian.vcxproj.filters index a5c6985c..b9036c1f 100644..100755 --- a/vs/Marian.vcxproj.filters +++ b/vs/Marian.vcxproj.filters @@ -202,9 +202,6 @@ <ClCompile Include="..\src\tensors\cpu\sharp\sse_gemm.cpp">
<Filter>tensors\cpu\sharp</Filter>
</ClCompile>
- <ClCompile Include="..\src\models\transformer.h">
- <Filter>models</Filter>
- </ClCompile>
<ClCompile Include="..\src\common\io.cpp">
<Filter>common</Filter>
</ClCompile>
@@ -481,6 +478,9 @@ <ClCompile Include="..\src\examples\iris\iris.cpp">
<Filter>examples\iris</Filter>
</ClCompile>
+ <ClCompile Include="..\src\models\transformer_stub.cpp">
+ <Filter>models</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\marian.h" />
@@ -1520,6 +1520,9 @@ <ClInclude Include="..\src\models\bert.h">
<Filter>models</Filter>
</ClInclude>
+ <ClInclude Include="..\src\models\transformer.h">
+ <Filter>models</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="3rd_party">
|