Skip to content

Commit fa63a04

Browse files
byjtewanyzelman
authored andcommitted
Allow triangle_count test to run on all backends
1 parent fea901f commit fa63a04

File tree

2 files changed

+22
-24
lines changed

2 files changed

+22
-24
lines changed

tests/smoke/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ add_grb_executables( kcore_decomposition kcore_decomposition.cpp
182182

183183
add_grb_executables( triangle_count triangle_count.cpp
184184
ADDITIONAL_LINK_LIBRARIES test_utils_headers
185-
BACKENDS reference reference_omp hyperdags
185+
BACKENDS reference reference_omp bsp1d hybrid hyperdags nonblocking
186186
)
187187

188188
# targets to list and build the test for this category

tests/smoke/smoketests.sh

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -366,35 +366,33 @@ for BACKEND in ${BACKENDS[@]}; do
366366
fi
367367
echo " "
368368

369-
if [ "$BACKEND" = "reference" ] || [ "$BACKEND" = "reference_omp" ] || [ "$BACKEND" = "hyperdags" ]; then
370-
echo ">>> [x] [ ] Testing the Triangle couting algorithm on the dwt_59.mtx"
371-
if [ -f ${INPUT_DIR}/dwt_59.mtx ]; then
372-
$runner ${TEST_BIN_DIR}/triangle_count_${BACKEND} ${INPUT_DIR}/dwt_59.mtx direct 30 1 1 &> ${TEST_OUT_DIR}/triangle_count_dwt_59_${BACKEND}_${P}_${T}.log
373-
head -1 ${TEST_OUT_DIR}/triangle_count_dwt_59_${BACKEND}_${P}_${T}.log
374-
if ! grep -q 'Test OK' ${TEST_OUT_DIR}/triangle_count_dwt_59_${BACKEND}_${P}_${T}.log; then
375-
echo "Test FAILED"
376-
else
377-
echo "Test OK"
378-
fi
369+
echo ">>> [x] [ ] Testing the Triangle couting algorithm on the dwt_59.mtx"
370+
if [ -f ${INPUT_DIR}/dwt_59.mtx ]; then
371+
$runner ${TEST_BIN_DIR}/triangle_count_${BACKEND} ${INPUT_DIR}/dwt_59.mtx direct 30 1 1 &> ${TEST_OUT_DIR}/triangle_count_dwt_59_${BACKEND}_${P}_${T}.log
372+
head -1 ${TEST_OUT_DIR}/triangle_count_dwt_59_${BACKEND}_${P}_${T}.log
373+
if ! grep -q 'Test OK' ${TEST_OUT_DIR}/triangle_count_dwt_59_${BACKEND}_${P}_${T}.log; then
374+
echo "Test FAILED"
379375
else
380-
echo "Test DISABLED: dwt_59.mtx was not found. To enable, please provide ${INPUT_DIR}/dwt_59.mtx"
376+
echo "Test OK"
381377
fi
382-
echo " "
378+
else
379+
echo "Test DISABLED: dwt_59.mtx was not found. To enable, please provide ${INPUT_DIR}/dwt_59.mtx"
380+
fi
381+
echo " "
383382

384-
echo ">>> [x] [ ] Testing the Triangle couting algorithm on the gyro_m.mtx"
385-
if [ -f ${INPUT_DIR}/gyro_m.mtx ]; then
386-
$runner ${TEST_BIN_DIR}/triangle_count_${BACKEND} ${INPUT_DIR}/gyro_m.mtx direct 598470 1 1 &> ${TEST_OUT_DIR}/triangle_count_gyro_m_${BACKEND}_${P}_${T}.log
387-
head -1 ${TEST_OUT_DIR}/triangle_count_gyro_m_${BACKEND}_${P}_${T}.log
388-
if ! grep -q 'Test OK' ${TEST_OUT_DIR}/triangle_count_gyro_m_${BACKEND}_${P}_${T}.log; then
389-
echo "Test FAILED"
390-
else
391-
echo "Test OK"
392-
fi
383+
echo ">>> [x] [ ] Testing the Triangle couting algorithm on the gyro_m.mtx"
384+
if [ -f ${INPUT_DIR}/gyro_m.mtx ]; then
385+
$runner ${TEST_BIN_DIR}/triangle_count_${BACKEND} ${INPUT_DIR}/gyro_m.mtx direct 598470 1 1 &> ${TEST_OUT_DIR}/triangle_count_gyro_m_${BACKEND}_${P}_${T}.log
386+
head -1 ${TEST_OUT_DIR}/triangle_count_gyro_m_${BACKEND}_${P}_${T}.log
387+
if ! grep -q 'Test OK' ${TEST_OUT_DIR}/triangle_count_gyro_m_${BACKEND}_${P}_${T}.log; then
388+
echo "Test FAILED"
393389
else
394-
echo "Test DISABLED: gyro_m.mtx was not found. To enable, please provide ${INPUT_DIR}/gyro_m.mtx"
390+
echo "Test OK"
395391
fi
396-
echo " "
392+
else
393+
echo "Test DISABLED: gyro_m.mtx was not found. To enable, please provide ${INPUT_DIR}/gyro_m.mtx"
397394
fi
395+
echo " "
398396

399397
if [ "$BACKEND" = "bsp1d" ] || [ "$BACKEND" = "hybrid" ]; then
400398
echo "Additional standardised smoke tests not yet supported for the ${BACKEND} backend"

0 commit comments

Comments
 (0)