Description: Partial_revert_of_upstream_116b9f34c3b3562192c69bbd045886c541cfffbc
 TF upstream lol. 116b9f34c3b3562192c69bbd045886c541cfffbc fix a build bug
 and create another one with older GCC (triggered when building with both CUDA
 and MKL)
 .
 python-tensorflow-cuda (1.7.1-1) unstable; urgency=medium
 .
   * New upstream release.
   * Generate proper numpy dependencies (on virual abi package).
   * Rewrite configure expect script using Python and create shell scripts
     to generate CUDA and MKL tree.
   * Refactor debian/rules.
   * Bump bazel build dep, wants >= 0.11.1, << 0.12 (others fail):
     https://github.com/tensorflow/tensorflow/issues/22527
   * Remove Fix_TensorRT_lib_version_detection patch.
   * Drop --config=tensorrt from bazel arguments, not needed anymore.
   * Does not build on Jessie/Xenial:
     https://github.com/tensorflow/tensorflow/issues/18039
   * Apply upstream 3eb314bbcdc6e850eefc21c7ecbd91e28bd04a70 to fix CUDA < 9
     detection.
   * Apply upstream f506183dd148d97e3378eb994b2ac9c948ef0ada to fix NVCC
     build failure with CUDA < 9.
   * Apply upstream 5cd6a8d1edff984de5b8e08a579d96235137c38b to fix MPI
     build failure.
   * Remove Python 3.7 from PY3VER, not supported upstream for the moment.
Author: Adam Cecile <acecile@le-vert.net>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2018-10-16

--- python-tensorflow-cuda-1.7.1.orig/tensorflow/core/common_runtime/mkl_cpu_allocator.h
+++ python-tensorflow-cuda-1.7.1/tensorflow/core/common_runtime/mkl_cpu_allocator.h
@@ -50,7 +50,7 @@ class MklCPUAllocator : public Visitable
   // Constructor and other standard functions
 
   /// Environment variable that user can set to upper bound on memory allocation
-  static inline constexpr const char* kMaxLimitStr = "TF_MKL_ALLOC_MAX_BYTES";
+  static constexpr const char* kMaxLimitStr = "TF_MKL_ALLOC_MAX_BYTES";
 
   /// Default upper limit on allocator size - 64GB
   static constexpr size_t kDefaultMaxLimit = 64LL << 30;
