From 218d17a15c2d55e093fd8f41c545744c8b7faebc Mon Sep 17 00:00:00 2001
From: Julien Guillaumin <julien.guillaumin@telecom-bretagne.eu>
Date: Wed, 6 Dec 2017 12:47:30 +0100
Subject: [PATCH] include (-I) correct path to `nsync_cv.h`

From TensorFlow 1.x.y, `nsync_cv.h` is placed into `$TF_INC"/external/nsync/public"`.
(before it was in `$TF_INC"/tensorflow/contrib/makefile/downloads/nsync/public"`, which is accessible with `-I $TF_INC`.
This path might be add, as include path, during compilation.
I add it to the three compilation commands.

It works with Tensorflow 1.4.0, with GPU.
---
 lib/make.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/make.sh b/lib/make.sh
index 15a616bc..0b599f9a 100755
--- a/lib/make.sh
+++ b/lib/make.sh
@@ -1,4 +1,5 @@
 TF_INC=$(python -c 'import tensorflow as tf; print(tf.sysconfig.get_include())')
+NSYNC_INC=$TF_INC"/external/nsync/public"
 
 CUDA_PATH=/usr/local/cuda/
 CXXFLAGS=''
@@ -11,15 +12,15 @@ cd roi_pooling_layer
 
 if [ -d "$CUDA_PATH" ]; then
 	nvcc -std=c++11 -c -o roi_pooling_op.cu.o roi_pooling_op_gpu.cu.cc \
-		-I $TF_INC -D GOOGLE_CUDA=1 -x cu -Xcompiler -fPIC $CXXFLAGS \
+		-I $TF_INC -I $NSYNC_INC -D GOOGLE_CUDA=1 -x cu -Xcompiler -fPIC $CXXFLAGS \
 		-arch=sm_37
 
 	g++ -std=c++11 -shared -o roi_pooling.so roi_pooling_op.cc \
-		roi_pooling_op.cu.o -I $TF_INC  -D GOOGLE_CUDA=1 -fPIC $CXXFLAGS \
+		roi_pooling_op.cu.o -I $TF_INC  -I $NSYNC_INC -D GOOGLE_CUDA=1 -fPIC $CXXFLAGS \
 		-lcudart -L $CUDA_PATH/lib64
 else
 	g++ -std=c++11 -shared -o roi_pooling.so roi_pooling_op.cc \
-		-I $TF_INC -fPIC $CXXFLAGS
+		-I $TF_INC -I $NSYNC_INC -fPIC $CXXFLAGS
 fi
 
 cd ..