marian-nmt/marian
1
1
Fork 0
mirror of https://github.com/marian-nmt/marian.git synced 2024-09-11 06:15:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor VS build fixes

Browse Source
This commit is contained in:
Frank Seide 2018-10-18 14:02:19 -07:00
parent 410f4d05bc
commit 581d00360b
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/vocab.cpp
View File

@ -48,7 +48,7 @@ int Vocab::loadOrCreate(const std::string& vocabPath,
size = load(vocabPath, max);
}
LOG(info, "[data] Setting vocabulary size for input {} to {}", batchIndex_, size);
return size;
return (int)size;
}
int Vocab::load(const std::string& vocabPath, int max) {

2
src/training/validator.h
View File

@ -546,7 +546,7 @@ protected:
// language-dependent part (assuming Western languages):
normText = " " + normText + " ";
normText = regex::regex_replace(normText, regex::regex("([\\{-\\~\\[-\\` -\\&\(-\\+\\:-\\@\\/])"), " $1 "); // tokenize punctuation
normText = regex::regex_replace(normText, regex::regex("([\\{-\\~\\[-\\` -\\&\\(-\\+\\:-\\@\\/])"), " $1 "); // tokenize punctuation
normText = regex::regex_replace(normText, regex::regex("([^0-9])([\\.,])"), "$1 $2 "); // tokenize period and comma unless preceded by a digit
normText = regex::regex_replace(normText, regex::regex("([\\.,])([^0-9])"), " $1 $2"); // tokenize period and comma unless followed by a digit
normText = regex::regex_replace(normText, regex::regex("([0-9])(-)"), "$1 $2 "); // tokenize dash when preceded by a digit

4
vs/Marian.vcxproj
View File

@ -123,6 +123,7 @@
<ClInclude Include="..\src\command\marian_conv.cpp" />
<ClCompile Include="..\src\command\marian_main.cpp" />
<ClCompile Include="..\src\common\binary.cpp" />
<ClCompile Include="..\src\common\cli_helper.cpp" />
<ClCompile Include="..\src\common\cli_wrapper.cpp" />
<ClCompile Include="..\src\common\config_validator.cpp" />
<ClCompile Include="..\src\common\io.cpp" />
@ -146,7 +147,6 @@
</ClCompile>
<ClCompile Include="..\src\tensors\backend.cpp" />
<ClCompile Include="..\src\tensors\cpu\device.cpp" />
<ClCompile Include="..\src\tensors\cpu\dropout.cpp" />
<ClCompile Include="..\src\tensors\cpu\prod.cpp" />
<ClCompile Include="..\src\tensors\cpu\sharp\avx_gemm.cpp" />
<ClCompile Include="..\src\tensors\cpu\sharp\sse_gemm.cpp" />
@ -162,6 +162,7 @@
<ClCompile Include="..\src\optimizers\optimizers.cpp" />
<ClCompile Include="..\src\models\model_factory.cpp" />
<ClCompile Include="..\src\models\encoder_decoder.cpp" />
<ClCompile Include="..\src\tensors\rand.cpp" />
<ClCompile Include="..\src\training\communicator.cpp" />
<ClCompile Include="..\src\training\graph_group_multinode_sync.cpp" />
<ClCompile Include="..\src\translator\history.cpp" />
@ -440,6 +441,7 @@
<ClInclude Include="..\src\tensors\device.h" />
<ClInclude Include="..\src\tensors\dispatch.h" />
<ClInclude Include="..\src\tensors\memory_piece.h" />
<ClInclude Include="..\src\tensors\rand.h" />
<ClInclude Include="..\src\tensors\tensor.h" />
<ClInclude Include="..\src\tensors\tensor_allocator.h" />
<ClInclude Include="..\src\tensors\tensor_operators.h" />

12
vs/Marian.vcxproj.filters
View File

@ -43,9 +43,6 @@
<ClCompile Include="..\src\tensors\cpu\device.cpp">
<Filter>tensors\cpu</Filter>
</ClCompile>
<ClCompile Include="..\src\tensors\cpu\dropout.cpp">
<Filter>tensors\cpu</Filter>
</ClCompile>
<ClCompile Include="..\src\tensors\cpu\prod.cpp">
<Filter>tensors\cpu</Filter>
</ClCompile>
@ -256,6 +253,12 @@
<ClCompile Include="..\src\microsoft\quicksand.cpp">
<Filter>microsoft</Filter>
</ClCompile>
<ClCompile Include="..\src\common\cli_helper.cpp">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\tensors\rand.cpp">
<Filter>tensors</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\marian.h" />
@ -1075,6 +1078,9 @@
<ClInclude Include="..\src\command\marian_conv.cpp">
<Filter>command</Filter>
</ClInclude>
<ClInclude Include="..\src\tensors\rand.h">
<Filter>tensors</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="3rd_party">