Mercurial > hg > Game > Cerium
changeset 1675:07ff7ec2a61b draft
fix fft
| author | Shohei KOKUBO <e105744@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 23 Jul 2013 15:46:57 +0900 |
| parents | 614c60736bfd |
| children | 342c36d5582e |
| files | TaskManager/test/SetCpuTest/main.cc example/fft/Makefile example/fft/Makefile.macosx example/fft/main.cc example/fft/output.pgm |
| diffstat | 5 files changed, 26 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/test/SetCpuTest/main.cc Mon Jul 22 18:56:50 2013 +0900 +++ b/TaskManager/test/SetCpuTest/main.cc Tue Jul 23 15:46:57 2013 +0900 @@ -83,7 +83,7 @@ print_data(indata, length, "before"); - HTaskPtr twice = manager->create_task(Twice); + HTaskPtr twice = manager->create_task(twice); twice->set_param(0, (memaddr)length); twice->set_inData(0, indata, sizeof (int)*length); //int *n = new int[1];
--- a/example/fft/Makefile Mon Jul 22 18:56:50 2013 +0900 +++ b/example/fft/Makefile Tue Jul 23 15:46:57 2013 +0900 @@ -20,9 +20,12 @@ @echo "Make for OpenCL" @$(MAKE) -f Makefile.gpu +test: FORCE + @$(MAKE) -f Makefile.macosx hoge + FORCE: clean: @$(MAKE) -f Makefile.macosx clean @$(MAKE) -f Makefile.linux clean - @$(MAKE) -f Makefile.cell clean \ No newline at end of file + @$(MAKE) -f Makefile.cell clean
--- a/example/fft/Makefile.macosx Mon Jul 22 18:56:50 2013 +0900 +++ b/example/fft/Makefile.macosx Tue Jul 23 15:46:57 2013 +0900 @@ -32,6 +32,25 @@ link: $(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS) +hoge: + cpus=0;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=1;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=2;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=3;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=4;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=5;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=6;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=7;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=8;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=9;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=10;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=11;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=12;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=13;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=14;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=15;./$(TARGET) -file lena.pgm -cpu $$cpus + cpus=16;./$(TARGET) -file lena.pgm -cpu $$cpus + debug: $(TARGET) sudo gdb ./$(TARGET)
--- a/example/fft/main.cc Mon Jul 22 18:56:50 2013 +0900 +++ b/example/fft/main.cc Tue Jul 23 15:46:57 2013 +0900 @@ -292,6 +292,6 @@ { ed_time = getTime(); output(); - fprintf(stdout, "image out put succeeded.\n"); - printf("Time: %0.6f\n",ed_time-st_time); + // fprintf(stdout, "image out put succeeded.\n"); + printf("%0.6f\n",ed_time-st_time); }