Mercurial > hg > Game > Cerium
changeset 1572:0bd4598f5a65 draft
merge
| author | Shohei KOKUBO <e105744@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 18 Mar 2013 15:34:19 +0900 |
| parents | 9832a5eb2027 |
| children | 2a8826934b03 |
| files | example/multiply/main.cc |
| diffstat | 1 files changed, 0 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/example/multiply/main.cc Mon Mar 18 15:28:54 2013 +0900 +++ b/example/multiply/main.cc Mon Mar 18 15:34:19 2013 +0900 @@ -71,20 +71,12 @@ } st_time = getTime(); -<<<<<<< local - ND_RANGE_T_PTR ndr = new ND_RANGE_T; - ndr->dimension = 1; - ndr->gws[0] = length; ndr->gws[1] = 1; ndr->gws[2] = 1; - ndr->lws[0] = 1; ndr->lws[1] = 1; ndr->lws[2] = 1; - // manager->set_NDRange(ndr); -======= // set ND_RANGE parameter // 初期値は全部1になっている ndr = new ND_RANGE_T; ndr->gws[0] = length; manager->set_NDRange(ndr); ->>>>>>> other multiply = manager->create_task(MULTIPLY_TASK); multiply->nd_range();