From 94f439c07c4f3e13fbd87016212b3534d31a7165 Mon Sep 17 00:00:00 2001
From: Jon Crall <erotemic@gmail.com>
Date: Thu, 11 Jan 2018 07:24:17 -0500
Subject: Fixed setup.py to handle CUDNN_LIBRARY envvar with aten (#4597)

* Fixed setup.py to handle CUDNN_LIBRARY envvar with aten

* undo changes

* Added CUDNN_LIBRARY to bat file
---
 torch/lib/build_libs.bat | 1 +
 torch/lib/build_libs.sh  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'torch/lib')

diff --git a/torch/lib/build_libs.bat b/torch/lib/build_libs.bat
index f51a081463..0a265c18ab 100644
--- a/torch/lib/build_libs.bat
+++ b/torch/lib/build_libs.bat
@@ -124,6 +124,7 @@ goto:eof
                   -DNO_NNPACK=%NO_NNPACK% ^
                   -DCUDNN_INCLUDE_DIR="%CUDNN_INCLUDE_DIR%" ^
                   -DCUDNN_LIB_DIR="%CUDNN_LIB_DIR%" ^
+                  -DCUDNN_LIBRARY="%CUDNN_LIBRARY%" ^
                   -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
 
   %MAKE_COMMAND%
diff --git a/torch/lib/build_libs.sh b/torch/lib/build_libs.sh
index 71e3bbc44f..5129e6dba3 100755
--- a/torch/lib/build_libs.sh
+++ b/torch/lib/build_libs.sh
@@ -161,6 +161,7 @@ function build_aten() {
   -DNO_NNPACK=$((1-$WITH_NNPACK)) \
   -DCUDNN_INCLUDE_DIR=$CUDNN_INCLUDE_DIR \
   -DCUDNN_LIB_DIR=$CUDNN_LIB_DIR \
+  -DCUDNN_LIBRARY=$CUDNN_LIBRARY \
   -DATEN_NO_CONTRIB=1 \
   -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
   -DCMAKE_EXPORT_COMPILE_COMMANDS=1
-- 
cgit v1.2.3