RRAEsTorch 0.1.5__tar.gz → 0.1.6__tar.gz

{rraestorch-0.1.5 → rraestorch-0.1.6}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: RRAEsTorch
-Version: 0.1.5
+Version: 0.1.6
 Summary:  A repo for RRAEs in PyTorch.
 Author-email: Jad Mounayer <jad.mounayer@outlook.com>
 License: MIT
 License-File: LICENSE
-License-File: LICENSE copy
 Requires-Python: >=3.10
 Requires-Dist: dill
 Requires-Dist: jaxtyping

{rraestorch-0.1.5 → rraestorch-0.1.6}/RRAEsTorch/AE_classes/AE_classes.py

@@ -127,7 +127,7 @@ def latent_func_var_strong_RRAE(self, y, k_max=None, epsilon=None, return_dist=F
     if epsilon is not None:
         if len(epsilon.shape) == 4:
             epsilon = epsilon[0, 0] # to allow tpu sharding
-        z = mean + torch.tensor(epsilon, dtype=torch.float32) * std
+        z = mean + epsilon * std
     else:
         z = mean
 
@@ -612,10 +612,6 @@ class VRRAE_CNN1D(CNN1D_Autoencoder):
     typ: int
 
     def __init__(self, channels, input_dim, latent_size, k_max, typ="eye", *, count=1, **kwargs):
-        v_Linear = vmap_wrap(Linear, -1, count=count)
-        self.lin_mean = v_Linear(k_max, k_max,)
-        self.lin_logvar = v_Linear(k_max, k_max)
-        self.typ = typ
         super().__init__(
             channels,
             input_dim,
@@ -623,6 +619,12 @@ class VRRAE_CNN1D(CNN1D_Autoencoder):
             count=count,
             **kwargs,
         )
+        
+        v_Linear = vmap_wrap(Linear, -1, count=count)
+        self.lin_mean = v_Linear(k_max, k_max,)
+        self.lin_logvar = v_Linear(k_max, k_max)
+        self.typ = typ
+        
 
     def _perform_in_latent(self, y, *args, k_max=None, epsilon=None, return_dist=False, return_lat_dist=False, **kwargs):
         return latent_func_var_strong_RRAE(self, y, k_max, epsilon, return_dist, return_lat_dist, **kwargs)

{rraestorch-0.1.5 → rraestorch-0.1.6}/RRAEsTorch/training_classes/training_classes.py

@@ -229,7 +229,8 @@ class Trainor_class:
         save_losses=False,
         input_val=None,
         output_val=None,
-        latent_size=0
+        latent_size=0,
+        device="cpu"
     ):
         assert isinstance(input, torch.Tensor), "Input should be a torch tensor"
         assert isinstance(output, torch.Tensor), "Output should be a torch tensor"
@@ -301,7 +302,12 @@ class Trainor_class:
             all_losses = []
 
         
-        
+        model = model.to(device)
+
+        if input_val is not None:
+            dataset_val = TensorDataset(input_val.permute(*range(input_val.ndim - 1, -1, -1)), output_val.permute(*range(output_val.ndim - 1, -1, -1)), torch.arange(0, input_val.shape[-1], 1))
+            dataloader_val = DataLoader(dataset_val, batch_size=input_val.shape[-1], shuffle=False)
+
         # Outler Loop
         for steps, lr, batch_size in zip(step_st, lr_st, batch_size_st):
             try:
@@ -340,6 +346,9 @@ class Trainor_class:
                     step_kwargs = merge_dicts(loss_kwargs, track_params)
 
                     # Compute loss
+                    input_b = input_b.to(device)
+                    out_b = out_b.to(device)
+                    
                     loss, model, optimizer_tr, (aux, extra_track) = make_step(
                                                                 model,
                                                                 input_b,
@@ -351,12 +360,17 @@ class Trainor_class:
                                                             )
                     
                     if input_val is not None:
+                        val_loss = []
+                        for input_vb, out_vb, idx_b in dataloader_val:
+                            input_vb = input_vb.permute(*range(input_vb.ndim - 1, -1, -1))
+                            out_vb = self.model.norm_out.default(None, pre_func_out(out_vb))    # Pre-process batch out values
+                            out_vb = out_vb.permute(*range(out_vb.ndim - 1, -1, -1))
     
