Merge pull request #723 from nextcloud/revert/mozart

nextcloud · Mar 8, 2023 · 622ce63 · 622ce63
2 parents 7cf3525 + b8f50d4
commit 622ce63
Show file tree

Hide file tree

Showing 17 changed files with 305 additions and 123 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -12,7 +12,5 @@
 	->notPath('l10n')
 	->notPath('src')
 	->notPath('vendor')
-	->notPath('lib/Vendor')
-	->notPath('lib/autoload')
 	->in(__DIR__);
 return $config;
diff --git a/composer.json b/composer.json
@@ -24,12 +24,10 @@
         "test:unit": "phpunit --config tests/phpunit.xml",
         "post-install-cmd": [
             "@composer bin all install --ansi",
-            "\"vendor/bin/mozart\" compose",
             "composer dump-autoload"
         ],
         "post-update-cmd": [
             "@composer bin all update --ansi",
-            "\"vendor/bin/mozart\" compose",
             "composer dump-autoload"
         ]
     },
@@ -45,23 +43,5 @@
         "classmap-authoritative": true,
         "optimize-autoloader": true,
         "sort-packages": true
-    },
-    "extra": {
-        "mozart": {
-            "dep_namespace": "OCA\\Recognize\\Vendor\\",
-            "dep_directory": "/lib/Vendor/",
-            "classmap_directory": "/lib/autoload/",
-            "classmap_prefix": "NEXTCLOUDRECOGNIZE_",
-            "excluded_packages": [
-                "symfony/polyfill-php72",
-                "symfony/polyfill-php80",
-                "symfony/polyfill-iconv",
-                "symfony/polyfill-intl",
-                "symfony/polyfill-intl-normalizer",
-                "symfony/polyfill-mbstring",
-                "symfony/console",
-                "psr/log"
-            ]
-        }
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -43,11 +43,6 @@ public function __construct() {
 	public function register(IRegistrationContext $context): void {
 		@include_once __DIR__ . '/../../vendor/autoload.php';
 
-		// Load Rubix functions because Mozart doesn't pick up on them
-		// see https://github.com/coenjacobs/mozart/issues/66
-		require_once(__DIR__.'/../Vendor/Rubix/ML/functions.php');
-		require_once(__DIR__.'/../Vendor/Rubix/ML/constants.php');
-
 		/** Register $principalBackend for the DAV collection */
 		$context->registerServiceAlias('principalBackend', Principal::class);
 	}

diff --git a/lib/Classifiers/Classifier.php b/lib/Classifiers/Classifier.php
@@ -21,9 +21,9 @@
 use OCP\IPreview;
 use OCP\ITempManager;
 use Psr\Log\LoggerInterface;
-use OCA\Recognize\Vendor\Symfony\Component\Process\Exception\ProcessTimedOutException;
-use OCA\Recognize\Vendor\Symfony\Component\Process\Exception\RuntimeException;
-use OCA\Recognize\Vendor\Symfony\Component\Process\Process;
+use Symfony\Component\Process\Exception\ProcessTimedOutException;
+use Symfony\Component\Process\Exception\RuntimeException;
+use Symfony\Component\Process\Process;
 
 class Classifier {
 	public const TEMP_FILE_DIMENSION = 1024;

diff --git a/lib/Clustering/DualTreeBall.php b/lib/Clustering/DualTreeBall.php
@@ -6,11 +6,11 @@
 
 namespace OCA\Recognize\Clustering;
 
-use OCA\Recognize\Vendor\Rubix\ML\Datasets\Labeled;
-use OCA\Recognize\Vendor\Rubix\ML\Graph\Nodes\Ball;
-use OCA\Recognize\Vendor\Rubix\ML\Helpers\Stats;
-use OCA\Recognize\Vendor\Rubix\ML\Kernels\Distance\Distance;
-use function OCA\Recognize\Vendor\Rubix\ML\argmax;
+use \Rubix\ML\Datasets\Labeled;
+use \Rubix\ML\Graph\Nodes\Ball;
+use \Rubix\ML\Helpers\Stats;
+use \Rubix\ML\Kernels\Distance\Distance;
+use function \Rubix\ML\argmax;
 
 class DualTreeBall extends Ball {
 	protected float $longestDistanceInNode = INF;
@@ -97,8 +97,8 @@ public function propagateSetChanges(array &$labelToSetId) {
 	/**
 	 * Factory method to build a hypersphere by splitting the dataset into left and right clusters.
 	 *
-	 * @param \OCA\Recognize\Vendor\Rubix\ML\Datasets\Labeled $dataset
-	 * @param \OCA\Recognize\Vendor\Rubix\ML\Kernels\Distance\Distance $kernel
+	 * @param \Rubix\ML\Datasets\Labeled $dataset
+	 * @param \Rubix\ML\Kernels\Distance\Distance $kernel
 	 * @return self
 	 */
 	public static function split(Labeled $dataset, Distance $kernel): self {