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

Fix unresolved external due to a removed #include directive

Browse Source
This commit is contained in:
Cédric Rousseau 2018-09-05 13:16:53 +02:00
parent fbb221e995
commit 78dd2a2d59
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/models/transformer_factory.h
View File

@ -13,6 +13,6 @@ Ptr<EncoderBase> NewEncoderTransformer(Ptr<Options> options);
Ptr<DecoderBase> NewDecoderTransformer(Ptr<Options> options); Ptr<DecoderBase> NewDecoderTransformer(Ptr<Options> options);
} // namespace marian } // namespace marian
#ifndef _WIN32 // TODO: remove this once I updated the Linux-side makefile //#ifndef _WIN32 // TODO: remove this once I updated the Linux-side makefile
#include "models/transformer.h" #include "models/transformer.h"
#endif //#endif

7
vs/README.md
View File

@ -53,7 +53,12 @@ This part gives more information on the changes done.
4. __Fix marian::Backendn marian::cpu::Beckend and marian::gpu::Backend conflicts__ 4. __Fix marian::Backendn marian::cpu::Beckend and marian::gpu::Backend conflicts__
[Github Link](https://github.com/cedrou/marian-dev/commit/6370ea27d68b83c75868437bbf27bd92c9fb5628) [Github Link](https://github.com/cedrou/marian-dev/commit/6370ea27d68b83c75868437bbf27bd92c9fb5628)
There were name conflicts between the 3 `Backend` classes that confused the compiler. I renamed the CPU and GPU as `cpuBackend` and `gpuBackend`. There were name conflicts between the 3 `Backend` classes that confused the compiler:
> template instantiation resulted in unexpected function type of "type" (the meaning of a name may have changed since the template declaration -- the type of the template is "type")
.
I renamed the CPU and GPU as `cpuBackend` and `gpuBackend`.
5. __Fix error : identifier "CUDA_FLT_MAX" is undefined in device code__ 5. __Fix error : identifier "CUDA_FLT_MAX" is undefined in device code__
[Github Link](https://github.com/cedrou/marian-dev/commit/112118fce3c8c54049913126c2685e8e7463713c) [Github Link](https://github.com/cedrou/marian-dev/commit/112118fce3c8c54049913126c2685e8e7463713c)