-
-                        idx = np.arange(input_val.shape[-1])
-                        val_loss, _ = loss_fun(
-                            model, input_val, output_val, idx=idx, epsilon=None, **step_kwargs
-                        )
+                            val_loss_batch = loss_fun(
+                                model, input_vb.to(device), out_vb.to(device), idx=idx_b, epsilon=None, **step_kwargs
+                            )[0]
+                            val_loss.append(val_loss_batch.item())
+                        val_loss = sum(val_loss) / len(val_loss)
                         aux["val_loss"] = val_loss
                     else:
                         aux["val_loss"] = None
@@ -618,7 +632,7 @@ class Trainor_class:
             dill.dump(obj, f)
         print(f"Object saved in {filename}")
 
-    def load_model(self, filename=None, erase=False, path=None, orig_model_cls=None, **fn_kwargs):
+    def load_model(self, filename=None, erase=False, path=None, orig_model_cls=None, device="cpu",**fn_kwargs):
         """NOTE: fn_kwargs defines the functions of the model
         (e.g. final_activation, inner activation), if
         needed to be saved/loaded on different devices/OS.
@@ -660,7 +674,7 @@ class Trainor_class:
             
             model = model_cls(**kwargs)
             model.load_state_dict(save_dict["model_state_dict"])
-            self.model = model
+            self.model = model.to(device)
             attributes = save_dict["attr"]
 
             for key in attributes:
@@ -849,8 +863,10 @@ class RRAE_Trainor_class(AE_Trainor_class):
                 ft_end_type = "concat"
                 basis_call_kwargs = {}
 
+            device = ft_kwargs.get("device", "cpu")
+            
             ft_model, ft_track_params = self.fine_tune_basis(
-                None, args=args, kwargs=ft_kwargs, get_basis=get_basis, end_type=ft_end_type, basis_call_kwargs=basis_call_kwargs
+                None, args=args, kwargs=ft_kwargs, get_basis=get_basis, end_type=ft_end_type, basis_call_kwargs=basis_call_kwargs, device=device
             )  # fine tune basis
             self.ft_track_params = ft_track_params
         else:
@@ -858,7 +874,7 @@ class RRAE_Trainor_class(AE_Trainor_class):
             ft_track_params = {}
         return model, track_params, ft_model, ft_track_params
 
-    def fine_tune_basis(self, basis=None, get_basis=True, end_type="concat", basis_call_kwargs={}, *, args, kwargs):
+    def fine_tune_basis(self, basis=None, get_basis=True, end_type="concat", basis_call_kwargs={}, device="cpu", *, args, kwargs):
 
         if "loss" in kwargs:
             norm_loss_ = kwargs["loss"]
@@ -884,24 +900,24 @@ class RRAE_Trainor_class(AE_Trainor_class):
                     inpT = inp.permute(*range(inp.ndim - 1, -1, -1))
                     dataset = TensorDataset(inpT)
                     dataloader = DataLoader(dataset, batch_size=basis_batch_size, shuffle=False)
+                    model = self.model.to(device)
 
                     all_bases = []
                     
                     for inp_b in dataloader:
                         inp_bT = inp_b[0].permute(*range(inp_b[0].ndim - 1, -1, -1))
-                        all_bases.append(self.model.latent(
-                            self.pre_func_inp(inp_bT), get_basis_coeffs=True, **basis_kwargs
-                        )[0]
+                        all_bases.append(model.latent(
+                            self.pre_func_inp(inp_bT.to(device)), get_basis_coeffs=True, **basis_kwargs
+                        )[0].to("cpu")
                         )
                     if end_type == "concat":
                         all_bases = torch.concatenate(all_bases, axis=1)
-                        print(all_bases.shape)
                         basis = torch.linalg.svd(all_bases, full_matrices=False)[0]
                         self.basis = basis[:, : self.track_params["k_max"]]
                     else:
                         self.basis = all_bases
                 else:
-                    bas = self.model.latent(self.pre_func_inp(inp[..., 0:1]), get_basis_coeffs=True, **self.track_params)[0]
+                    bas = model.latent(self.pre_func_inp(inp[..., 0:1].to(device)), get_basis_coeffs=True, **self.track_params)[0].to("cpu")
                     self.basis = torch.eye(bas.shape[0])
         else:
             self.basis = basis
@@ -932,10 +948,10 @@ class RRAE_Trainor_class(AE_Trainor_class):
         batch_size=None,
         pre_func_inp=lambda x: x,
         pre_func_out=lambda x: x,
-        call_func=None,
+        device="cpu",
     ):
 
-        call_func = lambda x: self.model(pre_func_inp(x), apply_basis=self.basis, epsilon=None)
+        call_func = lambda x: self.model(pre_func_inp(x.to(device)), apply_basis=self.basis.to(device), epsilon=None).to("cpu")
         res = super().evaluate(
             x_train_o,
             y_train_o,
@@ -945,6 +961,7 @@ class RRAE_Trainor_class(AE_Trainor_class):
             call_func=call_func,
             pre_func_inp=pre_func_inp,
             pre_func_out=pre_func_out,
+            device=device,
         )
         return res
 

{rraestorch-0.1.5 → rraestorch-0.1.6}/RRAEsTorch/utilities/utilities.py

@@ -1510,7 +1510,6 @@ class MLP_with_CNN3D_trans(torch.nn.Module):
         self.out_after_mlp = out_after_mlp
 
     def forward(self, x, *args, **kwargs):
-        print(x.shape)
         x = self.layers[0](x)
         x = torch.reshape(x, (self.out_after_mlp, self.first_D0, self.first_D1, self.first_D2))
         x = self.layers[1](x)

{rraestorch-0.1.5 → rraestorch-0.1.6}/main-CNN.py

@@ -68,6 +68,8 @@ if __name__ == "__main__":
     # you need to specify training kw arguments (first stage of training with SVD to
     # find the basis), and fine-tuning kw arguments (second stage of training with the
     # basis found in the first stage).
+    device = "cuda" if torch.cuda.is_available() else "cpu"
+
     training_kwargs = {
         "step_st": [2,],  # Increase those to train well
         "batch_size_st": [20, 64],
@@ -75,6 +77,7 @@ if __name__ == "__main__":
         "print_every": 1,
         # "save_every": 789,
         "loss_type": loss_type,
+        "device": device,
         "save_losses": True # if you want to save losses to plot them later
     }
 
@@ -83,6 +86,7 @@ if __name__ == "__main__":
         "batch_size_st": [20],
         "lr_st": [1e-4, 1e-6, 1e-7, 1e-8],
         "print_every": 100,
+        "device": device,
         # "save_every": 50,
     }
 
@@ -103,12 +107,12 @@ if __name__ == "__main__":
     # trainor.plot_training_losses(idx=0) # to plot both training and validation losses
 
     preds = trainor.evaluate(
-        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out
+        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out, device
     )
     # NOTE: preds are not saved so uncomment last line if you want to save/plot etc.
 
     trainor.save_model(kwargs=kwargs)
-    
+
     # Uncomment the following line if you want to hold the session to check your
     # results in the console.
     # pdb.set_trace()

{rraestorch-0.1.5 → rraestorch-0.1.6}/main-CNN1D.py

@@ -51,8 +51,8 @@ if __name__ == "__main__":
         k_max=k_max,
         folder=f"{problem}",
         file=f"{method}_{problem}_test.pkl",
-        norm_in="minmax",
-        norm_out="minmax",
+        norm_in="None",
+        norm_out="None",
         out_train=x_train,
         kwargs_enc={
             "width_CNNs": [32, 64, 128],
@@ -73,6 +73,8 @@ if __name__ == "__main__":
     # you need to specify training kw arguments (first stage of training with SVD to
     # find the basis), and fine-tuning kw arguments (second stage of training with the
     # basis found in the first stage).
+    device = "cuda" if torch.cuda.is_available() else "cpu"
+
     training_kwargs = {
         "step_st": [2],  # Increase those to train well
         "batch_size_st": [64, 64],
@@ -80,6 +82,7 @@ if __name__ == "__main__":
         "print_every": 1,
         # "save_every": 789,
         "loss_type": loss_type,
+        "device": device,
     }
 
     ft_kwargs = {
@@ -87,6 +90,7 @@ if __name__ == "__main__":
         "batch_size_st": [64],
         "lr_st": [1e-4, 1e-6, 1e-7, 1e-8],
         "print_every": 100,
+        "device": device,
         # "save_every": 50,
     }
 
@@ -100,7 +104,7 @@ if __name__ == "__main__":
         pre_func_out=pre_func_out,
     )
     preds = trainor.evaluate(
-        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out
+        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out, device
     )
     # NOTE: preds are not saved so uncomment last line if you want to save/plot etc.
 

{rraestorch-0.1.5 → rraestorch-0.1.6}/main-CNN3D.py

@@ -3,6 +3,7 @@ import RRAEsTorch.config
 from RRAEsTorch.AE_classes import *
 from RRAEsTorch.training_classes import RRAE_Trainor_class
 import numpy.random as random
+import torch
 
 if __name__ == "__main__":
 
@@ -67,6 +68,8 @@ if __name__ == "__main__":
     # you need to specify training kw arguments (first stage of training with SVD to
     # find the basis), and fine-tuning kw arguments (second stage of training with the
     # basis found in the first stage).
+    device = "cuda" if torch.cuda.is_available() else "cpu"
+
     training_kwargs = {
         "step_st": [2,],  # Increase those to train well
         "batch_size_st": [64, 64],
@@ -74,6 +77,7 @@ if __name__ == "__main__":
         "print_every": 1,
         # "save_every": 789,
         "loss_type": loss_type,
+        "device": device,
     }
 
     ft_kwargs = {
@@ -81,6 +85,7 @@ if __name__ == "__main__":
         "batch_size_st": [20],
         "lr_st": [1e-4, 1e-6, 1e-7, 1e-8],
         "print_every": 100,
+        "device": device,
         # "save_every": 50,
     }
 
@@ -93,7 +98,10 @@ if __name__ == "__main__":
         #pre_func_inp=pre_func_inp,
         #pre_func_out=pre_func_out,
     )
-        
+
+    preds = trainor.evaluate(
+        x_train, y_train, x_test, y_test, None, device=device
+    )    
     # NOTE: preds are not saved so uncomment last line if you want to save/plot etc.
 
     #trainor.save_model(kwargs=kwargs)

{rraestorch-0.1.5 → rraestorch-0.1.6}/main-MLP.py

@@ -3,6 +3,7 @@ import RRAEsTorch.config # Include this in all your scripts
 from RRAEsTorch.AE_classes import *
 from RRAEsTorch.training_classes import RRAE_Trainor_class  # , Trainor_class
 from RRAEsTorch.utilities import get_data
+import torch
 
 if __name__ == "__main__":
     # Step 1: Get the data - replace this with your own data of the same shape.
@@ -61,13 +62,16 @@ if __name__ == "__main__":
     # you need to specify training kw arguments (first stage of training with SVD to
     # find the basis), and fine-tuning kw arguments (second stage of training with the
     # basis found in the first stage).
+    device = "cuda" if torch.cuda.is_available() else "cpu"
+
     training_kwargs = {
         "step_st": [2],  # Increase this to train well (e.g. 2000)
         "batch_size_st": [64, 64, 64, 64, 64],
         "lr_st": [1e-3, 1e-4, 1e-5, 1e-6, 1e-7, 1e-8],
         "print_every": 1,
         "loss_type": loss_type,
-        "save_losses":True
+        "save_losses":True,
+        "device": device,
     }
 
     ft_kwargs = {
@@ -75,6 +79,7 @@ if __name__ == "__main__":
         "batch_size_st": [64],
         "lr_st": [1e-3, 1e-4, 1e-5, 1e-6, 1e-7, 1e-8],
         "print_every": 1,
+        "device": device,
     }
 
     # Step 6: Train the model and get the predictions.
@@ -97,7 +102,7 @@ if __name__ == "__main__":
 
 
     preds = trainor.evaluate(
-        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out
+        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out, device
     )
 
 

{rraestorch-0.1.5 → rraestorch-0.1.6}/main-adap-CNN.py

@@ -7,7 +7,7 @@ from RRAEsTorch.AE_classes import RRAE_CNN
 from RRAEsTorch.training_classes import RRAE_Trainor_class
 from RRAEsTorch.trackers import RRAE_gen_Tracker, RRAE_fixed_Tracker, RRAE_pars_Tracker
 from RRAEsTorch.utilities import get_data
-
+import torch
 
 if __name__ == "__main__":
     # Step 1: Get the data - replace this with your own data of the same shape.
@@ -69,13 +69,16 @@ if __name__ == "__main__":
         },
     )
 
+    device = "cuda" if torch.cuda.is_available() else "cpu"
+
     training_kwargs = {
         "step_st": [2,],  # increase for a very big value
         "batch_size_st": [64,],
         "lr_st": [1e-3, 1e-4, 1e-7, 1e-8],
         "print_every": 1,
         "loss_type": loss_type,
-        "tracker": RRAE_gen_Tracker(k_init=k_max, patience_init=50)
+        "tracker": RRAE_gen_Tracker(k_init=k_max, patience_init=50),
+        "device": device,
     }
 
     # The tracker above will specify the adaptive scheme to be used. Gen means generic and it
@@ -89,6 +92,7 @@ if __name__ == "__main__":
         "batch_size_st": [64],
         "lr_st": [1e-4, 1e-5, 1e-6, 1e-7, 1e-8],
         "print_every": 1,
+        "device": device,
     }
 
     trainor.fit(
@@ -101,7 +105,7 @@ if __name__ == "__main__":
     )
 
     preds = trainor.evaluate(
-        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out
+        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out, device
     )
 
     # Uncomment the following line if you want to hold the session to check your

{rraestorch-0.1.5 → rraestorch-0.1.6}/main-adap-MLP.py

@@ -7,7 +7,7 @@ from RRAEsTorch.AE_classes import RRAE_MLP
 from RRAEsTorch.training_classes import RRAE_Trainor_class, Trainor_class
 from RRAEsTorch.trackers import RRAE_gen_Tracker, RRAE_fixed_Tracker, RRAE_pars_Tracker
 from RRAEsTorch.utilities import get_data
-
+import torch
 
 if __name__ == "__main__":
     # Step 1: Get the data - replace this with your own data of the same shape.
@@ -68,13 +68,16 @@ if __name__ == "__main__":
     # you need to specify training kw arguments (first stage of training with SVD to
     # find the basis), and fine-tuning kw arguments (second stage of training with the
     # basis found in the first stage).
+    device = "cuda" if torch.cuda.is_available() else "cpu"
+
     training_kwargs = {
         "step_st": [2], # Increase those to train better
         "batch_size_st": [64, 64, 64, 64, 64],
         "lr_st": [1e-3, 1e-4, 1e-5, 1e-6, 1e-7, 1e-8],
         "print_every": 1,
         "loss_type": loss_type,
-        "tracker": RRAE_gen_Tracker(k_init=k_max, patience_init=200)
+        "tracker": RRAE_gen_Tracker(k_init=k_max, patience_init=200),
+        "device": device,
     }
 
     # The tracker above will specify the adaptive scheme to be used. Gen means generic and it
@@ -88,6 +91,7 @@ if __name__ == "__main__":
         "batch_size_st": [64],
         "lr_st": [1e-3, 1e-4, 1e-5, 1e-6, 1e-7, 1e-8],
         "print_every": 1,
+        "device": device,
     }
 
     # Step 6: Train the model and get the predictions.
@@ -101,7 +105,7 @@ if __name__ == "__main__":
     )
 
     preds = trainor.evaluate(
-        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out
+        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out, device
     )
 
     # Uncomment the following line if you want to hold the session to check your

{rraestorch-0.1.5 → rraestorch-0.1.6}/main-var-CNN.py

@@ -4,6 +4,7 @@ from RRAEsTorch.AE_classes import *
 from RRAEsTorch.training_classes import RRAE_Trainor_class, Trainor_class  # , Trainor_class
 from RRAEsTorch.utilities import get_data
 import numpy as np
+import torch
 
 
 if __name__ == "__main__":
@@ -43,9 +44,9 @@ if __name__ == "__main__":
 
     match method:
         case "VRRAE":
-            eps_fn = lambda lat, bs: np.random.normal(0, 1, size=(1, 1, k_max, bs))
+            eps_fn = lambda lat, bs: torch.tensor(np.random.normal(0, 1, size=(1, 1, k_max, bs)), dtype=torch.float32, device=device)
         case "VAE":
-            eps_fn = lambda lat, bs: np.random.normal(size=(1, 1, lat, bs))
+            eps_fn = lambda lat, bs: torch.tensor(np.random.normal(size=(1, 1, lat, bs)), dtype=torch.float32, device=device)
 
     # Step 3: Specify the archietectures' parameters:
     latent_size = 200  # latent space dimension
@@ -86,6 +87,8 @@ if __name__ == "__main__":
     # you need to specify training kw arguments (first stage of training with SVD to
     # find the basis), and fine-tuning kw arguments (second stage of training with the
     # basis found in the first stage).
+    device = "cuda" if torch.cuda.is_available() else "cpu"
+
     training_kwargs = {
         "step_st": [2],  # 7680*data_size/64
         "batch_size_st": [64],
@@ -94,6 +97,7 @@ if __name__ == "__main__":
         "loss_type": loss_type,
         "loss_kwargs": {"beta": 0.001},
         "eps_fn": eps_fn,
+        "device": device,
     }
 
 
@@ -102,7 +106,8 @@ if __name__ == "__main__":
         "batch_size_st": [64],
         "lr_st": [1e-4, 1e-6, 1e-7, 1e-8],
         "print_every": 1,
-        "eps_fn": eps_fn
+        "eps_fn": eps_fn,
+        "device": device,
     }
 
 
@@ -122,7 +127,7 @@ if __name__ == "__main__":
     trainor.save_model()
 
     preds = trainor.evaluate(
-        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out
+        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out, device
     )
             
     # pdb.set_trace()

{rraestorch-0.1.5 → rraestorch-0.1.6}/main-var-CNN1D.py

@@ -4,6 +4,7 @@ from RRAEsTorch.AE_classes import *
 from RRAEsTorch.training_classes import RRAE_Trainor_class, Trainor_class  # , Trainor_class
 from RRAEsTorch.utilities import get_data
 import numpy as np
+import torch
 
 
 if __name__ == "__main__":
@@ -45,9 +46,9 @@ if __name__ == "__main__":
 
     match method:
         case "VRRAE":
-            eps_fn = lambda lat, bs: np.random.normal(0, 1, size=(1, 1, k_max, bs))
+            eps_fn = lambda lat, bs: torch.tensor(np.random.normal(0, 1, size=(1, 1, k_max, bs)), dtype=torch.float32, device=device)
         case "VAE":
-            eps_fn = lambda lat, bs: np.random.normal(size=(1, 1, lat, bs))
+            eps_fn = lambda lat, bs: torch.tensor(np.random.normal(size=(1, 1, lat, bs)), dtype=torch.float32, device=device)
 
     # Step 3: Specify the archietectures' parameters:
     latent_size = 200  # latent space dimension
@@ -88,6 +89,8 @@ if __name__ == "__main__":
     # you need to specify training kw arguments (first stage of training with SVD to
     # find the basis), and fine-tuning kw arguments (second stage of training with the
     # basis found in the first stage).
+    device = "cuda" if torch.cuda.is_available() else "cpu"
+
     training_kwargs = {
         "step_st": [2],  # 7680*data_size/64
         "batch_size_st": [64],
@@ -96,6 +99,7 @@ if __name__ == "__main__":
         "loss_type": loss_type,
         "loss_kwargs": {"beta": 0.001},
         "eps_fn": eps_fn,
+        "device": device,
     }
 
 
@@ -104,7 +108,8 @@ if __name__ == "__main__":
         "batch_size_st": [64],
         "lr_st": [1e-4, 1e-6, 1e-7, 1e-8],
         "print_every": 1,
-        "eps_fn": eps_fn
+        "eps_fn": eps_fn,
+        "device": device
     }
 
 
@@ -124,7 +129,7 @@ if __name__ == "__main__":
     trainor.save_model()
 
     preds = trainor.evaluate(
-        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out
+        x_train, y_train, x_test, y_test, None, pre_func_inp, pre_func_out, device
     )
             
     # pdb.set_trace()

{rraestorch-0.1.5 → rraestorch-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "RRAEsTorch"
-version = "0.1.5"
+version = "0.1.6"
 description= " A repo for RRAEs in PyTorch."
 readme="README.md"
 requires-python= ">=3.10"

rraestorch-0.1.5/.gitignore copy

@@ -1,207 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[codz]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py.cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# UV
-#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#uv.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-#poetry.toml
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#   pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python.
-#   https://pdm-project.org/en/latest/usage/project/#working-with-version-control
-#pdm.lock
-#pdm.toml
-.pdm-python
-.pdm-build/
-
-# pixi
-#   Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control.
-#pixi.lock
-#   Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
-#   in the .venv directory. It is recommended not to include this directory in version control.
-.pixi
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.envrc
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-# Abstra
-# Abstra is an AI-powered process automation framework.
-# Ignore directories containing user credentials, local state, and settings.
-# Learn more at https://abstra.io/docs
-.abstra/
-
-# Visual Studio Code
-#  Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore 
-#  that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
-#  and can be added to the global gitignore or merged into this file. However, if you prefer, 
-#  you could uncomment the following to ignore the entire vscode folder
-# .vscode/
-
-# Ruff stuff:
-.ruff_cache/
-
-# PyPI configuration file
-.pypirc
-
-# Cursor
-#  Cursor is an AI-powered code editor. `.cursorignore` specifies files/directories to
-#  exclude from AI features like autocomplete and code analysis. Recommended for sensitive data
-#  refer to https://docs.cursor.com/context/ignore-files
-.cursorignore
-.cursorindexingignore
-
-# Marimo
-marimo/_static/
-marimo/_lsp/
-__marimo__/

rraestorch-0.1.5/LICENSE copy

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Jad Mounayer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.