From a6c96b0b2ea955746b99aa7e207ea5b1048c20ff Mon Sep 17 00:00:00 2001 From: Mihai Morariu Date: Thu, 2 Jul 2020 18:32:11 +0900 Subject: [PATCH] Fix pc_distance/makefile. --- pc_distance/makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pc_distance/makefile b/pc_distance/makefile index 50608bd..d7c6359 100644 --- a/pc_distance/makefile +++ b/pc_distance/makefile @@ -1,8 +1,8 @@ -cuda_inc = /opt/cuda/include/ -cuda_lib = /opt/cuda/lib64/ -nvcc = /opt/cuda/bin/nvcc -tf_lib = /home/mmorariu/.local/lib/python3.8/site-packages/tensorflow -tf_inc = $(tf_lib)/include +cuda_inc = /home/mmorariu/.conda/envs/pcn/include/ +cuda_lib = /home/mmorariu/.conda/envs/pcn/lib/ +nvcc = /home/mmorariu/.conda/envs/pcn/bin/nvcc +tf_inc = /home/mmorariu/.conda/envs/pcn/lib/python3.6/site-packages/tensorflow/include +tf_lib = /home/mmorariu/.conda/envs/pcn/lib/python3.6/site-packages/tensorflow all: tf_nndistance_so.so tf_approxmatch_so.so @@ -10,17 +10,15 @@ tf_nndistance.cu.o: tf_nndistance.cu $(nvcc) tf_nndistance.cu -o tf_nndistance.cu.o -c -O2 -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC tf_nndistance_so.so: tf_nndistance.cpp tf_nndistance.cu.o - g++ tf_nndistance.cpp tf_nndistance.cu.o -o tf_nndistance_so.so \ - -I $(cuda_inc) -I $(tf_inc) -L $(cuda_lib) -lcudart -L $(tf_lib)/libtensorflow_framework.so.2 \ - -shared -D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11 -fPIC -O2 + g++ tf_nndistance.cpp tf_nndistance.cu.o -o tf_nndistance_so.so -shared -std=c++11 -fPIC -O2 \ + -I $(tf_inc) -D_GLIBCXX_USE_CXX11_ABI=1 -L $(tf_lib) -ltensorflow_framework -L $(cuda_lib) -lcudart tf_approxmatch.cu.o: tf_approxmatch.cu $(nvcc) tf_approxmatch.cu -o tf_approxmatch.cu.o -c -O2 -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC tf_approxmatch_so.so: tf_approxmatch.cpp tf_approxmatch.cu.o - g++ -shared $(CPPFLAGS) tf_approxmatch.cpp tf_approxmatch.cu.o -o tf_approxmatch_so.so \ - -I $(cuda_inc) -I $(tf_inc) -L $(cuda_lib) -lcudart -L $(tf_lib)/libtensorflow_framework.so.2 \ - -shared -D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11 -fPIC -O2 + g++ -shared $(CPPFLAGS) tf_approxmatch.cpp tf_approxmatch.cu.o -o tf_approxmatch_so.so -shared -std=c++11 -fPIC -O2 \ + -I $(tf_inc) -D_GLIBCXX_USE_CXX11_ABI=1 -L $(tf_lib) -ltensorflow_framework -L $(cuda_lib) -lcudart clean: rm -rf *.o *.so