diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3344032 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.so +*.swp +*__pycache__* +*.o diff --git a/point-sift.yml b/point-sift.yml new file mode 100644 index 0000000..913a4d3 --- /dev/null +++ b/point-sift.yml @@ -0,0 +1,11 @@ +name: point-sift +channels: + - defaults +dependencies: + - pip + - python=3.6.7 + - pip: + - h5py + - tensorflow-gpu==1.13.1 +prefix: /home/raul/miniconda3/envs/point-sift + diff --git a/tf_utils/tf_ops/grouping/tf_grouping_compile.sh b/tf_utils/tf_ops/grouping/tf_grouping_compile.sh index 7d2988f..544baa5 100755 --- a/tf_utils/tf_ops/grouping/tf_grouping_compile.sh +++ b/tf_utils/tf_ops/grouping/tf_grouping_compile.sh @@ -1,8 +1,12 @@ #/bin/bash -/usr/local/cuda-8.0/bin/nvcc tf_grouping_g.cu -o tf_grouping_g.cu.o -c -O2 -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC +CUDA_PATH=/usr/local/cuda +TF_PATH=~/miniconda3/envs/point-sift/lib/python3.6/site-packages/tensorflow +INCLUDE_PATH=$TF_PATH/include + +$CUDA_PATH/bin/nvcc tf_grouping_g.cu -o tf_grouping_g.cu.o -c -O2 -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC # TF1.2 #g++ -std=c++11 tf_grouping.cpp tf_grouping_g.cu.o -o tf_grouping_so.so -shared -fPIC -I /usr/local/lib/python2.7/dist-packages/tensorflow/include -I /usr/local/cuda-8.0/include -lcudart -L /usr/local/cuda-8.0/lib64/ -O2 -D_GLIBCXX_USE_CXX11_ABI=0 # TF1.4 -g++ -std=c++11 tf_grouping.cpp tf_grouping_g.cu.o -o tf_grouping_so.so -shared -fPIC -I /home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow/include -I /usr/local/cuda-8.0/include -I /home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow/include/external/nsync/public -lcudart -L /usr/local/cuda-8.0/lib64/ -L/home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow -ltensorflow_framework -O2 -D_GLIBCXX_USE_CXX11_ABI=0 +g++ -std=c++11 tf_grouping.cpp tf_grouping_g.cu.o -o tf_grouping_so.so -shared -fPIC -I $INCLUDE_PATH -I $CUDA_PATH/include -I $INCLUDE_PATH/external/nsync/public -lcudart -L $CUDA_PATH/lib64/ -L$TF_PATH -ltensorflow_framework -O2 -D_GLIBCXX_USE_CXX11_ABI=0 diff --git a/tf_utils/tf_ops/interpolation/tf_interpolate_compile.sh b/tf_utils/tf_ops/interpolation/tf_interpolate_compile.sh index 2c32e11..48ed0c3 100755 --- a/tf_utils/tf_ops/interpolation/tf_interpolate_compile.sh +++ b/tf_utils/tf_ops/interpolation/tf_interpolate_compile.sh @@ -2,4 +2,9 @@ #g++ -std=c++11 tf_interpolate.cpp -o tf_interpolate_so.so -shared -fPIC -I /usr/local/lib/python2.7/dist-packages/tensorflow/include -I /usr/local/cuda-8.0/include -lcudart -L /usr/local/cuda-8.0/lib64/ -O2 -D_GLIBCXX_USE_CXX11_ABI=0 # TF1.4 -g++ -std=c++11 tf_interpolate.cpp -o tf_interpolate_so.so -shared -fPIC -I /home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow/include -I /usr/local/cuda-8.0/include -I /home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow/include/external/nsync/public -lcudart -L /usr/local/cuda-8.0/lib64/ -L/home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow -ltensorflow_framework -O2 -D_GLIBCXX_USE_CXX11_ABI=0 +CUDA_PATH=/usr/local/cuda +TF_PATH=~/miniconda3/envs/point-sift/lib/python3.6/site-packages/tensorflow +INCLUDE_PATH=$TF_PATH/include + + +g++ -std=c++11 tf_interpolate.cpp -o tf_interpolate_so.so -shared -fPIC -I $INCLUDE_PATH -I $CUDA_PATH/include -I $INCLUDE_PATH/external/nsync/public -lcudart -L $CUDA_PATH/lib64/ -L$TF_PATH -ltensorflow_framework -O2 -D_GLIBCXX_USE_CXX11_ABI=0 diff --git a/tf_utils/tf_ops/interpolation/tf_interpolate_so.so b/tf_utils/tf_ops/interpolation/tf_interpolate_so.so index 35b636a..bfa52f4 100755 Binary files a/tf_utils/tf_ops/interpolation/tf_interpolate_so.so and b/tf_utils/tf_ops/interpolation/tf_interpolate_so.so differ diff --git a/tf_utils/tf_ops/pointSIFT_op/tf_pointSIFT_compile.sh b/tf_utils/tf_ops/pointSIFT_op/tf_pointSIFT_compile.sh index 3999758..8c62361 100755 --- a/tf_utils/tf_ops/pointSIFT_op/tf_pointSIFT_compile.sh +++ b/tf_utils/tf_ops/pointSIFT_op/tf_pointSIFT_compile.sh @@ -1,5 +1,11 @@ #/bin/bash -/usr/local/cuda-8.0/bin/nvcc pointSIFT.cu -o pointSIFT_g.cu.o -c -O2 -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC + +CUDA_PATH=/usr/local/cuda +TF_PATH=~/miniconda3/envs/point-sift/lib/python3.6/site-packages/tensorflow +INCLUDE_PATH=$TF_PATH/include + + +$CUDA_PATH/bin/nvcc pointSIFT.cu -o pointSIFT_g.cu.o -c -O2 -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC # TF1.4 -g++ -std=c++11 main.cpp pointSIFT_g.cu.o -o tf_pointSIFT_so.so -shared -fPIC -I /home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow/include -I /usr/local/cuda-8.0/include -I /home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow/include/external/nsync/public -lcudart -L /usr/local/cuda-8.0/lib64/ -L/home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow -ltensorflow_framework -O2 -D_GLIBCXX_USE_CXX11_ABI=0 +g++ -std=c++11 main.cpp pointSIFT_g.cu.o -o tf_pointSIFT_so.so -shared -fPIC -I $INCLUDE_PATH -I $CUDA_PATH/include -I $INCLUDE_PATH/external/nsync/public -lcudart -L $CUDA_PATH/lib64/ -L $TF_PATH -ltensorflow_framework -O2 -D_GLIBCXX_USE_CXX11_ABI=0 diff --git a/tf_utils/tf_ops/sampling/tf_sampling_compile.sh b/tf_utils/tf_ops/sampling/tf_sampling_compile.sh index 5e23cc9..e1ae1d7 100755 --- a/tf_utils/tf_ops/sampling/tf_sampling_compile.sh +++ b/tf_utils/tf_ops/sampling/tf_sampling_compile.sh @@ -1,8 +1,13 @@ #/bin/bash -/usr/local/cuda-8.0/bin/nvcc tf_sampling_g.cu -o tf_sampling_g.cu.o -c -O2 -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC + +CUDA_PATH=/usr/local/cuda +TF_PATH=~/miniconda3/envs/point-sift/lib/python3.6/site-packages/tensorflow +INCLUDE_PATH=$TF_PATH/include + +$CUDA_PATH/bin/nvcc tf_sampling_g.cu -o tf_sampling_g.cu.o -c -O2 -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC # TF1.2 #g++ -std=c++11 tf_sampling.cpp tf_sampling_g.cu.o -o tf_sampling_so.so -shared -fPIC -I /usr/local/lib/python2.7/dist-packages/tensorflow/include -I /usr/local/cuda-8.0/include -lcudart -L /usr/local/cuda-8.0/lib64/ -O2 -D_GLIBCXX_USE_CXX11_ABI=0 # TF1.4 -g++ -std=c++11 tf_sampling.cpp tf_sampling_g.cu.o -o tf_sampling_so.so -shared -fPIC -I /home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow/include -I /usr/local/cuda-8.0/include -I /home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow/include/external/nsync/public -lcudart -L /usr/local/cuda-8.0/lib64/ -L/home/jmydurant/anaconda3/envs/pointsift/lib/python3.5/site-packages/tensorflow -ltensorflow_framework -O2 -D_GLIBCXX_USE_CXX11_ABI=0 +g++ -std=c++11 tf_sampling.cpp tf_sampling_g.cu.o -o tf_sampling_so.so -shared -fPIC -I $INCLUDE_PATH -I $CUDA_PATH/include -I $INCLUDE_PATH/external/nsync/public -lcudart -L $CUDA_PATH/lib64/ -L $TF_PATH -ltensorflow_framework -O2 -D_GLIBCXX_USE_CXX11_ABI=0