Version 2.0.0 changes

cca_zoo/classical/_iterative/_altmaxvar.py

@@ -36,6 +36,7 @@ def __init__(
             convergence_checking=convergence_checking,
             track=track,
             verbose=verbose,
+            trainer_kwargs={"accelerator": "cpu"}
         )
         self.tau = tau
         self.proximal = proximal

cca_zoo/classical/_iterative/_elasticnet.py

@@ -101,6 +101,7 @@ def __init__(
             patience=0,
             track=track,
             verbose=verbose,
+            trainer_kwargs={"accelerator": "cpu"}
         )
 
     def _check_params(self):

cca_zoo/classical/_iterative/_pls_als.py

@@ -59,7 +59,6 @@ def __init__(
         learning_rate=1,
         initialization: Union[str, callable] = "random",
         callbacks=None,
-        trainer_kwargs=None,
     ):
         super().__init__(
             latent_dimensions,
@@ -75,7 +74,7 @@ def __init__(
             learning_rate=learning_rate,
             initialization=initialization,
             callbacks=callbacks,
-            trainer_kwargs=trainer_kwargs,
+            trainer_kwargs={"accelerator": "cpu"}
         )
 
     def _get_module(self, weights=None, k=None):

cca_zoo/classical/_iterative/_pmd.py

@@ -88,6 +88,7 @@ def __init__(
             patience=0,
             track=track,
             verbose=verbose,
+            trainer_kwargs={"accelerator": "cpu"}
         )
         self.tau = tau
         self.positive = positive
@@ -113,7 +114,7 @@ def _get_module(self, weights=None, k=None):
             k=k,
             tau=self.tau,
             tol=self.tol,
-            track=self.track,
+            tracking=self.track,
             convergence_checking=self.convergence_checking,
         )
 
@@ -128,13 +129,13 @@ def __init__(
         k=None,
         tau=None,
         tol=1e-3,
-        track=False,
+        tracking=False,
         convergence_checking=False,
     ):
         super().__init__(
             weights=weights,
             k=k,
-            tracking=track,
+            tracking=tracking,
             convergence_checking=convergence_checking,
         )
         self.tau = tau
@@ -163,7 +164,7 @@ def training_step(self, batch, batch_idx):
                     f"All result weights are zero in view {view_index}. "
                     "Try less regularisation or another initialisation"
                 )
-        # if track or convergence_checking is enabled, compute the objective function
+        # if tracking or convergence_checking is enabled, compute the objective function
         if self.tracking or self.convergence_checking:
             objective = self.objective(batch["views"])
             # check that the maximum change in weights is smaller than the tolerance times the maximum absolute value of the weights

cca_zoo/classical/_iterative/_scca_parkhomenko.py

@@ -69,6 +69,7 @@ def __init__(
             patience=patience,
             track=track,
             verbose=verbose,
+            trainer_kwargs={"accelerator": "cpu"}
         )
 
     def _check_params(self):

cca_zoo/classical/_iterative/_scca_span.py

@@ -61,6 +61,7 @@ def __init__(
             random_state=random_state,
             deflation=deflation,
             verbose=verbose,
+            trainer_kwargs={"accelerator": "cpu"}
         )
         self.tau = tau
         self.regularisation = regularisation

requirements.txt

@@ -2,12 +2,12 @@ numpy
 scipy
 scikit-learn
 scikit-prox
-pytest
 matplotlib
 pandas
 seaborn
 tensorly
 joblib
 mvlearn
 tqdm
-setuptools
+pytorch
+pytorch-lightning