mirror of
https://github.com/marian-nmt/marian.git
synced 2024-09-17 09:47:34 +03:00
Merge branch 'pmaster'
This commit is contained in:
commit
ea55722372
@ -99,6 +99,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||
- Added a few missing header files in shortlist.h and beam_search.h.
|
||||
- Improved handling for receiving SIGTERM during training. By default, SIGTERM triggers 'save (now) and exit'. Prior to this fix, batch pre-fetching did not check for this sigal, potentially delaying exit considerably. It now pays attention to that. Also, the default behaviour of save-and-exit can now be disabled on the command line with --sigterm exit-immediately.
|
||||
- Fix the runtime failures for FASTOPT on 32-bit builds (wasm just happens to be 32-bit) because it uses hashing with an inconsistent mix of uint64_t and size_t.
|
||||
- fix beam_search ABORT_IF(beamHypIdx >= beam.size(), "Out of bounds beamHypIdx??"); when enable openmp and OMP_NUM_THREADS > 1
|
||||
|
||||
### Changed
|
||||
- Remove `--clip-gemm` which is obsolete and was never used anyway
|
||||
|
@ -261,12 +261,12 @@ void TransposeFirst3In4(Tensor out, Tensor in, const std::vector<int>& vAxis) {
|
||||
|
||||
// find the mapping between the transposed output dimensional indices (oi, oj, ok)
|
||||
// and original input dimensional indices (i, j, k)
|
||||
int oi, oj, ok;
|
||||
#pragma omp parallel for
|
||||
for(int k = 0; k < l1; ++k) {
|
||||
int shift = k * l2 * l3;
|
||||
for(int j = 0; j < l2; ++j) {
|
||||
for(int i = 0; i < l3; ++i) {
|
||||
int oi, oj, ok;
|
||||
if(vAxis[0] == 0) {
|
||||
if(vAxis[1] == 1) {
|
||||
oi = i; oj = j; ok = k;
|
||||
|
Loading…
Reference in New Issue
Block a user