From ed825b377396b639dc0d86fe44bc0b36e29189f3 Mon Sep 17 00:00:00 2001 From: Tomasz Koziara Date: Fri, 13 Sep 2013 13:14:31 +0100 Subject: [PATCH 1/2] Uniform memory allocation fixed. --- examples/sort/sort.ispc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/sort/sort.ispc b/examples/sort/sort.ispc index 65df4736..5fc89d91 100644 --- a/examples/sort/sort.ispc +++ b/examples/sort/sort.ispc @@ -172,7 +172,7 @@ task void bumpup (uniform int h[], uniform int g[]) static void prefix_sum (uniform int num, uniform int h[]) { - uniform int * uniform g = uniform new int [num+1]; + uniform int * uniform g = uniform new uniform int [num+1]; uniform int i; launch[num] addup (h, g+1); @@ -191,9 +191,9 @@ export void sort_ispc (uniform int n, uniform unsigned int code[], uniform int o uniform int num = ntasks < 1 ? num_cores () : ntasks; uniform int span = n / num; uniform int hsize = 256*programCount*num; - uniform int * uniform hist = uniform new int [hsize]; - uniform int64 * uniform pair = uniform new int64 [n]; - uniform int64 * uniform temp = uniform new int64 [n]; + uniform int * uniform hist = uniform new uniform int [hsize]; + uniform int64 * uniform pair = uniform new uniform int64 [n]; + uniform int64 * uniform temp = uniform new uniform int64 [n]; uniform int pass, i; #if DEBUG From 97068765e884599afc4cc4b7187a4de4dd509b46 Mon Sep 17 00:00:00 2001 From: Tomasz Koziara Date: Sat, 14 Sep 2013 18:09:04 +0100 Subject: [PATCH 2/2] Copyright reversed. --- examples/sort/sort.cpp | 4 ++-- examples/sort/sort.ispc | 4 ++-- examples/sort/sort_serial.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/sort/sort.cpp b/examples/sort/sort.cpp index 1d05b247..4f402c75 100644 --- a/examples/sort/sort.cpp +++ b/examples/sort/sort.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, Intel Corporation + Copyright (c) 2013, Durham University All rights reserved. Redistribution and use in source and binary forms, with or without @@ -13,7 +13,7 @@ notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its + * Neither the name of Durham University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/examples/sort/sort.ispc b/examples/sort/sort.ispc index 5fc89d91..25ea90f4 100644 --- a/examples/sort/sort.ispc +++ b/examples/sort/sort.ispc @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, Intel Corporation + Copyright (c) 2013, Durham University All rights reserved. Redistribution and use in source and binary forms, with or without @@ -13,7 +13,7 @@ notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its + * Neither the name of Durham University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/examples/sort/sort_serial.cpp b/examples/sort/sort_serial.cpp index ba955c77..38bbdda6 100644 --- a/examples/sort/sort_serial.cpp +++ b/examples/sort/sort_serial.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, Intel Corporation + Copyright (c) 2013, Durham University All rights reserved. Redistribution and use in source and binary forms, with or without @@ -13,7 +13,7 @@ notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its + * Neither the name of Durham University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.