Mercurial > hg > Game > Cerium

changeset 1637:a0014faececa draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix conflict set cpu
author Yuhi TOMARI <yuhi@cr.ie.u-ryukyu.ac.jp>
date Tue, 18 Jun 2013 13:18:37 +0900
parents e9cdaf7345d4
children aa967337bda2 9126622f75df
files TaskManager/kernel/schedule/Scheduler.cc example/multiply/main.cc
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/kernel/schedule/Scheduler.cc	Tue Jun 11 18:33:03 2013 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.cc	Tue Jun 18 13:18:37 2013 +0900
@@ -47,7 +47,7 @@
     task_list[i].gputask = new GpuTaskObject();
     
 #ifndef NOT_CHECK
-        entry_cmd[i] = NULL;
+    entry_cmd[i] = NULL;
 #endif
 
     }
--- a/example/multiply/main.cc	Tue Jun 11 18:33:03 2013 +0900
+++ b/example/multiply/main.cc	Tue Jun 18 13:18:37 2013 +0900
@@ -51,8 +51,6 @@
     for (int i = 1; argv[i]; ++i) {
         if (strcmp(argv[i], "--length") == 0 || strcmp(argv[i], "-l") == 0) {
             length = atoi(argv[++i]);
-        }else if (strcmp(argv[i], "-g") == 0) {
-            spe_cpu = GPU_0 ;
         } else if (strcmp(argv[i], "-t") == 0) {
             task = atoi(argv[++i]);
         }