diff TaskManager/Cuda/CudaScheduler.h @ 1925:cd5bbd8ec5d6 draft

fix CudaScheduler
author Shohei KOKUBO <e105744@ie.u-ryukyu.ac.jp>
date Fri, 31 Jan 2014 05:56:23 +0900
parents 14f9fc88872c
children 4eefec26e3e2
line wrap: on
line diff
--- a/TaskManager/Cuda/CudaScheduler.h	Thu Jan 30 16:22:51 2014 +0900
+++ b/TaskManager/Cuda/CudaScheduler.h	Fri Jan 31 05:56:23 2014 +0900
@@ -7,8 +7,6 @@
 #include "HTask.h"
 #include "TaskManager.h"
 #include <cuda.h>
-#include <cuda_runtime.h>
-
 
 extern TaskObject cuda_task_list[MAX_TASK_OBJECT];
 
@@ -34,7 +32,7 @@
     // Cuda の場合、NVIDIA だけなので必要ない?
     CUdevice device;
     unsigned int ret_num_platforms; // たぶん要らない
-    unsigned int ret_num_devices;
+    int ret_num_devices;
     CUcontext context;
     // command_queue command_queue;
     // Cuda には command_queue に相当するものはない
@@ -47,14 +45,14 @@
     CUfunction kernel[2];
     CUevent kernel_event[2];
     CudaBuffer* cudabuffer;
-    HTask::htask_flag[2];
+    HTask::htask_flag flag[2];
     
- privete:
+ private:
     int load_kernel(int cmd);
-    CUdeviceptr createBuffer(CudaBufferPtr m, int i, CUcontext context, /* mem_flag mem_flag, */size_t size, int* error);
+    CUdeviceptr createBuffer(CudaBufferPtr cudabuffer, CUdeviceptr* mem, int i, size_t size, int* error);
     void initCudaBuffer(CudaBufferPtr m);
     void destroyCudaBuffer(CudaBufferPtr m);
-    void CudaTaskError(int cur, TaskListPtr taskList, int ret);
+    void CudaTaskError(CudaBufferPtr cudabuffer, int cur, TaskListPtr taskList, int ret);
 };
 
 #define CudaSchedRegister(str, filename, functionname)  \