added grids subdirectory

David Mayerich
1 parent 288593c0
Showing 3 changed files with 50 additions and 35 deletions Show diff stats
grids/grid_data.cuh
grids/image_stack.h
math/realfield.cuh
+#ifndef STIM_GRID_DATA_CUH
+#define STIM_GRID_DATA_CUH
+
+#include <vector>
+#include <string>
+#include <sstream>
+
+#include "../cuda/threads.h"
+#include "../cuda/error.h"
+#include "../cuda/devices.h"
+
+
+namespace stim{
+
+//This object describes a generic D-dimensional grid containing data of type T
+	// data can be stored on the GPU or CPU (and transferred between the two)
+	// data can be loaded in the form of images
+	// data can be saved in the form of binary files
+template<typename T, unsigned int D = 1>
+class grid_data{
+
+protected:
+
+	unsigned long R[D];		//elements in each dimension
+	T* ptr;					//pointer to the data (on the GPU or CPU)
+	bool gpu;				//true if the data is on the GPU
+
+};
+
+}
+
+
+#endif
 \ No newline at end of file
+#ifndef STIM_IMAGE_STACK_H
+#define STIM_IMAGE_STACK_H
+
+
+namespace stim{
+
+//this creates a class that can be used to load 3D grid data from stacks of images
+template<typename T>
+class image_stack : public virtual grid_data<T, 3>{
+
+};
+
+
+}
+
+#endif
 \ No newline at end of file
@@ -8,30 +8,6 @@
 #include "cublas_v2.h"
 #include <cuda_runtime.h>
  
-///Compute a Gaussian function in 3D (mostly for testing)
-/*template<typename T>
-__global__ void gpu_gaussian(T* dest, unsigned int r0, unsigned int r1, T mean, T std, stim::rect<T> shape)
-{
-	int iu = blockIdx.x * blockDim.x + threadIdx.x;
-	int iv = blockIdx.y * blockDim.y + threadIdx.y;
-
-	//make sure that the thread indices are in-bounds
-	if(iu >= r0 || iv >= r1) return;
-
-	//compute the index into the field
-	int i = iv*r0 + iu;
-
-	T u = (T)iu / (T)r0;
-	T v = (T)iv / (T)r1;
-
-	stim::vec<T> p = shape(u, v);
-
-	T fx = (T)1.0 / (std * (T)sqrt(2 * 3.14159f) ) * exp( - pow(p[0] - mean, 2) / (2 * std*std) );
-	T fy = (T)1.0 / (std * (T)sqrt(2 * 3.14159f) ) * exp( - pow(p[1] - mean, 2) / (2 * std*std) );
-	T fz = (T)1.0 / (std * (T)sqrt(2 * 3.14159f) ) * exp( - pow(p[2] - mean, 2) / (2 * std*std) );
-
-	dest[i] = fx * fy * fz;
-}*/
  
 namespace stim{
  
@@ -271,19 +247,9 @@ public:
 			}
 		}
  
-		//std::cout<<"realfield COPY CONSTRUCTOR"<<std::endl;
+
 	}
  
-	/*void gaussian(P mean, P std, unsigned int n=0)	//creates a 3D gaussian using component n
-	{
-		int maxThreads = stim::maxThreadsPerBlock(); //compute the optimal block size
-        int SQRT_BLOCK = (int)sqrt((float)maxThreads);
-		//create one thread for each detector pixel
-		dim3 dimBlock(SQRT_BLOCK, SQRT_BLOCK);
-		dim3 dimGrid((R[0] + SQRT_BLOCK -1)/SQRT_BLOCK, (R[1] + SQRT_BLOCK - 1)/SQRT_BLOCK);
-
-		gpu_gaussian<float> <<<dimGrid, dimBlock>>> (X[n], R[0], R[1], mean, std, shape);
-	}*/