Merge pull request #32 from CodeWithKyrian/bump-math-matrix

Comprehensive Tensor Class Overhaul and Library Downloader

Author: CodeWithKyrian

.gitignore

@@ -9,3 +9,4 @@ playground/*
 .idea
 .transformers-cache/*
 tests/models/*
+dist

bin/transformers

@@ -12,7 +12,7 @@ $application = new Application();
 try {
     $application->setName('Transformers PHP CLI');
 
-//    $application->add(new Codewithkyrian\Transformers\Commands\InitCommand());
+    $application->add(new Codewithkyrian\Transformers\Commands\InstallCommand());
     $application->add(new Codewithkyrian\Transformers\Commands\DownloadModelCommand());
 
     $application->run();

composer.json

@@ -14,14 +14,15 @@
   "type": "library",
   "require": {
     "php": "^8.1",
-    "guzzlehttp/guzzle": "^7.0",
-    "ankane/onnxruntime": "^0.2.0",
-    "rindow/rindow-math-matrix": "^1.2",
+    "ext-ffi": "*",
     "codewithkyrian/jinja-php": "^1.0",
-    "codewithkyrian/onnxruntime-downloader-plugin": "^1.1",
-    "symfony/console": "^6.4|^7.0",
+    "codewithkyrian/transformers-libraries-downloader": "^1.0",
     "imagine/imagine": "^1.3",
-    "rokka/imagine-vips": "^0.31.0"
+    "symfony/console": "^6.4|^7.0",
+    "rokka/imagine-vips": "^0.31.0",
+    "rindow/rindow-math-matrix": "^2.0",
+    "rindow/rindow-matlib-ffi": "^1.0",
+    "rindow/rindow-openblas-ffi": "^1.0"
   },
   "require-dev": {
     "pestphp/pest": "^2.31",
@@ -46,17 +47,21 @@
   "config": {
     "allow-plugins": {
       "pestphp/pest-plugin": true,
-      "codewithkyrian/onnxruntime-downloader-plugin": true
+      "codewithkyrian/transformers-libraries-downloader": true
     }
   },
   "bin": [
     "bin/transformers"
   ],
   "scripts": {
     "test": "vendor/bin/pest",
-    "test:coverage": "XDEBUG_MODE=coverage ./vendor/bin/pest --coverage"
+    "test:coverage": "XDEBUG_MODE=coverage ./vendor/bin/pest --coverage",
+    "post-install-cmd": "Codewithkyrian\\Transformers\\Utils\\LibsChecker::check",
+    "post-update-cmd": "Codewithkyrian\\Transformers\\Utils\\LibsChecker::check"
   },
   "archive": {
-    "exclude": ["/docs"]
+    "exclude": [
+      "/docs"
+    ]
   }
 }

docs/utils/image.md

@@ -268,7 +268,6 @@ can leverage this interoperability to perform advanced image processing tasks wi
 
 ```php
 use Codewithkyrian\Transformers\Utils\Image;
-use Codewithkyrian\Transformers\Utils\Tensor;
 
 // Read an image
 $image = Image::read('path/to/image.jpg');

docs/utils/tensor.md

@@ -47,8 +47,7 @@ fromArray method. Below are examples of how to create tensors:
 ### Using the Constructor
 
 ```php
-use Codewithkyrian\Transformers\Utils\Tensor;
-use Interop\Polite\Math\Matrix\NDArray;
+use Codewithkyrian\Transformers\Tensor\Tensor;use Interop\Polite\Math\Matrix\NDArray;
 
 $data = [1, 2, 3, 4, 5, 6];
 $shape = [2, 3];
@@ -59,7 +58,7 @@ $tensor = new Tensor($data, $dtype, $shape); // If dtype is not provided, it def
 ### Using the fromArray Method
 
 ```php
-use Codewithkyrian\Transformers\Utils\Tensor;
+use Codewithkyrian\Transformers\Tensor\Tensor;
 
 $data = [[1, 2, 3], [4, 5, 6]];
 $tensor = Tensor::fromArray($data);
@@ -68,7 +67,7 @@ $tensor = Tensor::fromArray($data);
 ### Using zeros and ones methods
 
 ```php
-use Codewithkyrian\Transformers\Utils\Tensor;
+use Codewithkyrian\Transformers\Tensor\Tensor;
 
 $shape = [2, 3];
 $tensor = Tensor::zeros($shape); // Creates a tensor of zeros with the specified shape
@@ -78,7 +77,7 @@ $tensor = Tensor::ones($shape); // Creates a tensor of ones with the specified s
 ### Using zerosLike and onesLike methods
 
 ```php
-use Codewithkyrian\Transformers\Utils\Tensor;
+use Codewithkyrian\Transformers\Tensor\Tensor;
 
 $data = [[1, 2, 3], [4, 5, 6]];
 $tensor = Tensor::fromArray($data);
@@ -114,7 +113,7 @@ and buffer.
   Returns the tensor's flat buffer as a regular PHP array.
 
 ```php
-use Codewithkyrian\Transformers\Utils\Tensor;
+use Codewithkyrian\Transformers\Tensor\Tensor;
 
 $data = [[1, 2, 3], [4, 5, 6]];
 

examples/composer.json

@@ -14,9 +14,8 @@
   "require": {
     "php": "^8.1",
     "symfony/console": "^7.0",
-    "codewithkyrian/transformers": "dev-main"
+    "codewithkyrian/transformers": "dev-bump-math-matrix"
   },
-  "minimum-stability": "dev",
   "require-dev": {
     "symfony/var-dumper": "^7.0"
   },
@@ -28,7 +27,7 @@
   ],
   "config": {
     "allow-plugins": {
-      "codewithkyrian/onnxruntime-downloader-plugin": true
+      "codewithkyrian/transformers-libraries-downloader": true
     }
   }
 }

examples/image-test.php

@@ -2,14 +2,16 @@
 
 declare(strict_types=1);
 
+use Codewithkyrian\Transformers\Tensor\Tensor;
 use Codewithkyrian\Transformers\Transformers;
 use Codewithkyrian\Transformers\Utils\Image;
 use Codewithkyrian\Transformers\Utils\ImageDriver;
-use Codewithkyrian\Transformers\Utils\Tensor;
 use function Codewithkyrian\Transformers\Utils\timeUsage;
 
 require_once './bootstrap.php';
 
+ini_set('memory_limit', '2048M');
+
 function toTensorTest(ImageDriver $imageDriver): Tensor
 {
     timeUsage();
@@ -18,13 +20,13 @@ function toTensorTest(ImageDriver $imageDriver): Tensor
         ->setImageDriver($imageDriver)
         ->apply();
 
-    $image = Image::read('images/butterfly.jpg');
+    $image = Image::read('images/kyrian-cartoon.jpeg');
 
     $image->rgb();
 
     $tensor =  $image->toTensor();
 
-    dump("$imageDriver->name (toTensor) : ". timeUsage());
+    dump("$imageDriver->name (toTensor) : ". timeUsage(true));
 
     return $tensor;
 }
@@ -37,7 +39,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;
 }
@@ -54,3 +56,6 @@ function fromTensorTest(ImageDriver $imageDriver, Tensor $tensor) : Image
 $image = fromTensorTest(ImageDriver::IMAGICK, $tensor);
 $image = fromTensorTest(ImageDriver::GD, $tensor);
 $image = fromTensorTest(ImageDriver::VIPS, $tensor);
+
+// Save the image
+//$image->save('images/images/kyrian-cartoon-converted.jpeg');

examples/image_detection.php

@@ -10,7 +10,7 @@
 
 $pixels = getPixels($img);
 
-$model = new OnnxRuntime\Model(__DIR__ . '/models/ssd_mobilenet_v1_10.onnx');
+$model = new Codewithkyrian\Transformers\Utils\Model(__DIR__ . '/models/ssd_mobilenet_v1_10.onnx');
 $result = $model->predict(['image_tensor:0' => [$pixels]]);
 
 foreach ($result['num_detections:0'] as $idx => $n) {

examples/pipelines/image-to-text.php

@@ -9,15 +9,15 @@
 require_once './bootstrap.php';
 
 ini_set('memory_limit', -1);
-//$captioner = pipeline('image-to-text', 'Xenova/vit-gpt2-image-captioning');
-$captioner = pipeline('image-to-text', 'Xenova/trocr-small-handwritten');
+$captioner = pipeline('image-to-text', 'Xenova/vit-gpt2-image-captioning');
+//$captioner = pipeline('image-to-text', 'Xenova/trocr-small-handwritten');
 
 //$streamer = StdOutStreamer::make($captioner->tokenizer);
 
 $url = __DIR__ . '/../images/beach.png';
 //$url = __DIR__. '/../images/handwriting.jpg';
 //$url = __DIR__. '/../images/handwriting3.png';
-$url = __DIR__ . '/../images/handwriting4.jpeg';
+//$url = __DIR__ . '/../images/handwriting4.jpeg';
 
 $output = $captioner($url);
 

examples/pipelines/object-detection.php

@@ -4,7 +4,8 @@
 
 namespace Codewithkyrian\Transformers\Pipelines;
 
-use Codewithkyrian\Transformers\Utils\Image;
+use function Codewithkyrian\Transformers\Utils\memoryUsage;
+use function Codewithkyrian\Transformers\Utils\timeUsage;
 
 require_once './bootstrap.php';
 
@@ -16,16 +17,16 @@
 
 $output = $detector($img, threshold: 0.9);
 
-//dd($output, timeUsage(), memoryUsage());
-
-$image = Image::read($img);
-
-foreach ($output as $item) {
-    $box = $item['box'];
-    $image->drawRectangle($box['xmin'], $box['ymin'], $box['xmax'], $box['ymax'], '0099FF', thickness: 2);
-    $image->drawText($item['label'], $box['xmin'], max($box['ymin'] - 5, 0), '/Users/Kyrian/Library/Fonts/JosefinSans-Bold.ttf', 14, '0099FF');
-}
-
-$image->save(__DIR__ . '/../images/cats-detection.jpg');
+dd($output, timeUsage(), memoryUsage());
+
+//$image = Image::read($img);
+//
+//foreach ($output as $item) {
+//    $box = $item['box'];
+//    $image->drawRectangle($box['xmin'], $box['ymin'], $box['xmax'], $box['ymax'], '0099FF', thickness: 2);
+//    $image->drawText($item['label'], $box['xmin'], max($box['ymin'] - 5, 0), '/Users/Kyrian/Library/Fonts/JosefinSans-Bold.ttf', 14, '0099FF');
+//}
+//
+//$image->save(__DIR__ . '/../images/cats-detection.jpg');