Commit 93de94e6e15d67077fa4a8d39a8c7df2c701bd3f
fix merge issues
Showing
9 changed files
with
15 additions
and
14 deletions
Show diff stats
stim/cuda/cost.h
| @@ -3,11 +3,11 @@ | @@ -3,11 +3,11 @@ | ||
| 3 | #include <cuda_runtime.h> | 3 | #include <cuda_runtime.h> |
| 4 | #include <cublas_v2.h> | 4 | #include <cublas_v2.h> |
| 5 | #include <stdio.h> | 5 | #include <stdio.h> |
| 6 | -#include "../visualization/colormap.h" | 6 | +#include <stim/visualization/colormap.h> |
| 7 | #include <sstream> | 7 | #include <sstream> |
| 8 | -#include "../math/vector.h" | ||
| 9 | -#include "../cuda/devices.h" | ||
| 10 | -#include "../cuda/threads.h" | 8 | +#include <stim/math/vector.h> |
| 9 | +#include <stim/cuda/cudatools/devices.h> | ||
| 10 | +#include <stim/cuda/cudatools/threads.h> | ||
| 11 | 11 | ||
| 12 | ///Cost function that works with the gl-spider class to find index of the item with min-cost. | 12 | ///Cost function that works with the gl-spider class to find index of the item with min-cost. |
| 13 | typedef unsigned char uchar; | 13 | typedef unsigned char uchar; |
stim/cuda/cudatools/glbind.h
stim/gl/gl_spider.h
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | #include "stim/math/rect.h" | 14 | #include "stim/math/rect.h" |
| 15 | #include "stim/math/matrix.h" | 15 | #include "stim/math/matrix.h" |
| 16 | #include "stim/cuda/cost.h" | 16 | #include "stim/cuda/cost.h" |
| 17 | -#include "stim/cuda/glbind.h" | 17 | +#include <stim/cuda/cudatools/glbind.h> |
| 18 | #include <stim/visualization/obj.h> | 18 | #include <stim/visualization/obj.h> |
| 19 | #include <vector> | 19 | #include <vector> |
| 20 | 20 |
stim/math/matrix.h
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | #include <string.h> | 5 | #include <string.h> |
| 6 | #include <iostream> | 6 | #include <iostream> |
| 7 | #include <stim/math/vector.h> | 7 | #include <stim/math/vector.h> |
| 8 | -#include "../cuda/callable.h" | 8 | +#include <stim/cuda/cudatools/callable.h> |
| 9 | 9 | ||
| 10 | namespace stim{ | 10 | namespace stim{ |
| 11 | 11 |
stim/math/quaternion.h
stim/math/rect.h
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | #define RTS_RECT_H | 2 | #define RTS_RECT_H |
| 3 | 3 | ||
| 4 | //enable CUDA_CALLABLE macro | 4 | //enable CUDA_CALLABLE macro |
| 5 | -#include <stim/cuda/callable.h> | 5 | +#include <stim/cuda/cudatools/callable.h> |
| 6 | #include <stim/math/vector.h> | 6 | #include <stim/math/vector.h> |
| 7 | #include <stim/math/triangle.h> | 7 | #include <stim/math/triangle.h> |
| 8 | #include <stim/math/quaternion.h> | 8 | #include <stim/math/quaternion.h> |
stim/math/triangle.h
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | #define RTS_TRIANGLE_H | 2 | #define RTS_TRIANGLE_H |
| 3 | 3 | ||
| 4 | //enable CUDA_CALLABLE macro | 4 | //enable CUDA_CALLABLE macro |
| 5 | -#include <stim/cuda/callable.h> | 5 | +#include <stim/cuda/cudatools/callable.h> |
| 6 | #include <stim/math/vector.h> | 6 | #include <stim/math/vector.h> |
| 7 | #include <iostream> | 7 | #include <iostream> |
| 8 | 8 |
stim/math/vector.h
stim/visualization/colormap.h
| @@ -4,12 +4,12 @@ | @@ -4,12 +4,12 @@ | ||
| 4 | #include <string> | 4 | #include <string> |
| 5 | #include <stdlib.h> | 5 | #include <stdlib.h> |
| 6 | #ifdef __CUDACC__ | 6 | #ifdef __CUDACC__ |
| 7 | -#include "../cuda/error.h" | 7 | +#include <stim/cuda/cudatools/error.h> |
| 8 | #endif | 8 | #endif |
| 9 | 9 | ||
| 10 | //saving an image to a file uses the CImg library | 10 | //saving an image to a file uses the CImg library |
| 11 | //this currently throws a lot of "unreachable" warnings (as of GCC 4.8.2, nvcc 6.5.12) | 11 | //this currently throws a lot of "unreachable" warnings (as of GCC 4.8.2, nvcc 6.5.12) |
| 12 | -#include "../image/image.h" | 12 | +#include <stim/image/image.h> |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | #define BREWER_CTRL_PTS 11 | 15 | #define BREWER_CTRL_PTS 11 |