Changeset: 4287d879f244 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4287d879f244
Modified Files:
monetdb5/extras/bwd/bwd.c
monetdb5/extras/bwd/cl_program_utilities.c
Branch: bwd
Log Message:
* merge
Unterschiede (31 Zeilen):
diff --git a/monetdb5/extras/bwd/bwd.c b/monetdb5/extras/bwd/bwd.c
--- a/monetdb5/extras/bwd/bwd.c
+++ b/monetdb5/extras/bwd/bwd.c
@@ -152,6 +152,7 @@ str bwdecomposeFK (Client cntxt, MalBlkP
str msg = getSQLContext(cntxt,mb, &m, NULL);
sql_trans *tr = m->session->tr;
node *nsch, *ntab, *ncol;
+ (void)msg;
assert(msg == MAL_SUCCEED);
for( nsch= tr->schemas.set->h; nsch; nsch= nsch->next){
diff --git a/monetdb5/extras/bwd/cl_program_utilities.c
b/monetdb5/extras/bwd/cl_program_utilities.c
--- a/monetdb5/extras/bwd/cl_program_utilities.c
+++ b/monetdb5/extras/bwd/cl_program_utilities.c
@@ -63,7 +63,6 @@ cl_program getZeroOutProgram(){
}
-
cl_program getMultiplyProgram(unsigned int approximationBits){
const char* sourceCode = "__kernel void project (\n"
"__global struct{int count; int base; unsigned char values[];}*
outputTail,\n"
@@ -215,7 +214,7 @@ cl_program getUSelectProgram(int type, c
" atomic_add(&(outputTail[2+outslot]), (delta >>
(approximationBits+outoffset-(8*sizeof(accessType)))));"
" atomic_add(&(outputTail[2+outslot+1]), (delta <<
(8*sizeof(accessType)-(outoffset+approximationBits-targetTypeBits))));"
" }else{"
- " atomic_add(&(outputTail[2+outslot]), (delta <<
(8*sizeof(accessType)-outoffset-approximationBits)));"
+ " atomic_add(&(outputTail[2+outslot]), (delta <<
(8*sizeof(accessType)-outoffset-approximationBits)));\n"
" }"
" }\n"
" }\n"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
