Mercurial > hg > Game > Cerium

changeset 1730:2e8931baef7f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix fft
author Shohei KOKUBO <e105744@ie.u-ryukyu.ac.jp>
date Thu, 31 Oct 2013 21:06:09 +0900
parents e9dc25836520
children dc7dd1eaf6de
files TaskManager/test/UtilizationTest/Func.h TaskManager/test/UtilizationTest/main.cc TaskManager/test/UtilizationTest/multiply example/fft/Makefile.gpu example/fft/Makefile.macosx
diffstat 5 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/test/UtilizationTest/Func.h	Wed Oct 30 19:31:05 2013 +0900
+++ b/TaskManager/test/UtilizationTest/Func.h	Thu Oct 31 21:06:09 2013 +0900
@@ -4,4 +4,4 @@
     MULTIPLY_TASK1,
 };
 
-#define DATA_NUM 10000000
+#define DATA_NUM 10000
--- a/TaskManager/test/UtilizationTest/main.cc	Wed Oct 30 19:31:05 2013 +0900
+++ b/TaskManager/test/UtilizationTest/main.cc	Thu Oct 31 21:06:09 2013 +0900
@@ -76,7 +76,6 @@
     long task_id = 0;
     HTask *multiply = manager->create_task(MULTIPLY_TASK);
     multiply->set_cpu((CPU_TYPE)((int)SPE_ANY));
-
     multiply->set_inData(0,(memaddr)A, sizeof(float)*length);
     multiply->set_inData(1,(memaddr)B, sizeof(float)*length);
     multiply->set_param(0,task_id++);
Binary file TaskManager/test/UtilizationTest/multiply has changed
--- a/example/fft/Makefile.gpu	Wed Oct 30 19:31:05 2013 +0900
+++ b/example/fft/Makefile.gpu	Thu Oct 31 21:06:09 2013 +0900
@@ -6,10 +6,10 @@
 OBJS = $(SRCS:.cc=.o)
 
 GPU_TASK_DIR  = gpu
-TASK_DIR = ppe
-TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
+#TASK_DIR = ppe
+#TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
 TASK_SRCS_EXCLUDE = 
-TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP)) $(wildcard $(GPU_TASK_DIR)/*.cc)
+TASK_SRCS = $(filter-out $(GPU_TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP)) $(wildcard $(GPU_TASK_DIR)/*.cc)
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
 CC += $(ABI)
--- a/example/fft/Makefile.macosx	Wed Oct 30 19:31:05 2013 +0900
+++ b/example/fft/Makefile.macosx	Thu Oct 31 21:06:09 2013 +0900
@@ -6,7 +6,6 @@
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
 OBJS = $(SRCS:.cc=.o)
 
-#GPU_TASK_DIR = gpu
 TASK_DIR  = ppe
 TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
 TASK_SRCS_EXCLUDE =