From e378a764ce25374412f91d5013772f86a9ada5da Mon Sep 17 00:00:00 2001
From: Marcin Junczys-Dowmunt <junczys@amu.edu.pl>
Date: Tue, 21 Nov 2017 09:45:46 +0000
Subject: [PATCH] update changelog

---
 CHANGELOG.md                 | 7 ++++++-
 CMakeLists.txt               | 2 +-
 src/common/config_parser.cpp | 2 +-
 src/training/validator.h     | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4997b61d2..940673234 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-- Added support for CUBLAS_TENSOR_OP_MATH mode for cublas in cuda 9.0
+
+## [1.1.0] - 2017-11-21
 
 ### Added
+- Batched translation for all model types, significant translation speed-up
+- Batched translation during validation with translation
+- `--maxi-batch-sort` option for `marian-decoder`
+- Support for CUBLAS_TENSOR_OP_MATH mode for cublas in cuda 9.0
 
 ## [1.0.0] - 2017-11-13
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e29f9409e..f5d7bc61f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
 # Find packages
 find_package(CUDA "8.0" REQUIRED)
 if(CUDA_FOUND)
-  set(EXT_LIBS ${EXT_LIBS} ${CUDA_curand_LIBRARY} ${CUDA_cusparse_LIBRARY})
+  set(EXT_LIBS ${EXT_LIBS} ${CUDA_curand_LIBRARY} ${CUDA_cusparse_LIBRARY} tcmalloc_minimal)
 endif(CUDA_FOUND)
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
diff --git a/src/common/config_parser.cpp b/src/common/config_parser.cpp
index eca3b7258..1f9dfb435 100644
--- a/src/common/config_parser.cpp
+++ b/src/common/config_parser.cpp
@@ -804,7 +804,7 @@ void ConfigParser::parseOptions(int argc, char** argv, bool doValidate) {
   SET_OPTION("mini-batch", int);
   SET_OPTION("maxi-batch", int);
 
-  if(mode_ == ConfigMode::training)
+  if(mode_ == ConfigMode::training || mode_ == ConfigMode::translating)
     SET_OPTION("maxi-batch-sort", std::string);
   SET_OPTION("max-length", size_t);
 
diff --git a/src/training/validator.h b/src/training/validator.h
index 8761b5918..fc42c3904 100644
--- a/src/training/validator.h
+++ b/src/training/validator.h
@@ -58,6 +58,7 @@ class Validator : public ValidatorBase {
     opts->set("max-length", options_->get<size_t>("valid-max-length"));
     if(options_->has("valid-mini-batch"))
       opts->set("mini-batch", options_->get<size_t>("valid-mini-batch"));
+    opts->set("mini-batch-sort", "src");
 
     // Create corpus
     auto validPaths = options_->get<std::vector<std::string>>("valid-sets");