2.0 beta (#14)

* Move Swish to main repo * Bring up to speed with ML 2.0 * Appease PHPUnit * Clean up a bit
RubixML · Sep 6, 2022 · 3eb3b3f · 3eb3b3f
1 parent ed21847
commit 3eb3b3f
Show file tree

Hide file tree

Showing 45 changed files with 113 additions and 1,421 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+- 2.0.0-beta
+    - Works with ML 2.0
+    - Move SiLU activation function over to main repo
+    - Move Deduplicator Extractor to main repo
+    - Remove Flysystem Persister
+
 - 1.2.0-beta
     - Added Deduplicator extractor
     - Implement K-mer tokenizer

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2021 Andrew DalPino
+Copyright (c) 2022 The Rubix ML Community
+Copyright (c) 2022 Andrew DalPino
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/benchmarks/NeuralNet/GELUBench.php → ...uralNet/ActivationFunctions/GELUBench.php b/benchmarks/NeuralNet/GELUBench.php → ...uralNet/ActivationFunctions/GELUBench.php
@@ -42,7 +42,7 @@ public function setUp() : void
      */
     public function compute() : void
     {
-        $this->activationFn->compute($this->z);
+        $this->activationFn->activate($this->z);
     }
 
     /**

diff --git a/benchmarks/NeuralNet/ActivationFunctions/ISRLUBench.php b/benchmarks/NeuralNet/ActivationFunctions/ISRLUBench.php
@@ -42,7 +42,7 @@ public function setUp() : void
      */
     public function compute() : void
     {
-        $this->activationFn->compute($this->z);
+        $this->activationFn->activate($this->z);
     }
 
     /**

diff --git a/benchmarks/NeuralNet/ActivationFunctions/ISRUBench.php b/benchmarks/NeuralNet/ActivationFunctions/ISRUBench.php
@@ -42,7 +42,7 @@ public function setUp() : void
      */
     public function compute() : void
     {
-        $this->activationFn->compute($this->z);
+        $this->activationFn->activate($this->z);
     }
 
     /**

diff --git a/benchmarks/NeuralNet/ActivationFunctions/SiLUBench.php b/benchmarks/NeuralNet/ActivationFunctions/SiLUBench.php
diff --git a/benchmarks/Serializers/RBXEBench.php b/benchmarks/Serializers/RBXEBench.php
@@ -16,7 +16,7 @@ class RBXEBench
     protected const TRAINING_SIZE = 2500;
 
     /**
-     * @var \Rubix\ML\Persisters\Serializers\RBXE
+     * @var \Rubix\ML\Serializers\RBXE
      */
     protected $serializer;
 

diff --git a/benchmarks/Transformers/BM25TransformerBench.php b/benchmarks/Transformers/BM25TransformerBench.php
@@ -25,12 +25,12 @@ class BM25TransformerBench
     protected $transformer;
 
     /**
-     * @var array[]
+     * @var array<array<mixed>>
      */
     protected $aSamples;
 
     /**
-     * @var array[]
+     * @var array<array<mixed>>
      */
     protected $bSamples;
 

diff --git a/composer.json b/composer.json
@@ -12,7 +12,6 @@
     "authors": [
         { 
             "name": "Andrew DalPino",
-            "role": "Project Lead",
             "homepage": "https://github.com/andrewdalpino",
             "email": "support@andrewdalpino.com"
         },
@@ -23,18 +22,15 @@
     ],
     "require": {
         "php": ">=7.4",
-        "league/flysystem": "1.x.x|2.x.x",
-        "rubix/ml": "^1.0",
-        "scienide/okbloomer": "^1.0@beta"
+        "rubix/ml": "^2.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.1",
-        "league/flysystem-memory": "1.x.x|2.x.x",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "phpbench/phpbench": "^1.0",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "0.12.*",
-        "phpstan/phpstan-phpunit": "0.12.*",
-        "phpunit/phpunit": "8.5.*"
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -66,12 +62,15 @@
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
-        "process-timeout": 3000
+        "process-timeout": 3000,
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     },
     "funding": [
         {
             "type": "github",
-            "url": "https://github.com/sponsors/andrewdalpino"
+            "url": "https://github.com/sponsors/RubixML"
         }
     ],
     "support": {

diff --git a/docs/extractors/deduplicator.md b/docs/extractors/deduplicator.md
diff --git a/docs/neural-network/activation-functions/silu.md b/docs/neural-network/activation-functions/silu.md
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,5 +3,4 @@ parameters:
     paths:
         - 'src'
         - 'tests'
-    excludePaths:
-        - *FlysystemV1*
+        - 'benchmarks'
diff --git a/phpunit.xml b/phpunit.xml
@@ -19,9 +19,6 @@
         <testsuite name="NeuralNet">
             <directory>tests/NeuralNet</directory>
         </testsuite>
-        <testsuite name="Persisters">
-            <directory>tests/Persisters</directory>
-        </testsuite>
         <testsuite name="Serializers">
             <directory>tests/Serializers</directory>
         </testsuite>

diff --git a/src/Extractors/Deduplicator.php b/src/Extractors/Deduplicator.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ public function setUp() : void @@
          */
         public function compute() : void
         {
-            $this->activationFn->compute($this->z);
+            $this->activationFn->activate($this->z);
         }
         /**
@@ Expand Down @@