Commit 0eb5488d84abf5e7151e91959edc2a36cbf0fe47

Authored by Arnaud Blanchard
1 parent effd4e2f

Rename f_conv to f_convolute

@@ -6,10 +6,11 @@ subdirs(i_gaussian) @@ -6,10 +6,11 @@ subdirs(i_gaussian)
6 subdirs(i_read) 6 subdirs(i_read)
7 subdirs(i_oscillator) 7 subdirs(i_oscillator)
8 subdirs(i_keyboard) 8 subdirs(i_keyboard)
9 -subdirs(f_conv)  
10 -#subdirs(f_convert) //not yet working 9 +subdirs(f_convolute)
11 subdirs(f_norm) 10 subdirs(f_norm)
12 subdirs(f_max) 11 subdirs(f_max)
13 subdirs(f_point_of_interest) 12 subdirs(f_point_of_interest)
14 -subdirs(f_filter) 13 +subdirs(f_tee)
  14 +subdirs(f_arg_max)
  15 +
15 16
@@ -2,15 +2,15 @@ @@ -2,15 +2,15 @@
2 cmake_minimum_required(VERSION 2.6) 2 cmake_minimum_required(VERSION 2.6)
3 3
4 # Set the name of the project as the directory basename 4 # Set the name of the project as the directory basename
5 -project(f_conv) 5 +project(f_convolute)
6 6
7 find_package(blc_channel) 7 find_package(blc_channel)
8 find_package(blc_program) 8 find_package(blc_program)
9 9
10 add_definitions(${BL_DEFINITIONS}) 10 add_definitions(${BL_DEFINITIONS})
11 include_directories(${BL_INCLUDE_DIRS}) 11 include_directories(${BL_INCLUDE_DIRS})
12 -add_executable(f_conv f_conv.cpp)  
13 -target_link_libraries(f_conv ${BL_LIBRARIES}) 12 +add_executable(f_convolute f_convolute.cpp)
  13 +target_link_libraries(f_convolute ${BL_LIBRARIES})
14 14
15 15
16 16
@@ -45,7 +45,7 @@ int main(int argc, char **argv){ @@ -45,7 +45,7 @@ int main(int argc, char **argv){
45 if (input.dims_nb!=2) EXIT_ON_ARRAY_ERROR(&input, "It works only in 2D for now"); 45 if (input.dims_nb!=2) EXIT_ON_ARRAY_ERROR(&input, "It works only in 2D for now");
46 iwidth=input.dims[0].length; 46 iwidth=input.dims[0].length;
47 iheight=input.dims[1].length; 47 iheight=input.dims[1].length;
48 - blc_loop_try_add_waiting_semaphore(input.sem_new_data); 48 + blc_loop_try_add_waiting_semaphore(input.sem_new_data);
49 blc_loop_try_add_posting_semaphore(input.sem_ack_data); 49 blc_loop_try_add_posting_semaphore(input.sem_ack_data);
50 50
51 kernel.open(kernel_name, BLC_CHANNEL_READ); 51 kernel.open(kernel_name, BLC_CHANNEL_READ);