Mercurial > hg > Game > Cerium

changeset 1558:69ded0c49aef draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add fft ppe example
author Shohei KOKUBO <e105744@ie.u-ryukyu.ac.jp>
date Sat, 09 Mar 2013 21:21:56 +0900
parents 786ab4ad682e
children c60caac2f345
files example/fft/Makefile.macosx example/fft/task_init.cc
diffstat 2 files changed, 13 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/example/fft/Makefile.macosx	Sat Mar 09 21:15:23 2013 +0900
+++ b/example/fft/Makefile.macosx	Sat Mar 09 21:21:56 2013 +0900
@@ -2,13 +2,13 @@
 
 
 SRCS_TMP = $(wildcard *.cc)
-SRCS_EXCLUDE = sort-compat.cc sort_test.cc # 除外するファイルを書く
+SRCS_EXCLUDE = # 除外するファイルを書く
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
 OBJS = $(SRCS:.cc=.o)
 
 TASK_DIR  = ppe
 TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
-TASK_SRCS_EXCLUDE = sort_test.cc
+TASK_SRCS_EXCLUDE =
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
--- a/example/fft/task_init.cc	Sat Mar 09 21:15:23 2013 +0900
+++ b/example/fft/task_init.cc	Sat Mar 09 21:21:56 2013 +0900
@@ -3,29 +3,28 @@
 #include "GpuScheduler.h"
 
 #ifndef __CERIUM_GPU__
-SchedExternTask(spinfact);
-SchedExternTask(bitreverse);
-SchedExternTask(normalization);
+SchedExternTask(spinFact);
+SchedExternTask(bitReverse);
+SchedExternTask(norm);
 SchedExternTask(butterfly);
 SchedExternTask(transpose);
-SchedExternTask(highpassfilter);
+SchedExternTask(highPassFilter);
 #endif // not __CERIUM_GPU__
 
 void
 task_init(void)
 {
 #ifdef __CERIUM_GPU__
-    GpuSchedRegister(SPIN_FACT, "gpu/spinFact.cl", "spinFact");
-    GpuSchedRegister(BIT_REVERSE, "gpu/bitReverse.cl", "bitReverse");
-    GpuSchedRegister(NORMALIZATION, "gpu/norm.cl", "norm");
-    GpuSchedRegister(BUTTERFLY, "gpu/butterfly.cl", "butterfly");
-    GpuSchedRegister(TRANSEPOSE, "gpu/transpose.cl", "transpose");
-    GpuSchedRegister(HIGH_PASS_FILTER, "gpu/passFilter.cl", "highPassFilter");
+    GpuSchedRegister(SPIN_FACT, "gpu/fft.cl", "spinFact");
+    GpuSchedRegister(BIT_REVERSE, "gpu/fft.cl", "bitReverse");
+    GpuSchedRegister(NORMALIZATION, "gpu/fft.cl", "norm");
+    GpuSchedRegister(BUTTERFLY, "gpu/fft.cl", "butterfly");
+    GpuSchedRegister(TRANSEPOSE, "gpu/fft.cl", "transpose");
+    GpuSchedRegister(HIGH_PASS_FILTER, "gpu/fft.cl", "highPassFilter");
 #else
-    SchedRegisterTask(QUICK_SORT, QuickSort);
     SchedRegisterTask(SPIN_FACT,spinFact);
+    SchedRegisterTask(NORMALIZATION, norm);
     SchedRegisterTask(BIT_REVERSE, bitReverse);
-    SchedRegisterTask(NORMALIZATION, norm);
     SchedRegisterTask(BUTTERFLY, butterfly);
     SchedRegisterTask(TRANSEPOSE, transpose);
     SchedRegisterTask(HIGH_PASS_FILTER, highPassFilter);