Commit 54dbd769 authored by Gaurav Kukreja's avatar Gaurav Kukreja

blah

Signed-off-by: Gaurav Kukreja's avatarGaurav Kukreja <gaurav@gauravk.in>
parent 0d8fa5a9
...@@ -34,7 +34,7 @@ using namespace std; ...@@ -34,7 +34,7 @@ using namespace std;
#define USING_GPU #define USING_GPU
template<typename T> template<typename T>
__device__ T gpu_min(T a, T b) __device__ T gpu_min(T a, T b)
{ {
if (a < b) if (a < b)
...@@ -43,7 +43,7 @@ __device__ T gpu_min(T a, T b) ...@@ -43,7 +43,7 @@ __device__ T gpu_min(T a, T b)
return b; return b;
} }
template<typename T> template<typename T>
__device__ T gpu_max(T a, T b) __device__ T gpu_max(T a, T b)
{ {
if (a < b) if (a < b)
...@@ -238,7 +238,7 @@ int main(int argc, char **argv) ...@@ -238,7 +238,7 @@ int main(int argc, char **argv)
// Display Kernel // Display Kernel
cv::Mat cvKernelOut(kw, kw, CV_32FC1); cv::Mat cvKernelOut(kw, kw, CV_32FC1);
convert_layered_to_mat(cvKernelOut, kernelOut); convert_layered_to_mat(cvKernelOut, kernelOut);
showImage("Kernel", cvKernelOut, 100, 100); showImage("Kernel", cvKernelOut, 100+2*w+80, 100);
// For camera mode: Make a loop to read in camera frames // For camera mode: Make a loop to read in camera frames
...@@ -269,7 +269,7 @@ int main(int argc, char **argv) ...@@ -269,7 +269,7 @@ int main(int argc, char **argv)
// ### TODO: Main computation // ### TODO: Main computation
// ### // ###
// ### // ###
#ifdef USING_GPU #ifdef USING_GPU
timer.start(); timer.start();
// Repetitions Loop // Repetitions Loop
...@@ -310,7 +310,7 @@ int main(int argc, char **argv) ...@@ -310,7 +310,7 @@ int main(int argc, char **argv)
timer.end(); timer.end();
t = timer.get(); t = timer.get();
#else // USING_GPU #else // USING_GPU
// CPU Implementation // CPU Implementation
timer.start(); timer.start();
...@@ -347,7 +347,7 @@ int main(int argc, char **argv) ...@@ -347,7 +347,7 @@ int main(int argc, char **argv)
timer.end(); timer.end();
t = timer.get(); // elapsed time in seconds t = timer.get(); // elapsed time in seconds
#endif #endif
cout << "time: " << t*1000 << " ms" << endl; cout << "time: " << t*1000 << " ms" << endl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment