Cleanup and Code style review

Author: CodeWithKyrian

examples/image-test.php

@@ -24,7 +24,7 @@ function toTensorTest(ImageDriver $imageDriver): Tensor
 
     $tensor =  $image->toTensor();
 
-    dump("$imageDriver->name (toTensor) : ". timeUsage());
+    dump("$imageDriver->name (toTensor) : ". timeUsage(true));
 
     return $tensor;
 }
@@ -37,7 +37,7 @@ function fromTensorTest(ImageDriver $imageDriver, Tensor $tensor) : Image
 
     $image =  Image::fromTensor($tensor);
 
-    dump("$imageDriver->name (fromTensor) : ". timeUsage());
+    dump("$imageDriver->name (fromTensor) : ". timeUsage(true));
 
     return $image;
 }
@@ -47,10 +47,10 @@ function fromTensorTest(ImageDriver $imageDriver, Tensor $tensor) : Image
 dump("------------ toTensor ------------");
 $tensor = toTensorTest(ImageDriver::IMAGICK);
 $tensor = toTensorTest(ImageDriver::GD);
-$tensor = toTensorTest(ImageDriver::VIPS);
+//$tensor = toTensorTest(ImageDriver::VIPS);
 
 
 dump("------------ fromTensor ------------");
 $image = fromTensorTest(ImageDriver::IMAGICK, $tensor);
 $image = fromTensorTest(ImageDriver::GD, $tensor);
-$image = fromTensorTest(ImageDriver::VIPS, $tensor);
+//$image = fromTensorTest(ImageDriver::VIPS, $tensor);

src/Pipelines/ZeroShotClassificationPipeline.php

@@ -98,7 +98,6 @@ public function __invoke(array|string $inputs, ...$args): array
         // Insert labels into hypothesis template
         $hypotheses = array_map(fn($x) => str_replace('{}', $x, $hypothesisTemplate), $candidateLabels);
 
-
         // Determine whether to perform softmax over each label independently
         $softmaxEach = $multiLabel || count($candidateLabels) === 1;
 
@@ -129,23 +128,16 @@ public function __invoke(array|string $inputs, ...$args): array
                 : Math::softmax($entailsLogits);
 
             // Sort by scores (desc) and return scores with indices
-            $scoresSorted = array_map(function ($x, $i) {
-                return [$x, $i];
-            }, $scores, array_keys($scores));
-
-
-            usort($scoresSorted, function ($a, $b) {
-                return $b[0] <=> $a[0];
-            });
+            $scores = array_map(fn($x, $i) => [$x, $i], $scores, array_keys($scores));
+            usort($scores, fn($a, $b) => $b[0] <=> $a[0]);
 
             $toReturn[] = [
                 'sequence' => $premise,
-                'labels' => array_map(fn($x) => $candidateLabels[$x[1]], $scoresSorted),
-                'scores' => array_map(fn($x) => array_shift($x), $scoresSorted),
+                'labels' => array_map(fn($x) => $candidateLabels[$x[1]], $scores),
+                'scores' => array_map(fn($x) => array_shift($x), $scores),
             ];
         }
 
-
         return $isBatched ? $toReturn : $toReturn[0];
     }
 }

src/Processors/Processor.php

@@ -114,10 +114,12 @@ public static function centerToCornersFormat(array $arr): array
     {
         [$centerX, $centerY, $width, $height] = $arr;
 
-        $topLeftX = Math::clamp($centerX - $width / 2, 0.0, 1.0);
-        $topLeftY = Math::clamp($centerY - $height / 2, 0.0, 1.0);
-        $bottomRightX = Math::clamp($centerX + $width / 2, 0.0, 1.0);
-        $bottomRightY = Math::clamp($centerY + $height / 2, 0.0, 1.0);
+        $clampFn = fn(float $value, float $min, float $max) => max($min, min($max, $value));
+
+        $topLeftX = $clampFn($centerX - $width / 2, 0.0, 1.0);
+        $topLeftY = $clampFn($centerY - $height / 2, 0.0, 1.0);
+        $bottomRightX = $clampFn($centerX + $width / 2, 0.0, 1.0);
+        $bottomRightY = $clampFn($centerY + $height / 2, 0.0, 1.0);
 
         return [$topLeftX, $topLeftY, $bottomRightX, $bottomRightY];
     }

src/Utils/Image.php

@@ -279,7 +279,12 @@ public static function fromTensor(Tensor $tensor, string $channelFormat = 'CHW')
                 default => throw new Exception("Unsupported number of channels: $channels"),
             };
 
-            $image->getImagick()->importImagePixels(0, 0, $width, $height, $map, Imagick::PIXEL_CHAR, $tensor->buffer()->toArray());
+            $bufferArray = [];
+            for ($i = 0; $i < $tensor->size(); $i++) {
+                $bufferArray[] = $tensor->buffer()[$i];
+            }
+
+            $image->getImagick()->importImagePixels(0, 0, $width, $height, $map, Imagick::PIXEL_CHAR, $bufferArray);
 
             return new self($image, $channels);
         }

src/Utils/TensorBuffer.php

@@ -72,13 +72,16 @@ public function __construct(int $size, int $dtype)
             $code = file_get_contents(__DIR__ . '/../../libs/buffer.h');
             self::$ffi = FFI::cdef($code);
         }
+
         if (!isset(self::$typeString[$dtype])) {
             throw new InvalidArgumentException("Invalid data type");
         }
+
         $limitsize = intdiv(self::MAX_BYTES, self::$valueSize[$dtype]);
         if ($size >= $limitsize) {
             throw new InvalidArgumentException("Data size is too large.");
         }
+
         $this->size = $size;
         $this->dtype = $dtype;
         $declaration = self::$typeString[$dtype];
@@ -185,20 +188,25 @@ public function offsetUnset(mixed $offset): void
 
     public function dump(): string
     {
-        $byte = self::$valueSize[$this->dtype] * $this->size;
-        if ($byte === 0) return '';
-        $buf = FFI::new("char[$byte]");
-        FFI::memcpy($buf, $this->data, $byte);
-        return FFI::string($buf, $byte);
+        $byteSize = self::$valueSize[$this->dtype] * $this->size;
+
+        if ($byteSize === 0) return '';
+
+        $buf = FFI::new("char[$byteSize]");
+        FFI::memcpy($buf, $this->data, $byteSize);
+
+        return FFI::string($buf, $byteSize);
     }
 
     public function load(string $string): void
     {
-        $byte = self::$valueSize[$this->dtype] * $this->size;
+        $byteSize = self::$valueSize[$this->dtype] * $this->size;
+
         $strlen = strlen($string);
-        if ($strlen != $byte) {
-            throw new InvalidArgumentException("Unmatched data size. buffer size is $byte. $strlen byte given.");
+        if ($strlen != $byteSize) {
+            throw new InvalidArgumentException("Unmatched data size. buffer size is $byteSize. $strlen byte given.");
         }
+
         FFI::memcpy($this->data, $string, $strlen);
     }
 }