Skip to content

565 k nn and mpv algorithms gives wrong results #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anyzelman merged 4 commits into from
Dec 19, 2022
Merged

565 k nn and mpv algorithms gives wrong results #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c7b877
fix iterator issue
Oct 14, 2022
550ba5d
Update verification values for perfetsts.sh and smoketests.sh
anhansson Dec 12, 2022
cdfc531
Update verification value in performancetests.sh
anhansson Dec 13, 2022
1d069b6
Add missing attribution to Anders in NOTICE file
anyzelman Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ to Huawei Technologies Co., Ltd. or one of its subsidiaries:

- Auke Booij, Huawei Technologies Switzerland AG; 2021.

- Anders Hansson, Huawei Technologies Switzerland AG; 2022-2023.

The experimental banshee backend has been developed in collaboration with
Prof. Luca Benini at ETH Zuerich and his group. In particular this backend
is with great thanks due to Dan, Paul Scheffler, Fabian Schuiki, and Samuel
Expand Down
2 changes: 1 addition & 1 deletion include/graphblas/algorithms/mpv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ namespace grb {
ret = mxv< descr >( temp, A, u, ring );
// check if this was the final multiplication
assert( iterate <= k );
if( iterate == k || ret != SUCCESS ) {
if( iterate + 1 == k || ret != SUCCESS ) {
break;
}
// multiply with output into u
Expand Down
4 changes: 2 additions & 2 deletions tests/performance/performancetests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ fi
DATASETS=(west0497.mtx facebook_combined.txt cit-HepTh.txt com-amazon.ungraph.txt com-youtube.ungraph.txt cit-Patents.txt com-orkut.ungraph.txt)
DATASET_MODES=(direct direct indirect indirect indirect indirect indirect)
DATASET_SIZES=(497 4039 27770 334863 1134890 3774768 3072441)
KNN4SOLS=(118 499 2805 1 64 1 1048907)
KNN6SOLS=(357 547 5176 1 246 1 1453447)
KNN4SOLS=(59 421 1138 1 32 1 609122)
KNN6SOLS=(238 526 4189 1 181 1 1268035)

#the following datasets are used for benchmarking SpMV, SpMSpV, and SpMSpM
MULTIPLICATION_DATASETS=(west0497.mtx fidap037.mtx cavity17.mtx s3rmt3m3.mtx bloweybq.mtx bcsstk17.mtx Pres_Poisson.mtx gyro_m.mtx memplus.mtx lhr34.mtx bcsstk32.mtx vanbody.mtx s3dkt3m2.mtx G2_circuit.mtx Stanford.mtx coPapersCiteseer.mtx bundle_adj.mtx Stanford_Berkeley.mtx apache2.mtx Emilia_923.mtx ldoor.mtx ecology2.mtx Serena.mtx cage14.mtx G3_circuit.mtx wikipedia-20051105.mtx wikipedia-20061104.mtx Freescale1.mtx wikipedia-20070206.mtx Queen_4147.mtx cage15.mtx adaptive.mtx rgg_n_2_24_s0.mtx uk-2002.mtx road_usa.mtx MOLIERE_2016.mtx europe_osm.mtx twitter.mtx com-Friendster.mtx)
Expand Down
2 changes: 1 addition & 1 deletion tests/smoke/smoketests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ for BACKEND in ${BACKENDS[@]}; do
$runner ${TEST_BIN_DIR}/knn_${BACKEND} 4 ${INPUT_DIR}/facebook_combined.txt direct 1 1 &> ${TEST_OUT_DIR}/knn_${BACKEND}_${P}_${T}_facebook.log
head -1 ${TEST_OUT_DIR}/knn_${BACKEND}_${P}_${T}_facebook.log
if grep -q "Test OK" ${TEST_OUT_DIR}/knn_${BACKEND}_${P}_${T}_facebook.log; then
(grep -q "Neighbourhood size is 499" ${TEST_OUT_DIR}/knn_${BACKEND}_${P}_${T}_facebook.log && printf "Test OK\n\n") || (printf "Test FAILED (verification error)\n")
(grep -q "Neighbourhood size is 421" ${TEST_OUT_DIR}/knn_${BACKEND}_${P}_${T}_facebook.log && printf "Test OK\n\n") || (printf "Test FAILED (verification error)\n")
else
printf "Test FAILED\n"
fi
Expand Down