removed some unused variables that cause the generation of warnings

Pavel Govyadinov · Pavel Govyadinov
1 parent 7ada0a48
Showing 5 changed files with 41 additions and 51 deletions Show diff stats
stim/cuda/cuda_texture.cuh
stim/cuda/filter.cuh
stim/cuda/ivote/down_sample.cuh
stim/gl/gl_spider.h
stim/math/matrix.h
@@ -134,15 +134,15 @@ namespace stim
 		void
 		UnmapCudaTexture()
 		{
-			HANDLE_ERROR(
-				cudaGraphicsUnmapResources(1, &resource)
-			);
-			HANDLE_ERROR(
-				cudaGraphicsUnregisterResource(resource)
-			);	
-			HANDLE_ERROR(
-				cudaDestroyTextureObject(tObj)
-			);
+		//	HANDLE_ERROR(
+		//		cudaGraphicsUnmapResources(1, &resource)
+		//	);
+		//	HANDLE_ERROR(
+		//		cudaGraphicsUnregisterResource(resource)
+		//	);	
+		//	HANDLE_ERROR(
+		//		cudaDestroyTextureObject(tObj)
+		//	);
 //			HANDLE_ERROR(
 //				cudaFreeArray(srcArray)
 //			);
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <stim/visualization/colormap.h>
 #include <sstream>
+#include <stim/math/constants.h>
 #include <stim/cuda/cudatools/devices.h>
 #include <stim/cuda/cudatools/threads.h>
 #include <stim/cuda/cuda_texture.cuh>
@@ -14,7 +15,6 @@
 #include <stim/cuda/arraymath.cuh>
  
 #define IMAD(a,b,c) ( __mul24((a), (b)) + (c) )
-#define M_PI 3.141592654f
  
  
 namespace stim
@@ -73,7 +73,7 @@ namespace stim
 				idx = j*kl+i;
 				x = i - kr - 0.5;
 				y = j - kr - 0.5;
-				LoG[idx] = (-1.0/M_PI/powf(sigma, 4))* (1 - (powf(x,2)+powf(y,2))/2.0/powf(sigma, 2))
+				LoG[idx] = (-1.0/PI/powf(sigma, 4))* (1 - (powf(x,2)+powf(y,2))/2.0/powf(sigma, 2))
 						*expf(-(powf(x,2)+powf(y,2))/2/powf(sigma,2));	
 				t +=LoG[idx];
 			}
@@ -98,7 +98,7 @@ namespace stim
 		int y = blockIdx.y;
 		int xi = threadIdx.x;
 		int yi = threadIdx.y;
-		float val = 0;
+	//	float val = 0;
 		float tu = (x-kr+xi)/(float)DIM_X;
 		float tv = (y-kr+yi)/(float)DIM_Y;
 		shared[xi][yi] = gpuLoG[yi*kl+xi]*(255.0-(float)tex2D<unsigned char>(texIn, tu, tv));
@@ -111,7 +111,7 @@ namespace stim
 		//y = min(y, height - 1);
  
 		int idx = y*DIM_X+x;
