The same but to batched descriptors..

1.10 % less memory, totaling 42,99 % reduction..
matiasdelellis · Aug 2, 2024 · efb7a8c · efb7a8c
1 parent 35eb454
commit efb7a8c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/lib/BackgroundJob/Tasks/CreateClustersTask.php b/lib/BackgroundJob/Tasks/CreateClustersTask.php
@@ -320,7 +320,7 @@ private function getNewClusters(array $faces): array {
 				$face1 = $faces[$i];
 				for ($j = $i; $j < $faces_count; $j++) {
 					$face2 = $faces[$j];
-					$distance = dlib_vector_length($face1->descriptor, $face2->descriptor);
+					$distance = dlib_vector_length($face1['descriptor'], $face2['descriptor']);
 					if ($distance < $sensitivity) {
 						$edges[] = array($i, $j);
 					}
@@ -338,7 +338,7 @@ private function getNewClusters(array $faces): array {
 				$face1 = $faces[$i];
 				for ($j = $i; $j < $faces_count; $j++) {
 					$face2 = $faces[$j];
-					$distance = Euclidean::distance($face1->descriptor, $face2->descriptor);
+					$distance = Euclidean::distance($face1['descriptor'], $face2['descriptor']);
 					if ($distance < $sensitivity) {
 						$edges[] = array($i, $j);
 					}
@@ -363,7 +363,7 @@ private function getNewClusters(array $faces): array {
 			if (!isset($newClusters[$newChineseClustersByIndex[$i]])) {
 				$newClusters[$newChineseClustersByIndex[$i]] = array();
 			}
-			$newClusters[$newChineseClustersByIndex[$i]][] = $faces[$i]->id;
+			$newClusters[$newChineseClustersByIndex[$i]][] = $faces[$i]['id'];
 		}
 		return $newClusters;
 	}

diff --git a/lib/Db/FaceMapper.php b/lib/Db/FaceMapper.php
@@ -54,8 +54,20 @@ public function findDescriptorsBathed (array $faceIds): array {
 		$qb->select('id', 'descriptor')
 			->from($this->getTableName(), 'f')
 			->where($qb->expr()->in('id', $qb->createParameter('face_ids')));
+
 		$qb->setParameter('face_ids', $faceIds, IQueryBuilder::PARAM_INT_ARRAY);
-		return $this->findEntities($qb);
+
+		$descriptors = [];
+		$result = $qb->executeQuery();
+		while ($row = $result->fetch()) {
+			$descriptors[] = [
+				'id' => $row['id'],
+				'descriptor' => json_decode($row['descriptor'])
+			];
+		}
+		$result->closeCursor();
+
+		return $descriptors;
 	}
 
 	/**