replace all the openGL by openCV and fix some error

yanqswhu · Nov 30, 2017 · 897febf · 897febf
1 parent 00b906f
commit 897febf
Show file tree

Hide file tree

Showing 34 changed files with 349 additions and 8,626 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "xiosbase": "cpp",
+        "xlocale": "cpp"
+    }
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,21 +8,14 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 #outpath
 SET(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin")  
 
-#Find GLUT
-find_package(GLUT REQUIRED)
-include_directories(${GLUT_INCLUDE_DIRS})
-link_directories(${GLUT_LIBRARY_DIRS})
-if(NOT GLUT_FOUND)
-    message(ERROR " GLUT not found!")
-endif(NOT GLUT_FOUND)
+#Find OpenCV
+find_package(OpenCV REQUIRED)
+include_directories(${OpenCV_INCLUDE_DIRS})
+link_directories(${OpenCV_LIBRARY_DIRS})
+if(NOT OpenCV_FOUND)
+    message(ERROR " OpenCV not found!")
+endif(NOT OpenCV_FOUND)
 
-#Find OpenGL
-find_package(OpenGL REQUIRED)
-include_directories(${OpenGL_INCLUDE_DIRS})
-link_directories(${OpenGL_LIBRARY_DIRS})
-if(NOT OPENGL_FOUND)
-    message(ERROR " OPENGL not found!")
-endif(NOT OPENGL_FOUND)
 
 #CUDA
 find_package(CUDA)

diff --git a/bin/glut32.dll b/bin/glut32.dll
diff --git a/bin/glut64.dll b/bin/glut64.dll
diff --git a/chapter04/CMakeLists.txt b/chapter04/CMakeLists.txt
@@ -12,8 +12,8 @@ SET_PROPERTY(TARGET add_loop_long  PROPERTY FOLDER chapter04)
 
 CUDA_ADD_EXECUTABLE(julia_cpu julia_cpu.cu)
 SET_PROPERTY(TARGET julia_cpu  PROPERTY FOLDER chapter04)
-TARGET_LINK_LIBRARIES(julia_cpu ${GLUT_LIBRARY})
+TARGET_LINK_LIBRARIES(julia_cpu ${OpenCV_LIBS})
 
 CUDA_ADD_EXECUTABLE(julia_gpu julia_gpu.cu)
 SET_PROPERTY(TARGET julia_gpu  PROPERTY FOLDER chapter04)
-TARGET_LINK_LIBRARIES(julia_gpu ${GLUT_LIBRARY})
+TARGET_LINK_LIBRARIES(julia_gpu ${OpenCV_LIBS})
diff --git a/chapter04/julia_cpu.cu b/chapter04/julia_cpu.cu
@@ -15,7 +15,7 @@
 
 
 #include "../common/book.h"
-#include "../common/cpu_bitmap.h"
+#include "../common/image.h"
 
 #define DIM 1000
 
@@ -65,11 +65,11 @@ void kernel( unsigned char *ptr ){
  }
 
 int main( void ) {
-    CPUBitmap bitmap( DIM, DIM );
+    IMAGE bitmap( DIM, DIM );
     unsigned char *ptr = bitmap.get_ptr();
 
     kernel( ptr );
 
-    bitmap.display_and_exit();
+    bitmap.show_image();
 }
 
diff --git a/chapter04/julia_gpu.cu b/chapter04/julia_gpu.cu
@@ -15,7 +15,7 @@
 
 
 #include "../common/book.h"
-#include "../common/cpu_bitmap.h"
+#include "../common/image.h"
 
 #define DIM 1000
 
@@ -73,7 +73,7 @@ struct DataBlock {
 
 int main( void ) {
     DataBlock   data;
-    CPUBitmap bitmap( DIM, DIM, &data );
+    IMAGE bitmap( DIM, DIM );
     unsigned char    *dev_bitmap;
 
     HANDLE_ERROR( cudaMalloc( (void**)&dev_bitmap, bitmap.image_size() ) );
@@ -88,6 +88,6 @@ int main( void ) {
 
     HANDLE_ERROR( cudaFree( dev_bitmap ) );
 
-    bitmap.display_and_exit();
+    bitmap.show_image();
 }
 
diff --git a/chapter05/CMakeLists.txt b/chapter05/CMakeLists.txt
@@ -12,8 +12,8 @@ SET_PROPERTY(TARGET dot_5 PROPERTY FOLDER chapter05)
 
 CUDA_ADD_EXECUTABLE(ripple_5 ripple.cu)
 SET_PROPERTY(TARGET ripple_5  PROPERTY FOLDER chapter05)
-TARGET_LINK_LIBRARIES(ripple_5 ${GLUT_LIBRARY})
+TARGET_LINK_LIBRARIES(ripple_5 ${OpenCV_LIBS})
 
 CUDA_ADD_EXECUTABLE(shared_bitmap shared_bitmap.cu)
 SET_PROPERTY(TARGET shared_bitmap  PROPERTY FOLDER chapter05)
-TARGET_LINK_LIBRARIES(shared_bitmap ${GLUT_LIBRARY})
+TARGET_LINK_LIBRARIES(shared_bitmap ${OpenCV_LIBS})
diff --git a/chapter05/ripple.cu b/chapter05/ripple.cu
@@ -16,7 +16,7 @@
 
 #include "cuda.h"
 #include "../common/book.h"
-#include "../common/cpu_anim.h"
+#include "../common/image.h"
 
 #define DIM 1024
 #define PI 3.1415926535897932f
@@ -42,19 +42,9 @@ __global__ void kernel( unsigned char *ptr, int ticks ) {
 
 struct DataBlock {
     unsigned char   *dev_bitmap;
-    CPUAnimBitmap  *bitmap;
+    IMAGE  *bitmap;
 };
 
-void generate_frame( DataBlock *d, int ticks ) {
-    dim3    blocks(DIM/16,DIM/16);
-    dim3    threads(16,16);
-    kernel<<<blocks,threads>>>( d->dev_bitmap, ticks );
-
-    HANDLE_ERROR( cudaMemcpy( d->bitmap->get_ptr(),
-                              d->dev_bitmap,
-                              d->bitmap->image_size(),
-                              cudaMemcpyDeviceToHost ) );
-}
 
 // clean up memory allocated on the GPU
 void cleanup( DataBlock *d ) {
@@ -63,12 +53,35 @@ void cleanup( DataBlock *d ) {
 
 int main( void ) {
     DataBlock   data;
-    CPUAnimBitmap  bitmap( DIM, DIM, &data );
+    IMAGE  bitmap( DIM, DIM );
     data.bitmap = &bitmap;
 
     HANDLE_ERROR( cudaMalloc( (void**)&data.dev_bitmap,
                               bitmap.image_size() ) );
 
-    bitmap.anim_and_exit( (void (*)(void*,int))generate_frame,
-                            (void (*)(void*))cleanup );
+    dim3    blocks(DIM/16,DIM/16);
+    dim3    threads(16,16);
+
+    int ticks = 0;
+    bitmap.show_image(30);
+    while(1)
+    {
+        kernel<<<blocks,threads>>>( data.dev_bitmap, ticks );
+
+        HANDLE_ERROR( cudaMemcpy( data.bitmap->get_ptr(),
+                            data.dev_bitmap,
+                            data.bitmap->image_size(),
+                            cudaMemcpyDeviceToHost ) );
+
+        ticks++;
+        char key = bitmap.show_image(30);
+        if(key==27)
+        {
+            break;
+        }
+    }
+
+	cleanup(&data);
+
+	return 0;
 }
diff --git a/chapter05/shared_bitmap.cu b/chapter05/shared_bitmap.cu
@@ -16,7 +16,7 @@
 
 #include "cuda.h"
 #include "../common/book.h"
-#include "../common/cpu_bitmap.h"
+#include "../common/image.h"
 
 #define DIM 1024
 #define PI 3.1415926535897932f
@@ -53,7 +53,7 @@ struct DataBlock {
 
 int main( void ) {
     DataBlock   data;
-    CPUBitmap bitmap( DIM, DIM, &data );
+    IMAGE bitmap( DIM, DIM );
     unsigned char    *dev_bitmap;
 
     HANDLE_ERROR( cudaMalloc( (void**)&dev_bitmap,
@@ -70,7 +70,7 @@ int main( void ) {
 
     HANDLE_ERROR( cudaFree( dev_bitmap ) );
 
-    bitmap.display_and_exit();
+    bitmap.show_image();
 }
 
 
diff --git a/chapter06/CMakeLists.txt b/chapter06/CMakeLists.txt
@@ -2,8 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 
 CUDA_ADD_EXECUTABLE(ray_noconst ray_noconst.cu)
 SET_PROPERTY(TARGET ray_noconst  PROPERTY FOLDER chapter06)
-TARGET_LINK_LIBRARIES(ray_noconst ${GLUT_LIBRARY})
+TARGET_LINK_LIBRARIES(ray_noconst ${OpenCV_LIBS})
 
 CUDA_ADD_EXECUTABLE(ray ray.cu)
 SET_PROPERTY(TARGET ray  PROPERTY FOLDER chapter06)
-TARGET_LINK_LIBRARIES(ray ${GLUT_LIBRARY})
+TARGET_LINK_LIBRARIES(ray ${OpenCV_LIBS})
diff --git a/chapter06/ray.cu b/chapter06/ray.cu
@@ -16,7 +16,7 @@
 
 #include "cuda.h"
 #include "../common/book.h"
-#include "../common/cpu_bitmap.h"
+#include "../common/image.h"
 
 #define DIM 1024
 
@@ -83,7 +83,7 @@ int main( void ) {
     HANDLE_ERROR( cudaEventCreate( &stop ) );
     HANDLE_ERROR( cudaEventRecord( start, 0 ) );
 
-    CPUBitmap bitmap( DIM, DIM, &data );
+    IMAGE bitmap( DIM, DIM );
     unsigned char   *dev_bitmap;
 
     // allocate memory on the GPU for the output bitmap
@@ -130,6 +130,6 @@ int main( void ) {
     HANDLE_ERROR( cudaFree( dev_bitmap ) );
 
     // display
-    bitmap.display_and_exit();
+    bitmap.show_image();
 }
 
diff --git a/chapter06/ray_noconst.cu b/chapter06/ray_noconst.cu
@@ -16,7 +16,7 @@
 
 #include "cuda.h"
 #include "../common/book.h"
-#include "../common/cpu_bitmap.h"
+#include "../common/image.h"
 
 #define DIM 1024
 
@@ -84,7 +84,7 @@ int main( void ) {
     HANDLE_ERROR( cudaEventCreate( &stop ) );
     HANDLE_ERROR( cudaEventRecord( start, 0 ) );
 
-    CPUBitmap bitmap( DIM, DIM, &data );
+    IMAGE bitmap( DIM, DIM);
     unsigned char   *dev_bitmap;
     Sphere          *s;
 
@@ -138,6 +138,6 @@ int main( void ) {
     HANDLE_ERROR( cudaFree( s ) );
 
     // display
-    bitmap.display_and_exit();
+    bitmap.show_image();
 }
 
diff --git a/chapter07/CMakeLists.txt b/chapter07/CMakeLists.txt
@@ -2,8 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 
 CUDA_ADD_EXECUTABLE(heat_2d heat_2d.cu)
 SET_PROPERTY(TARGET heat_2d  PROPERTY FOLDER chapter07)
-TARGET_LINK_LIBRARIES(heat_2d ${GLUT_LIBRARY})
+TARGET_LINK_LIBRARIES(heat_2d ${OpenCV_LIBS})
 
 CUDA_ADD_EXECUTABLE(heat_7 heat.cu)
 SET_PROPERTY(TARGET heat_7  PROPERTY FOLDER chapter07)
-TARGET_LINK_LIBRARIES(heat_7 ${GLUT_LIBRARY})
+TARGET_LINK_LIBRARIES(heat_7 ${OpenCV_LIBS})