-		int k_idx;
+	//	int k_idx;
                 for(unsigned int step = blockDim.x/2; step >= 1; step >>= 1)
                 {
                         __syncthreads();
@@ -44,7 +44,7 @@ namespace stim{
 			unsigned int y_ds = (y/sigma_ds + (y %sigma_ds == 0 ? 0:1));
  
 			//get the number of pixels in the image
-			unsigned int pixels_ds = x_ds * y_ds;
+//			unsigned int pixels_ds = x_ds * y_ds;
  
 			unsigned int max_threads = stim::maxThreadsPerBlock();
 			dim3 threads(max_threads, 1);
@@ -97,4 +97,4 @@ namespace stim{
 	}
 }
  
-#endif
 \ No newline at end of file
+#endif
@@ -14,6 +14,7 @@
 #include <stim/math/vec3.h>
 #include <stim/math/rect.h>
 #include <stim/math/matrix.h>
+#include <stim/math/constants.h>
 #include <stim/cuda/spider_cost.cuh>
 #include <stim/cuda/cudatools/glbind.h>
 #include <stim/cuda/arraymath.cuh>
@@ -369,7 +370,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		///Stored in a display list.
 		///uses the default d vector <0,0,1>
 		void
-		genDirectionVectors(float solidAngle = 5/M_PI*4)
+		genDirectionVectors(float solidAngle = M_PI/2)
 		{
  
 			//Set up the vectors necessary for Rectangle creation.
@@ -584,7 +585,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 			glDeleteFramebuffers(1, &framebufferID);
 			glGenFramebuffers(1, &framebufferID);
 			glBindFramebuffer(GL_FRAMEBUFFER, framebufferID);
-			int numChannels = 1;
+//			int numChannels = 1;
 //			unsigned char* texels = new unsigned char[width * height * numChannels];
 			glGenTextures(1, &textureID);
 			glBindTexture(GL_TEXTURE_2D, textureID);
@@ -609,7 +610,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		{
 			glGenFramebuffers(1, &fboID);
 			glBindFramebuffer(GL_FRAMEBUFFER, fboID);
-			int numChannels = 1;
+//			int numChannels = 1;
 //			unsigned char* texels = new unsigned char[width * height * numChannels];
 			glGenTextures(1, &texbufferID);
 			glBindTexture(GL_TEXTURE_2D, texbufferID);
@@ -938,7 +939,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 			network_time = 0;
 			hit_time = 0;
 #endif
-			stepsize = 3.0;
+			stepsize = 2.5;
 			t_length = 16.0;
  
 			srand(100);	
@@ -1386,7 +1387,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		void
 		MonteCarloDirectionVectors(int nSamples, float solidAngle = 2*M_PI)
 		{
-			float PHI[2], Z[2], range;
+			float PHI[2], Z[2];
 			PHI[0] = asin(solidAngle/2);
 			PHI[1] = asin(0);
  
@@ -1396,9 +1397,6 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
  
 			range = Z[0] - Z[1];
  
-
-			float z, theta, phi;
-			
 			std::vector<stim::vec3<float> > vecsUni;
 			for(int i = 0; i < numSamplesPos; i++)
 			{
@@ -1490,8 +1488,6 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		void
 		trace(int min_cost)
 		{	
-			bool sEmpty = true;
-			float lastmag = 16.0;;
 			stim::vec3<float> curSeed; 
 			stim::vec3<float> curSeedVec;			
 			float curSeedMag;
@@ -1527,7 +1523,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 				gpuStartTimer();
 			#endif
  
-			float s = 3.0;
+//			float s = 3.0;
 			GLuint selectBuf[2048];
 			GLint hits;
 			glSelectBuffer(2048, selectBuf);
@@ -1541,17 +1537,17 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 			CHECK_OPENGL_ERROR
 		//What would that vessel see in front of it.
 				camSel.setPosition(loc);
-				camSel.setFocalDistance(mag/s);
-				camSel.LookAt((loc[0]+dir[0]*mag/s),
-					 (loc[1]+dir[1]*mag/s),
-					 (loc[2]+dir[2]*mag/s));
+				camSel.setFocalDistance(mag/stepsize);
+				camSel.LookAt((loc[0]+dir[0]*mag/stepsize),
+					 (loc[1]+dir[1]*mag/stepsize),
+					 (loc[2]+dir[2]*mag/stepsize));
 				ps  = camSel.getPosition();
 				ups = camSel.getUp();
 				ds  = camSel.getLookAt();
 				glMatrixMode(GL_PROJECTION);
 				glPushMatrix();
 				glLoadIdentity();
-				glOrtho(-mag/s/2.0, mag/s/2.0, -mag/s/2.0, mag/s/2.0, 0.0, mag/s/2.0);
+				glOrtho(-mag/stepsize/2.0, mag/stepsize/2.0, -mag/stepsize/2.0, mag/stepsize/2.0, 0.0, mag/stepsize/2.0);
 				glMatrixMode(GL_MODELVIEW);
 				glPushMatrix();
 				glLoadIdentity();
@@ -1597,21 +1593,11 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		int
 		processHits(GLint hits, GLuint buffer[])
 		{
-			GLuint names, *ptr;
-			//printf("hits = %u\n", hits);
+			GLuint *ptr;
 			ptr = (GLuint *) buffer;
-		//	for (int i = 0; i < hits; i++) { /*  for each hit  */
-			names = *ptr;
-		//		printf (" number of names for hit = %u\n", names);
 			ptr++;
 			ptr++; //Skip the minimum depth value.  
 			ptr++; //Skip the maximum depth value.
-		//		printf ("   the name is ");                                                        
-		//		for (int j = 0; j < names; j++) {     /*  for each name */
-		//			printf ("%u ", *ptr); ptr++;
-		//		}
-		//		printf ("\n");
-	//		}
  
  
 			if(hits == 0)
@@ -1675,11 +1661,18 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 			}		
  
 			#ifdef TIMING
-				double network_time = (std::clock() - s) / (double) CLOCKS_PER_SEC;
-				network_time += network_time * 1000.0;
+				double nt = (std::clock() - s) / (double) CLOCKS_PER_SEC;
+				network_time += nt * 1000.0;
 			#endif
 		}
  
+//		void
+//		addToNetwork(pair<stim::fiber<float>, int> in, stim::vec3<float> spos, 
+//				stim::vec<float> smag, stim::vec3<float> sdir)
+//		{
+//
+//		}
+
  
 		void
 		printSizes()
@@ -1783,9 +1776,6 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
                  		}
          		}
 		}
-
-			
-
 };
 }
 #endif
@@ -53,13 +53,13 @@ struct matrix
  
 	template<typename Y>
 	vec<Y> operator*(vec<Y> rhs){
-		unsigned int N = rhs.size();
+		unsigned int M = rhs.size();
  
 		vec<Y> result;
-		result.resize(N);
+		result.resize(M);
  
-		for(int r=0; r<N; r++)
-			for(int c=0; c<N; c++)
+		for(int r=0; r<M; r++)
+			for(int c=0; c<M; c++)
 				result[r] += (*this)(r, c) * rhs[c];
  
 		return result;