# HG changeset patch # User Tatsuki IHA # Date 1466486278 -32400 # Node ID 0f0459653d77d001422a3f929f7d64773d740b69 # Parent d05b9937aa952256b1a8f8ef3a42677943ab77e5 Fix error diff -r d05b9937aa95 -r 0f0459653d77 src/CMakeLists.txt --- a/src/CMakeLists.txt Tue Jun 07 18:43:21 2016 +0900 +++ b/src/CMakeLists.txt Tue Jun 21 14:17:58 2016 +0900 @@ -4,7 +4,7 @@ set(CMAKE_VERBOSE_MAKEFILE 1) # set compiler -set(CMAKE_C_COMPILER cbclang) +set(CMAKE_C_COMPILER $ENV{CBC_COMPILER}) # compile option add_definitions("-Wall -g -O0") diff -r d05b9937aa95 -r 0f0459653d77 src/parallel_execution/CMakeLists.txt --- a/src/parallel_execution/CMakeLists.txt Tue Jun 07 18:43:21 2016 +0900 +++ b/src/parallel_execution/CMakeLists.txt Tue Jun 21 14:17:58 2016 +0900 @@ -3,8 +3,6 @@ # -DUSE_CUDA add_definitions("-Wall -g -O0") -set(CMAKE_C_COMPILER clang) - add_executable(twice main.c context.c diff -r d05b9937aa95 -r 0f0459653d77 src/parallel_execution/main.c --- a/src/parallel_execution/main.c Tue Jun 07 18:43:21 2016 +0900 +++ b/src/parallel_execution/main.c Tue Jun 21 14:17:58 2016 +0900 @@ -52,7 +52,7 @@ int i = loopCounter->i; if (i < length) { - printf("%d\n", array->array[i]); + //printf("%d\n", array->array[i]); if (array->array[i] == (i*2)) { loopCounter->i++; goto meta(context, Code2); @@ -143,7 +143,7 @@ goto (context->code[next])(context); } -__code createTask4(struct Context* context, struct LoopCounter* loopCounter, struct Task* task, struct Queue* waitMe, struct OdsQueue* waitI, struct Element* element, struct Queue* activeQueue) { +__code createTask4(struct Context* context, struct LoopCounter* loopCounter, struct Task* task, struct Queue* waitMe, struct Queue* waitI, struct Element* element, struct Queue* activeQueue) { int i = loopCounter->i; waitMe->first = 0; @@ -173,7 +173,7 @@ &context->data[LoopCounter]->loopCounter, &context->data[context->dataNum-2]->task, &context->data[context->dataNum-1]->queue, - &context->data[context->dataNum]->odsQueue, + &context->data[context->dataNum]->queue, &context->data[Element]->element, &context->data[ActiveQueue]->queue); }