jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Speed improvement?

Browse Source 
Signed-off-by: James Ketrenos <james_gitlab@ketrenos.com>
This commit is contained in:
James Ketrenos 2020-01-08 17:27:42 -08:00
parent abd2986f2a
commit 23c43a8fd6
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scanner/scanner.c
View File

@ -300,10 +300,15 @@ int main(int argc, char *argv[]) {
fprintf(stderr, "Read %ld face descriptors...\n", entries); fprintf(stderr, "Read %ld face descriptors...\n", entries);
long double total = 0.0; long double total = 0.0;
long int processed = 0;
for (long i = 0; i < entries; i++) { for (long i = 0; i < entries; i++) {
Face *pLink = ppFaces[i]; Face *pLink = ppFaces[i];
for (long j = 0; j < entries; j++) { for (long j = 0; j < entries; j++) {
Face *pTarget = ppFaces[j]; Face *pTarget = ppFaces[j];
processed++;
if (processed % 1000 == 0) {
fprintf(stderr, "Computed %ld%% complete.\n", (100 * processed / (entries * entries)));
}
if (i == j) { if (i == j) {
pLink->distances[i] = 0.0; pLink->distances[i] = 0.0;
pTarget->distances[j] = 0.0; pTarget->distances[j] = 0.0;
@ -396,14 +401,23 @@ int main(int argc, char *argv[]) {
} }
fprintf(stderr, "facedistances deleted and transaction started.\n"); fprintf(stderr, "facedistances deleted and transaction started.\n");
for (long i = 0; i < entries; i++) {
memset(ppFaces[i]->distances, 0, sizeof(*ppFaces[i]->distances) * entries);
}
char sqlBuf[1024]; char sqlBuf[1024];
int sourceIndex = 0, lines = 0;
processed = 0;
for (long i = 0; i < entries; i++) { for (long i = 0; i < entries; i++) {
Face *pLink = ppFaces[i]; Face *pLink = ppFaces[i];
int targetIndex = 0;
for (long j = 0; j < entries; j++) { for (long j = 0; j < entries; j++) {
Face *pTarget = ppFaces[j]; Face *pTarget = ppFaces[j];
processed++;
if (processed % 1000 == 0) {
fprintf(stderr, "Computed %ld%% complete.\n", (100 * processed / (entries * entries)));
}
if (i == j) { if (i == j) {
pLink->distances[i] = 0.0; pLink->distances[i] = 0.0;
pTarget->distances[j] = 0.0; pTarget->distances[j] = 0.0;
@ -411,7 +425,7 @@ int main(int argc, char *argv[]) {
} }
if (pLink->distances[j] != 0.0) { if (pLink->distances[j] != 0.0) {
// continue; continue;
} }
pLink->distances[j] = pLink->distances[j] =
@ -429,11 +443,6 @@ int main(int argc, char *argv[]) {
sqlite3_close(db); sqlite3_close(db);
return 1; return 1;
} }
lines++;
if (lines % 1000 == 0) {
fprintf(stderr, "...output %d DB lines (%0.2f complete)...\n", lines,
(float)(1. * sourceIndex / (1. * entries)));
}
} }
} }
} }