Skip to content

Commit e6a9fbf

Browse files
temporaertemporaer
committed
FIX some tests weren't compiling, ctest did not depend built tests
also added cmake function to make testing adding tests easier.
1 parent 74c79fb commit e6a9fbf

File tree

9 files changed

+85
-127
lines changed

9 files changed

+85
-127
lines changed

‎src/0_mainpage.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
* $ ccmake . # adjust paths to your system (cuda, thrust, pyublas, ...)!
148148
* # turn on/off optional libraries (CImg, ...)
149149
* $ make -j
150+
* $ make -j buildtests
150151
* $ ctest # run tests to see if it went well
151152
* $ sudo make install
152153
* $ export PYTHONPATH=`pwd`/src # only if you want python bindings

‎src/cuv/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ set(CUV_SRC
2222
image_ops/move.cu
2323
image_ops/image_pyramid.cu
2424
tensor_ops/rprop.cu
25-
#libs/hog/hog.cu
25+
libs/hog/hog.cu
2626
libs/kernels/kernels.cu
2727
libs/separable_conv/separable_convolution.cu
2828
libs/opt/opt.cu
2929
libs/integral_image/integral_image.cu
3030
libs/nlmeans/conv3d.cu
31-
#libs/nlmeans/nlmeans.cu
31+
libs/nlmeans/nlmeans.cu
3232
libs/rbm/rbm.cu
3333
libs/kmeans/kmeans.cu
3434
convert/convert.cu

‎src/cuv/libs/hog/hog.cu

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@ namespace cuv{ namespace libs{ namespace hog{
180180
diff[0] = -0.5f;
181181
diff[1] = 0.f;
182182
diff[2] = 0.5f;
183-
cuv::libs::nlmeans::setConvolutionKernel_horizontal(diff);
184-
cuv::libs::nlmeans::setConvolutionKernel_vertical(diff);
183+
/*cuv::libs::nlmeans::setConvolutionKernel(diff);*/
184+
/*cuv::libs::nlmeans::setConvolutionKernel(diff);*/
185185

186-
cuv::libs::nlmeans::convolutionRows(grady,src,1);
187-
cuv::libs::nlmeans::convolutionColumns(gradx,src,1);
186+
cuv::libs::nlmeans::convolutionRows(grady,src,diff);
187+
cuv::libs::nlmeans::convolutionColumns(gradx,src,diff);
188188

189189
// calculate the gradient norms and directions
190190
atan2_abs_and_norm(allangles,allmagnitudes, gradx,grady);
@@ -215,12 +215,12 @@ namespace cuv{ namespace libs{ namespace hog{
215215
sum += val;
216216
}
217217
kernel /= sum;
218-
cuv::libs::nlmeans::setConvolutionKernel_horizontal(kernel);
219-
cuv::libs::nlmeans::setConvolutionKernel_vertical(kernel);
218+
cuv::libs::nlmeans::setConvolutionKernel(kernel);
219+
cuv::libs::nlmeans::setConvolutionKernel(kernel);
220220

221221
tens_t intermed(bins.shape());
222-
cuv::libs::nlmeans::convolutionRows(intermed,bins,spatialpool);
223-
cuv::libs::nlmeans::convolutionColumns(bins,intermed,spatialpool);
222+
cuv::libs::nlmeans::convolutionRows(intermed,bins,kernel);
223+
cuv::libs::nlmeans::convolutionColumns(bins,intermed,kernel);
224224
}
225225

226226
// normalization

‎src/cuv/libs/nlmeans/conv3d.cu

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace cuv{
6767
////////////////////////////////////////////////////////////////////////////////
6868
__constant__ float c_Kernel_h[MAX_KERNEL_W];
6969

70-
void setConvolutionKernel_horizontal(const cuv::tensor<float,dev_memory_space>&src){
70+
void setConvolutionKernel(const cuv::tensor<float,dev_memory_space>&src){
7171
cuvSafeCall(cudaMemcpyToSymbol(c_Kernel_h, const_cast<float*>(src.ptr()), src.size() * sizeof(float), 0, cudaMemcpyDeviceToDevice));
7272
}
7373

@@ -136,7 +136,7 @@ namespace cuv{
136136
){
137137

138138
unsigned int kernel_radius = (kernel.size()-1) / 2;
139-
setConvolutionKernel_horizontal(kernel);
139+
setConvolutionKernel(kernel);
140140

141141
cuvAssert(equal_shape(dst,src));
142142
cuvAssert(kernel_radius <= MAX_KERNEL_RADIUS);
@@ -215,7 +215,7 @@ namespace cuv{
215215
){
216216

217217
unsigned int kernel_radius = (kernel.size()-1) / 2;
218-
setConvolutionKernel_horizontal(kernel);
218+
setConvolutionKernel(kernel);
219219

220220
int imageW = d_Src.shape()[2];
221221
int imageH = d_Src.shape()[1];
@@ -296,7 +296,7 @@ namespace cuv{
296296
const cuv::tensor<float,dev_memory_space> &kernel
297297
){
298298
unsigned int kernel_radius = (kernel.size()-1) / 2;
299-
setConvolutionKernel_horizontal(kernel);
299+
setConvolutionKernel(kernel);
300300

301301
int dw = src.shape(2)*src.shape(1);
302302
int dh = src.shape(0);

‎src/cuv/libs/nlmeans/conv3d.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace cuv{
1717

1818
/// fix a kernel for horizontal convolution in constant memory
1919
/// @param src the kernel to be loaded in constant memory
20-
void setConvolutionKernel_horizontal(const cuv::tensor<float,dev_memory_space>&src);
20+
void setConvolutionKernel(const cuv::tensor<float,dev_memory_space>&src);
2121

2222

2323
/** convolve along 1st axis of a 3D array

‎src/cuv/libs/nlmeans/nlmeans.cu

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ namespace nlmeans{
169169
kernel(i+filter_radius) = (float) exp(-i*i);
170170
kernel /= (float)cuv::sum(kernel);
171171
kernel = 1.f/kernel.size();
172-
setConvolutionKernel_horizontal(kernel);
173-
setConvolutionKernel_vertical(kernel);
174-
setConvolutionKernel_depth(kernel);
172+
/*setConvolutionKernel_horizontal(kernel);*/
173+
/*setConvolutionKernel_vertical(kernel);*/
174+
/*setConvolutionKernel_depth(kernel);*/
175175
cuv::tensor<float,dev_memory_space> tmp1(constsrc.shape());
176176
cuv::tensor<float,dev_memory_space> cpy(constsrc);
177177
/*convolutionRows (dst,cpy,filter_radius);*/
178-
convolutionColumns(dst,cpy,filter_radius);
178+
convolutionColumns(dst,cpy,kernel);
179179
/*convolutionDepth (dst,cpy,filter_radius);*/
180180
return;
181181
}
@@ -200,9 +200,9 @@ namespace nlmeans{
200200
cuv::tensor<float,host_memory_space> kernel(2*filter_radius+1);
201201
if(filter_radius!=0){
202202
kernel = 1.f/kernel.size();
203-
setConvolutionKernel_horizontal(kernel);
204-
setConvolutionKernel_vertical(kernel);
205-
setConvolutionKernel_depth(kernel);
203+
/*setConvolutionKernel_horizontal(kernel);*/
204+
/*setConvolutionKernel_vertical(kernel);*/
205+
/*setConvolutionKernel_depth(kernel);*/
206206
}
207207

208208
dst = (T)0.f;
@@ -220,9 +220,9 @@ namespace nlmeans{
220220
if(filter_radius==0){
221221
tmp1 = diffs;
222222
}else{
223-
convolutionRows (tmp1,diffs,filter_radius);
224-
convolutionColumns(diffs,tmp1,filter_radius);
225-
convolutionDepth (tmp1,diffs,filter_radius);
223+
convolutionRows (tmp1,diffs,kernel);
224+
convolutionColumns(diffs,tmp1,kernel);
225+
convolutionDepth (tmp1,diffs,kernel);
226226
}
227227
tmp1 /= -sigma*sigma;
228228
if(dist_sigma>0.f)
@@ -247,8 +247,8 @@ namespace nlmeans{
247247
for(step_type j=-search_radius;j<=search_radius;j+=step_size){
248248
get_sqdiff2d<<<blocks,threads>>>(diffs.ptr(),src.ptr(),k,j,(step_type)0,w,h,d,(unsigned int)src.stride(0));
249249
if(filter_radius!=0){
250-
convolutionRows(tmp1,diffs,filter_radius);
251-
convolutionColumns(diffs,tmp1,filter_radius);
250+
convolutionRows(tmp1,diffs,kernel);
251+
convolutionColumns(diffs,tmp1,kernel);
252252
}
253253
diffs /= -sigma*sigma;
254254
if(dist_sigma>0.f)

‎src/cuv/libs/theano_ops/theano_ops.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ void dim_shuffle(cuv::tensor<float,cuv::dev_memory_space>& dst, const cuv::tenso
8989
dim_shuffle2(dst,src, new_dims, D);
9090
}
9191

92+
void flip_dims2(cuv::tensor<float,cuv::dev_memory_space>& dst, const cuv::tensor<float,cuv::dev_memory_space>& src, bool *pattern);
9293
/**
9394
* flips the 2nd and 3rd dimension of the tensor
9495
*
@@ -110,7 +111,6 @@ void flip_dims(cuv::tensor<float,cuv::dev_memory_space>& dst, const cuv::tensor<
110111

111112

112113

113-
void flip_dims2(cuv::tensor<float,cuv::dev_memory_space>& dst, const cuv::tensor<float,cuv::dev_memory_space>& src, bool *pattern);
114114
void flip_dims_vec(cuv::tensor<float,cuv::dev_memory_space>& dst, const cuv::tensor<float,cuv::dev_memory_space>& src, std::vector<bool> pattern);
115115

116116

‎src/tests/CMakeLists.txt

Lines changed: 54 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
include (CMakeParseArguments)
12
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
23
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/basics )
34
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/convert )
@@ -13,36 +14,37 @@ SET (TEST_LINK_LIBS ${BLAS_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} ${Boost_LIBRARIES
1314
SET (CUDA_TEST_DEVICE "0" CACHE STRING "Which CUDA device should the tests be run on, if multiple devices are present.")
1415
add_definitions(-DCUDA_TEST_DEVICE=${CUDA_TEST_DEVICE})
1516

16-
ADD_EXECUTABLE( test_tensor tensor.cpp )
17-
TARGET_LINK_LIBRARIES( test_tensor ${TEST_LINK_LIBS})
18-
19-
ADD_EXECUTABLE( test_alloc alloc.cpp )
20-
TARGET_LINK_LIBRARIES( test_alloc ${TEST_LINK_LIBS})
21-
22-
ADD_EXECUTABLE( test_tensor_serialization tensor_serialization.cpp )
23-
TARGET_LINK_LIBRARIES( test_tensor_serialization ${TEST_LINK_LIBS})
24-
25-
ADD_EXECUTABLE( test_basic basic.cpp )
26-
TARGET_LINK_LIBRARIES( test_basic ${TEST_LINK_LIBS})
27-
28-
ADD_EXECUTABLE( test_convert convert.cpp )
29-
TARGET_LINK_LIBRARIES( test_convert ${TEST_LINK_LIBS})
30-
31-
ADD_EXECUTABLE( test_tensor_op tensor_op.cpp )
32-
TARGET_LINK_LIBRARIES( test_tensor_op ${TEST_LINK_LIBS})
33-
34-
ADD_EXECUTABLE( test_theano_ops lib_theano_ops.cpp )
35-
TARGET_LINK_LIBRARIES( test_theano_ops ${TEST_LINK_LIBS})
36-
37-
ADD_EXECUTABLE( test_tensor_op_speed tensor_op_speed.cpp )
38-
TARGET_LINK_LIBRARIES( test_tensor_op_speed ${TEST_LINK_LIBS})
39-
40-
ADD_EXECUTABLE( test_optimize optimize.cpp )
41-
TARGET_LINK_LIBRARIES( test_optimize ${TEST_LINK_LIBS})
42-
43-
ADD_EXECUTABLE( test_mat_op matrix_op.cpp )
44-
#TARGET_LINK_LIBRARIES( test_mat_op cuv_basics cuv_tools cuv_convert cuv_tensor_ops cuv_matrix_ops cuv_random ${CUDA_CUBLAS_LIBRARIES} )
45-
TARGET_LINK_LIBRARIES( test_mat_op ${TEST_LINK_LIBS})
17+
SET(CUV_TESTS "")
18+
SET(CUV_SPEED_TESTS "")
19+
FUNCTION(cuv_add_test)
20+
set(options SPEEDTEST)
21+
set(oneValueArgs NAME)
22+
set(multiValueArgs SOURCES)
23+
cmake_parse_arguments(CT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
24+
#MESSAGE(STATUS "cuv_add_test: ${CT_NAME} <-- ${CT_SOURCES} (${TEST_LINK_LIBS})")
25+
26+
ADD_EXECUTABLE(${CT_NAME} ${CT_SOURCES})
27+
TARGET_LINK_LIBRARIES( ${CT_NAME} ${TEST_LINK_LIBS})
28+
IF(CT_SPEEDTEST)
29+
# Speed tests tend to run forever, so they should not be included in
30+
# ctest runs.
31+
SET(CUV_SPEED_TESTS ${CUV_SPEED_TESTS} ${CT_NAME} PARENT_SCOPE)
32+
ELSE()
33+
SET(CUV_TESTS ${CUV_TESTS} ${CT_NAME} PARENT_SCOPE)
34+
ADD_TEST(${CT_NAME} "${CMAKE_CURRENT_BINARY_DIR}/${CT_NAME}")
35+
ENDIF()
36+
ENDFUNCTION(cuv_add_test)
37+
38+
cuv_add_test( NAME tensor SOURCES tensor.cpp)
39+
cuv_add_test( NAME alloc SOURCES alloc.cpp )
40+
cuv_add_test( NAME tensor_serialization SOURCES tensor_serialization.cpp )
41+
cuv_add_test( NAME basic SOURCES basic.cpp )
42+
cuv_add_test( NAME convert SOURCES convert.cpp )
43+
cuv_add_test( NAME tensor_op SOURCES tensor_op.cpp )
44+
cuv_add_test( NAME theano_ops SOURCES lib_theano_ops.cpp )
45+
cuv_add_test( NAME tensor_op_speed SOURCES tensor_op_speed.cpp SPEEDTEST )
46+
cuv_add_test( NAME optimize SOURCES optimize.cpp )
47+
cuv_add_test( NAME mat_op SOURCES matrix_op.cpp )
4648

4749
#ADD_EXECUTABLE( test_dia_mat dia_mat.cpp )
4850
#TARGET_LINK_LIBRARIES( test_dia_mat ${TEST_LINK_LIBS})
@@ -59,84 +61,32 @@ TARGET_LINK_LIBRARIES( test_mat_op ${TEST_LINK_LIBS})
5961
#ADD_EXECUTABLE( test_densedense_to_dia_speed densedense_to_dia_speed.cpp )
6062
#TARGET_LINK_LIBRARIES( test_densedense_to_dia_speed ${TEST_LINK_LIBS})
6163

62-
ADD_EXECUTABLE( test_mat_op_speed matrix_op_speed.cpp )
63-
TARGET_LINK_LIBRARIES( test_mat_op_speed ${TEST_LINK_LIBS})
64-
65-
ADD_EXECUTABLE( test_conv_op conv_op.cpp )
66-
TARGET_LINK_LIBRARIES( test_conv_op ${TEST_LINK_LIBS})
67-
68-
ADD_EXECUTABLE( test_conv_op_speed conv_op_speed.cpp )
69-
TARGET_LINK_LIBRARIES( test_conv_op_speed ${TEST_LINK_LIBS})
70-
71-
ADD_EXECUTABLE( test_random random.cpp )
72-
TARGET_LINK_LIBRARIES( test_random ${TEST_LINK_LIBS})
73-
74-
ADD_EXECUTABLE( test_random_speed random_speed.cpp )
75-
TARGET_LINK_LIBRARIES( test_random_speed ${TEST_LINK_LIBS})
76-
77-
ADD_EXECUTABLE( test_memory memory.cpp )
78-
TARGET_LINK_LIBRARIES( test_memory ${TEST_LINK_LIBS})
79-
80-
ADD_EXECUTABLE( test_lib_rbm lib_rbm.cpp )
81-
TARGET_LINK_LIBRARIES( test_lib_rbm ${TEST_LINK_LIBS})
82-
83-
ADD_EXECUTABLE( test_lib_kmeans lib_kmeans.cpp )
84-
#TARGET_LINK_LIBRARIES( test_lib_kmeans cuv_basics cuv_tools cuv_convert cuv_tensor_ops cuv_matrix_ops cuv_kmeans ${CUDA_CUBLAS_LIBRARIES} )
85-
TARGET_LINK_LIBRARIES( test_lib_kmeans ${TEST_LINK_LIBS})
64+
cuv_add_test( NAME mat_op_speed SOURCES matrix_op_speed.cpp SPEEDTEST )
65+
cuv_add_test( NAME conv_op SOURCES conv_op.cpp )
66+
cuv_add_test( NAME conv_op_speed SOURCES conv_op_speed.cpp SPEEDTEST)
67+
cuv_add_test( NAME random SOURCES random.cpp )
68+
cuv_add_test( NAME random_speed SOURCES random_speed.cpp SPEEDTEST)
69+
cuv_add_test( NAME memory SOURCES memory.cpp )
70+
cuv_add_test( NAME lib_rbm SOURCES lib_rbm.cpp )
71+
cuv_add_test( NAME lib_kmeans SOURCES lib_kmeans.cpp )
8672

8773
IF(CUV_CIMG_BINDINGS)
8874
FIND_PACKAGE( PNG REQUIRED)
89-
ADD_EXECUTABLE( test_lib_cimg cimg.cpp )
9075
SET(TEST_LINK_LIBS ${TEST_LINK_LIBS} X11 pthread ${PNG_LIBRARIES})
91-
TARGET_LINK_LIBRARIES( test_lib_cimg ${TEST_LINK_LIBS})
92-
93-
ADD_EXECUTABLE( test_lib_sep_conv lib_sep_conv.cpp )
94-
TARGET_LINK_LIBRARIES( test_lib_sep_conv ${TEST_LINK_LIBS})
95-
96-
ADD_EXECUTABLE( test_lib_intimg lib_intimg.cpp )
97-
TARGET_LINK_LIBRARIES( test_lib_intimg ${TEST_LINK_LIBS})
98-
99-
ADD_EXECUTABLE( test_nlmeans lib_nlmean.cpp )
100-
TARGET_LINK_LIBRARIES( test_nlmeans ${TEST_LINK_LIBS})
101-
102-
ADD_EXECUTABLE( test_hog lib_hog.cpp )
103-
TARGET_LINK_LIBRARIES( test_hog ${TEST_LINK_LIBS})
104-
105-
FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
10676

77+
cuv_add_test( NAME lib_cimg SOURCES cimg.cpp )
78+
cuv_add_test( NAME lib_sep_conv SOURCES lib_sep_conv.cpp )
79+
cuv_add_test( NAME lib_intimg SOURCES lib_intimg.cpp )
80+
cuv_add_test( NAME nlmeans SOURCES lib_nlmean.cpp )
81+
cuv_add_test( NAME hog SOURCES lib_hog.cpp )
82+
FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
10783
ENDIF(CUV_CIMG_BINDINGS)
10884

10985

11086
if (PYTHONLIBS_FOUND )
111-
TARGET_LINK_LIBRARIES(test_theano_ops ${CUV_LIBRARIES})
87+
TARGET_LINK_LIBRARIES(test_theano_ops ${CUV_LIBRARIES} ${PYTHON_LIBS})
11288
endif(PYTHONLIBS_FOUND )
11389

114-
ADD_TEST( tensor_serialization "${CMAKE_BINARY_DIR}/src/tests/test_tensor_serialization" )
115-
ADD_TEST( basics "${CMAKE_BINARY_DIR}/src/tests/test_basic" )
116-
ADD_TEST( convert "${CMAKE_BINARY_DIR}/src/tests/test_convert" )
117-
ADD_TEST( tensor_op "${CMAKE_BINARY_DIR}/src/tests/test_tensor_op" )
118-
ADD_TEST( optimize "${CMAKE_BINARY_DIR}/src/tests/test_optimize" )
119-
ADD_TEST( matrix_op "${CMAKE_BINARY_DIR}/src/tests/test_mat_op" )
120-
#ADD_TEST( dia_mat "${CMAKE_BINARY_DIR}/src/tests/test_dia_mat" )
121-
#ADD_TEST( spmv "${CMAKE_BINARY_DIR}/src/tests/test_spmv" )
122-
#ADD_TEST( densedense_to_dia "${CMAKE_BINARY_DIR}/src/tests/test_densedense_to_dia" )
123-
ADD_TEST( random "${CMAKE_BINARY_DIR}/src/tests/test_random" )
124-
ADD_TEST( lib_rbm "${CMAKE_BINARY_DIR}/src/tests/test_lib_rbm" )
125-
ADD_TEST( lib_kmeans "${CMAKE_BINARY_DIR}/src/tests/test_lib_kmeans" )
126-
ADD_TEST( conv_op "${CMAKE_BINARY_DIR}/src/tests/test_conv_op" )
127-
ADD_TEST( theano_ops "${CMAKE_BINARY_DIR}/src/tests/test_theano_ops" )
128-
129-
# test for memory leak. takes to long and bug was fixed
130-
#ADD_TEST( memory "${CMAKE_BINARY_DIR}/src/tests/test_memory" )
131-
132-
# speed tests just take too long.
133-
#ADD_TEST( tensor_op_speed "${CMAKE_BINARY_DIR}/tests/test_tensor_op_speed" )
134-
#ADD_TEST( mat_op_speed "${CMAKE_BINARY_DIR}/tests/test_mat_op_speed" )
135-
#ADD_TEST( spmv_speed "${CMAKE_BINARY_DIR}/tests/test_spmv_speed" )
136-
#ADD_TEST( densedense_to_dia_speed "${CMAKE_BINARY_DIR}/tests/test_densedense_to_dia_speed" )
137-
#ADD_TEST( conv_ops_speed "${CMAKE_BINARY_DIR}/tests/test_conv_op_speed" )
138-
#ADD_TEST( random_speed "${CMAKE_BINARY_DIR}/tests/test_random_speed" )
139-
14090
IF(CUV_PYTHON_BINDINGS)
14191
SET(ENV{PYTHONPATH} ${CMAKE_BINARY_DIR}/python_bindings )
14292
ADD_TEST( load_py sh -c "PYTHONPATH=${CMAKE_BINARY_DIR}/src python -c 'import cuv_python as cp'" )
@@ -149,4 +99,11 @@ IF(CUV_PYTHON_BINDINGS)
14999
ENDIF(NOSETEST_EXECUTABLE)
150100
ENDIF(CUV_PYTHON_BINDINGS)
151101

102+
ADD_CUSTOM_TARGET(buildtests DEPENDS ${CUV_TESTS})
103+
ADD_CUSTOM_TARGET(buildspeedtests DEPENDS ${CUV_SPEED_TESTS})
104+
ADD_CUSTOM_TARGET(runtests
105+
DEPENDS buildtests
106+
POST_BUILD_COMMAND ctest ARGS --output-on-failure
107+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
108+
)
152109

‎src/tests/lib_hog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ BOOST_AUTO_TEST_CASE( cuv_hog )
8282

8383
m = bins;
8484
m.reshape(extents[bincnt*h][w]);
85-
std::cout << DBG(cuv::maximum(m));
86-
std::cout << DBG(cuv::minimum(m));
85+
//std::cout << DBG(cuv::maximum(m));
86+
//std::cout << DBG(cuv::minimum(m));
8787
m -= cuv::minimum(m);
8888
m *= 255.f / cuv::maximum(m);
8989
//libs::cimg::show(m, "bins.png");

0 commit comments

Comments
 (0)