Commit Graph

263 Commits

Author SHA1 Message Date
Marcin Junczys-Dowmunt
cd18ee0396 safeguard cmake against rogue doxygen 2019-10-08 15:54:59 -07:00
Marcin Junczys-Dowmunt
834905411e address code review comments 2019-10-07 15:49:46 -07:00
Marcin Junczys-Dowmunt
4d10ae9212 small changes to cmake 2019-09-17 13:46:52 -07:00
Marcin Junczys-Dowmunt
16e6fb9fae small clean up, move fbgemm pointer 2019-09-17 11:30:46 -07:00
Marcin Junczys-Dowmunt
29e2762541 working compilatoin with different compute capabilities 2019-09-16 13:54:27 -07:00
Marcin Junczys-Dowmunt
53a9f4aaf0 merge master, avoid MSC bug 2019-09-16 10:39:03 -07:00
Frank Seide
724443b203 removed compute_75 flags, as we are not doing anything special for Turing presently 2019-09-12 10:45:52 -07:00
Marcin Junczys-Dowmunt
bf69071b49 make elementwise operations etc work with fp16 2019-09-11 21:43:19 -07:00
Marcin Junczys-Dowmunt
446cff8dcf Merge branch 'master' of vs-ssh.visualstudio.com:v3/machinetranslation/Marian/marian-dev 2019-09-10 14:47:58 -07:00
Marcin Junczys-Dowmunt
864fe82ad1 enable compilation with compute_30 etc 2019-09-09 17:05:07 -07:00
Tomasz Dwojak
633153199c Fix static build 2019-09-09 22:19:00 +02:00
Marcin Junczys-Dowmunt
9ed5c0078a enable GPU compilation 2019-09-06 15:23:05 -07:00
Marcin Junczys-Dowmunt
32fcaf967c Add compiler flags for C programs to silence spurious warnings etc 2019-09-03 14:28:47 -07:00
Marcin Junczys-Dowmunt
c6740287f3 merge CMakeLists.txt 2019-09-03 11:11:05 -07:00
Marcin Junczys-Dowmunt
5c54fdd6a8 move debug symbols into specific build types 2019-08-12 14:57:30 -07:00
Marcin Junczys-Dowmunt
288dc27782 add intrinsics to common flags 2019-08-12 14:47:25 -07:00
Marcin Junczys-Dowmunt
52a8461fb3 Fix CMakeLists.txt and src/3rd_party/CMakeLists.txt, bug with overlapping CXX flags 2019-08-12 13:12:14 -07:00
Roman Grundkiewicz
56fcaaf8fd Change ERROR to WARNING if CUDA >10 and CMake <3.12 2019-08-11 17:08:38 +01:00
Roman Grundkiewicz
278ec02c4f Require CMake 3.12.2+ for CUDA 10.0+ 2019-07-19 15:13:18 +01:00
Marcin Junczys-Dowmunt
222ed4040e make compile with CUDNN and static libs, suppress CMAKE dev warning from 3rd party tools 2019-07-04 16:26:32 -07:00
Young Jin Kim
d2d8ec041d Enable FBGEMM based packed GEMM on windows 2019-06-18 16:59:11 -07:00
Nikolay Bogoychev
f8943a78d1 Add the changes to CMakeLists.txt and add also support for finding the include directory 2019-02-24 20:29:54 +00:00
Nikolay Bogoychev
a2d381d65c A more intelligent way to detect cblas if it's not included in openblas 2019-02-24 19:59:26 +00:00
Nikolay Bogoychev
0aded98427 Merge branch 'master' into cblas 2019-02-24 19:57:53 +00:00
Marcin Junczys-Dowmunt
03f19da26c
Remove old comment 2019-02-06 10:24:53 -08:00
Marcin Junczys-Dowmunt
4ab941b909 use ExternalProject for installation 2019-02-04 23:07:00 -08:00
Kenneth Heafield
99000874b4 Add cblas to libs when compiling without MKL
Otherwise on gentoo and CSD3 (without MKL module loaded), I get
missing cblas_gemm link errors
2019-01-24 20:20:26 +00:00
Marcin Junczys-Dowmunt
9cc5b176db set nvcc host compiler to match general compiler 2018-12-14 15:11:34 -08:00
Marcin Junczys-Dowmunt
28629ea516 switch CUDA back on 2018-12-12 13:45:57 -08:00
Marcin Junczys-Dowmunt
0ae07c5323 handle warnings in sse2 and avx code 2018-12-12 13:33:04 -08:00
Marcin Junczys-Dowmunt
b44195c33d fix more warnings 2018-12-11 14:01:11 -08:00
Marcin Junczys-Dowmunt
634ba54839 fix warnings 2018-12-10 14:40:11 -08:00
Marcin Junczys-Dowmunt
8f604afb88 make things compile under windows again 2018-12-10 13:32:22 -08:00
Marcin Junczys-Dowmunt
36d12cd285 link stdlib statically 2018-12-09 19:53:57 -08:00
Marcin Junczys-Dowmunt
de6a9dfd05 let cmake set make command 2018-12-09 14:10:40 -08:00
Marcin Junczys-Dowmunt
67307be077 Merge branch 'master' into zlib 2018-12-07 13:47:26 -08:00
Marcin Junczys-Dowmunt
00f05a066d fix CMake symbol name 2018-12-07 13:41:42 -08:00
Marcin Junczys-Dowmunt
8b4b3dae1e Address review comments 2018-12-07 13:37:05 -08:00
Marcin Junczys-Dowmunt
f4d3e6bed6 include zlib in source tree 2018-12-07 13:12:20 -08:00
Marcin Junczys-Dowmunt
ed25aa02fc cleanup options 2018-12-06 21:55:12 -08:00
Marcin Junczys-Dowmunt
01ce3ed71b detect cpu intrinsics 2018-12-06 21:24:33 -08:00
Marcin Junczys-Dowmunt
ebb1cda730 allow static linking of cuda libs 2018-12-06 20:43:44 -08:00
Marcin Junczys-Dowmunt
d7a746051c disable ptxas warning 2018-12-06 18:00:10 -08:00
Marcin Junczys-Dowmunt
e327494e4d move NCCL to EXT_LIBS 2018-12-06 16:35:33 -08:00
Marcin Junczys-Dowmunt
ddf0c9ce0c add NCCL compilation to Marian and pass on CMake parameters to NCCL make file 2018-12-06 14:07:26 -08:00
Marcin Junczys-Dowmunt
1b2968c8b9 Merge branch 'master' into nccl 2018-12-06 13:21:25 -08:00
Marcin Junczys-Dowmunt
8d31737623 fix all warnings 2018-11-28 19:30:27 -08:00
Marcin Junczys-Dowmunt
396a8d3ab9 disable override for a moment 2018-11-28 17:31:33 -08:00
Marcin Junczys-Dowmunt
1c4602ea47 fix warnings 2018-11-28 17:27:12 -08:00
Marcin Junczys-Dowmunt
f8969fbf3b change sentencepiece into submodule 2018-11-25 11:50:02 -08:00
Marcin Junczys-Dowmunt
c0ba4d8307 create sentencepiece within Marian 2018-11-23 23:12:55 -08:00
Marcin Junczys-Dowmunt
9562338ff7 include nccl in source tree 2018-11-22 16:20:05 -08:00
Marcin Junczys-Dowmunt
17551afe80 merge with internal 2018-11-15 06:31:41 -08:00
Frank Seide
30ac255f38 fixed build error due to chrono 2018-11-10 10:47:04 -08:00
Marcin Junczys-Dowmunt
37822d60a8 add -g -rdynamic to Release compilation options to make stack backtrace readable 2018-11-08 00:13:26 -08:00
Marcin Junczys-Dowmunt
9af35a8a9d add back -Wl,--no-as-needed, MKL needs this apparently 2018-11-06 23:14:08 -08:00
Marcin Junczys-Dowmunt
61839a2122 remove a few warnings from clang with cuda 10.0 2018-11-06 11:11:54 -08:00
Marcin Junczys-Dowmunt
f6eb9cc569 add -Werror to nvcc, fix deprecated headers 2018-11-06 10:24:18 -08:00
Marcin Junczys-Dowmunt
8b8a49c312 small fixes to compile with different compilers 2018-11-06 08:36:48 -08:00
Frank Seide
015f392e82 reenabled -Wunused-variable and dealt with fallout 2018-11-05 21:24:02 -08:00
Frank Seide
fca0510133 enabled most warnings on gcc, and fixed them 2018-11-05 20:21:50 -08:00
Frank Seide
4fcdd191ab Merged PR 5379: bug fix: git revision should be updated accurately
This PR separates the old `version.h` (now renamed to `project_version.h`, which is really meant for the project version and therefore gets created only at time of `cmake`, and a new process that creates a new file `git_revision.h` whenever the HEAD changes.

By using a clever trick from StackOverflow that makes `git_revision.h` depend directly on git's `HEAD` file, this new header file only gets recreated when the HEAD changes (e.g. a commit or checkout command). As a result, if the revision has does not change, a repeated `make` invocation will not compile or link anything.

This version is now logged directly at program startup, together with hostname, process id, and the command line.

What is still missing is a "dirty" flag in the version number.

Related work items: #96098
2018-10-29 21:24:09 +00:00
Frank Seide
88d141060a added -Werror; added warning for missing 'override' and fixed the fallout; now always compiles quicksand.cpp to ensure it builds 2018-10-25 14:51:39 -07:00
Frank Seide
d906b9c759 made gcc happy 2018-10-24 18:06:54 -07:00
Frank Seide
7dd1763fae git_revision.h is now created 2018-10-24 17:10:57 -07:00
Frank Seide
ab8c3e9009 renamed version.h* to project_version.h*; created new version.cpp that is the only place that includes version header(s) 2018-10-24 15:24:08 -07:00
Ulrich Germann
ede2932b42 The previous fix didn't work on old nehalem CPUs.
This fix lets the user freely specify the BUILD_ARCH for which to compile.
It also adds the switch -msse4.1, as that is required for compilation with MKL.
2018-10-23 20:05:34 +01:00
Ulrich Germann
88915642d0 Allow compilation with -march=x86-64 -mavx instead of -march=native.
The previous attempt (with -DCMAKE_BUILD_TYPE=Nonative) had no effect.
Now -DCOMPILE_NATIVELY=off allows compilation of portable binaries that
will also run on CPUs older than the one Marian was compiled on.
2018-10-22 22:11:47 +01:00
Marcin Junczys-Dowmunt
6e1addb787 merge with multi-node branch 2018-10-12 16:43:33 -07:00
Marcin Junczys-Dowmunt
ed4e579f55 copy sentencepiece executables to main directory 2018-10-07 16:26:32 -07:00
Marcin Junczys-Dowmunt
a244acca24 Add comments to CMakeLists.txt 2018-10-07 16:09:29 -07:00
Marcin Junczys-Dowmunt
6cfe9ba0b6 surround more parts of SentencePiece with #ifdef 2018-10-07 15:43:54 -07:00
Frank Seide
4d26c3e363 fixed the link error 2018-10-04 21:42:08 -07:00
Frank Seide
108a3e8980 addressed some merge problems. This still does not link 2018-10-04 17:48:28 -07:00
Marcin Junczys-Dowmunt
188697ba0c move submodule checkout higher 2018-10-02 17:02:52 -07:00
Frank Seide
6b2579dd94 towards logging the call stack on segfault 2018-09-30 18:31:10 -07:00
Marcin Junczys-Dowmunt
cedbb71033 Merge branch 'master' into rm-boost-2 2018-09-27 20:28:48 -07:00
Roman Grundkiewicz
e2294a90a3 Remove tabs and whitespaces 2018-09-27 14:52:39 +01:00
Marcin Junczys-Dowmunt
5bc551c1a8
Merge branch 'master' into rm-boost-2 2018-09-26 13:42:07 -07:00
Cédric Rousseau
d4f2cb49bb Merge branch 'master' into build_on_win 2018-09-17 14:25:59 +02:00
Marcin Junczys-Dowmunt
7b45358c43 remove more obsolete references to boost 2018-09-16 21:48:43 +02:00
Marcin Junczys-Dowmunt
78c6c7722c add examples submodule, update README 2018-09-16 14:37:30 +02:00
Marcin Junczys-Dowmunt
5a42fdd3e6 checkout examples automatically 2018-09-16 09:50:53 -07:00
Cédric Rousseau
77516c9239 Update scripts to build on Windows 2018-09-14 15:52:42 +02:00
Marcin Junczys-Dowmunt
88d968fcc2 get rid of boost::hash_combine 2018-09-14 02:04:19 -07:00
Cédric Rousseau
2e38a2a919 Merge branch 'master' into build_on_win 2018-09-13 17:56:36 +02:00
Cédric Rousseau
a445635cbd Ninja and MSBuild compilation 2018-09-13 17:27:46 +02:00
Cédric Rousseau
f792b899dc Make it build directly on VS with CMake 2018-09-12 18:28:36 +02:00
Cédric Rousseau
e89995ee32 Fix Warnings 2018-09-07 17:58:45 +02:00
Cédric Rousseau
4fd2360918 Fix CUDA+MSVC incompatibility with Boost.Preprocessor 2018-09-05 15:42:16 +02:00
Cédric Rousseau
0659b2c5d5 Build in Release, with improved debug info 2018-09-04 16:58:49 +02:00
Cédric Rousseau
1ab5f0ccb7 Fix VS compiler flags 2018-09-04 16:44:04 +02:00
Roman Grundkiewicz
1a052ae99d Remove program_options from required Boost components 2018-08-24 16:52:17 +01:00
Marcin Junczys-Dowmunt
ac0cdc8502 add build type Nonative 2018-08-17 17:39:40 -07:00
Roman Grundkiewicz
c73a2cf6fb Fix compiler warnings 2018-08-01 16:43:05 +01:00
Marcin Junczys-Dowmunt
468678f545 change option name 2018-07-01 00:15:30 -07:00
Marcin Junczys-Dowmunt
f68cf82f64 clean NCCL support 2018-06-24 23:07:41 -07:00
Marcin Junczys-Dowmunt
afabe4e7e9 try to test nccl 2018-06-24 12:47:33 -07:00
Marcin Junczys-Dowmunt
ca73a7c0bd add batch-size based on words for decoder 2018-05-13 23:16:34 +00:00
Marcin Junczys-Dowmunt
1cffa82f2d small changes for shared task 2018-05-13 20:03:33 +00:00