codebase / stimlib

Commit 93de94e6e15d67077fa4a8d39a8c7df2c701bd3f

Authored by Laila Saadatifard
2 parents 96f9b10f 7d1d153a

fix merge issues

Showing 9 changed files with 15 additions and 14 deletions   Show diff stats
Inline Side-by-side
stim/cuda/cost.h
  Show/Hide comments   View file @93de94e
... ... @@ -3,11 +3,11 @@
3 3 #include <cuda_runtime.h>
4 4 #include <cublas_v2.h>
5 5 #include <stdio.h>
6   -#include "../visualization/colormap.h"
  6 +#include <stim/visualization/colormap.h>
7 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 12 ///Cost function that works with the gl-spider class to find index of the item with min-cost.
13 13 typedef unsigned char uchar;
... ...
stim/cuda/cudatools/glbind.h
  Show/Hide comments   View file @93de94e
... ... @@ -9,7 +9,7 @@
9 9  
10 10 //#include <cudaHandleError.h>
11 11 #include "cuda_gl_interop.h"
12   -#include "../gl/error.h"
  12 +#include <stim/gl/error.h>
13 13  
14 14 namespace stim
15 15 {
... ...
stim/gl/gl_spider.h
  Show/Hide comments   View file @93de94e
... ... @@ -14,7 +14,7 @@
14 14 #include "stim/math/rect.h"
15 15 #include "stim/math/matrix.h"
16 16 #include "stim/cuda/cost.h"
17   -#include "stim/cuda/glbind.h"
  17 +#include <stim/cuda/cudatools/glbind.h>
18 18 #include <stim/visualization/obj.h>
19 19 #include <vector>
20 20  
... ...
stim/math/matrix.h
  Show/Hide comments   View file @93de94e
... ... @@ -5,7 +5,7 @@
5 5 #include <string.h>
6 6 #include <iostream>
7 7 #include <stim/math/vector.h>
8   -#include "../cuda/callable.h"
  8 +#include <stim/cuda/cudatools/callable.h>
9 9  
10 10 namespace stim{
11 11  
... ...
stim/math/quaternion.h
  Show/Hide comments   View file @93de94e
1 1 #ifndef RTS_QUATERNION_H
2 2 #define RTS_QUATERNION_H
3 3  
4   -#include "../math/matrix.h"
5   -#include "../cuda/callable.h"
  4 +#include <stim/math/matrix.h>
  5 +#include <stim/cuda/cudatools/callable.h>
6 6  
7 7 namespace stim{
8 8  
... ...
stim/math/rect.h
  Show/Hide comments   View file @93de94e
... ... @@ -2,7 +2,7 @@
2 2 #define RTS_RECT_H
3 3  
4 4 //enable CUDA_CALLABLE macro
5   -#include <stim/cuda/callable.h>
  5 +#include <stim/cuda/cudatools/callable.h>
6 6 #include <stim/math/vector.h>
7 7 #include <stim/math/triangle.h>
8 8 #include <stim/math/quaternion.h>
... ...
stim/math/triangle.h
  Show/Hide comments   View file @93de94e
... ... @@ -2,7 +2,7 @@
2 2 #define RTS_TRIANGLE_H
3 3  
4 4 //enable CUDA_CALLABLE macro
5   -#include <stim/cuda/callable.h>
  5 +#include <stim/cuda/cudatools/callable.h>
6 6 #include <stim/math/vector.h>
7 7 #include <iostream>
8 8  
... ...
stim/math/vector.h
  Show/Hide comments   View file @93de94e
... ... @@ -5,7 +5,8 @@
5 5 #include <cmath>
6 6 #include <sstream>
7 7 #include <vector>
8   -#include "../cuda/cudatools/callable.h"
  8 +
  9 +#include <stim/cuda/cudatools/callable.h>
9 10  
10 11 namespace stim
11 12 {
... ...
stim/visualization/colormap.h
  Show/Hide comments   View file @93de94e
... ... @@ -4,12 +4,12 @@
4 4 #include <string>
5 5 #include <stdlib.h>
6 6 #ifdef __CUDACC__
7   -#include "../cuda/error.h"
  7 +#include <stim/cuda/cudatools/error.h>
8 8 #endif
9 9  
10 10 //saving an image to a file uses the CImg library
11 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 15 #define BREWER_CTRL_PTS 11
... ...