Update to Rubix ML 0.1.0

RubixML · Aug 7, 2020 · 1c0c452 · 1c0c452
1 parent cbb835a
commit 1c0c452
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ $samples = $labels = [];
 for ($label = 0; $label < 10; $label++) {
     foreach (glob("training/$label/*.png") as $file) {
         $samples[] = [imagecreatefrompng($file)];
-        $labels[] = (string) $label;
+        $labels[] = "$label";
     }
 }
 ```
@@ -144,7 +144,7 @@ $samples = $labels = [];
 for ($label = 0; $label < 10; $label++) {
     foreach (glob("testing/$label/*.png") as $file) {
         $samples[] = [imagecreatefrompng($file)];
-        $labels[] = (string) $label;
+        $labels[] = "$label";
     }
 }
 

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "require": {
         "php": ">=7.2",
         "ext-gd": "*",
-        "rubix/ml": "^0.1.0-rc3"
+        "rubix/ml": "^0.1.0"
     },
     "suggest": {
         "ext-tensor": "For faster training and inference"

diff --git a/train.php b/train.php
@@ -16,7 +16,7 @@
 use Rubix\ML\NeuralNet\Optimizers\Adam;
 use Rubix\ML\Persisters\Filesystem;
 use Rubix\ML\Other\Loggers\Screen;
-use League\Csv\Writer;
+use Rubix\ML\Datasets\Unlabeled;
 
 use function Rubix\ML\array_transpose;
 
@@ -29,7 +29,7 @@
 for ($label = 0; $label < 10; $label++) {
     foreach (glob("training/$label/*.png") as $file) {
         $samples[] = [imagecreatefrompng($file)];
-        $labels[] = (string) $label;
+        $labels[] = "$label";
     }
 }
 
@@ -54,7 +54,7 @@
     new Filesystem('mnist.model', true)
 );
 
-$estimator->setLogger(new Screen('MNIST'));
+$estimator->setLogger(new Screen());
 
 echo 'Training ...' .  PHP_EOL;
 
@@ -63,9 +63,9 @@
 $scores = $estimator->scores();
 $losses = $estimator->steps();
 
-$writer = Writer::createFromPath('progress.csv', 'w+');
-$writer->insertOne(['score', 'loss']);
-$writer->insertAll(array_transpose([$scores, $losses]));
+Unlabeled::build(array_transpose([$scores, $losses]))
+    ->toCSV(['scores', 'losses'])
+    ->write('progress.csv');
 
 echo 'Progress saved to progress.csv' . PHP_EOL;
 

diff --git a/validate.php b/validate.php
@@ -18,7 +18,7 @@
 for ($label = 0; $label < 10; $label++) {
     foreach (glob("testing/$label/*.png") as $file) {
         $samples[] = [imagecreatefrompng($file)];
-        $labels[] = (string) $label;
+        $labels[] = "$label";
     }
 }
 
@@ -37,6 +37,8 @@
 
 $results = $report->generate($predictions, $dataset->labels());
 
-file_put_contents('report.json', json_encode($results, JSON_PRETTY_PRINT));
+echo $results;
+
+$results->toJSON()->write('report.json');
 
 echo 'Report saved to report.json' . PHP_EOL;