deeplotx 0.4.13__tar.gz → 0.4.15__tar.gz

{deeplotx-0.4.13 → deeplotx-0.4.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deeplotx
-Version: 0.4.13
+Version: 0.4.15
 Summary: Easy-2-use long text NLP toolkit.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -177,31 +177,33 @@ Dynamic: license-file
 
     import torch
     from torch import nn
-
+    
     from deeplotx.nn.base_neural_network import BaseNeuralNetwork
-
-
+    
+    
     class LinearRegression(BaseNeuralNetwork):
-        def __init__(self, input_dim: int, output_dim: int, model_name: str | None = None):
-            super().__init__(model_name=model_name)
-            self.fc1 = nn.Linear(input_dim, 1024)
-            self.fc1_to_fc4_res = nn.Linear(1024, 64)
-            self.fc2 = nn.Linear(1024, 768)
-            self.fc3 = nn.Linear(768, 128)
-            self.fc4 = nn.Linear(128, 64)
-            self.fc5 = nn.Linear(64, output_dim)
-            self.parametric_relu_1 = nn.PReLU(num_parameters=1, init=5e-3)
-            self.parametric_relu_2 = nn.PReLU(num_parameters=1, init=5e-3)
-            self.parametric_relu_3 = nn.PReLU(num_parameters=1, init=5e-3)
-            self.parametric_relu_4 = nn.PReLU(num_parameters=1, init=5e-3)
-
+        def __init__(self, input_dim: int, output_dim: int, model_name: str | None = None,
+                     device: str | None = None, dtype: torch.dtype | None = None):
+            super().__init__(model_name=model_name, device=device, dtype=dtype)
+            self.fc1 = nn.Linear(input_dim, 1024, device=self.device, dtype=self.dtype)
+            self.fc1_to_fc4_res = nn.Linear(1024, 64, device=self.device, dtype=self.dtype)
+            self.fc2 = nn.Linear(1024, 768, device=self.device, dtype=self.dtype)
+            self.fc3 = nn.Linear(768, 128, device=self.device, dtype=self.dtype)
+            self.fc4 = nn.Linear(128, 64, device=self.device, dtype=self.dtype)
+            self.fc5 = nn.Linear(64, output_dim, device=self.device, dtype=self.dtype)
+            self.parametric_relu_1 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+            self.parametric_relu_2 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+            self.parametric_relu_3 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+            self.parametric_relu_4 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+    
         @override
         def forward(self, x) -> torch.Tensor:
+            x = self.ensure_device_and_dtype(x, device=self.device, dtype=self.dtype)
             fc1_out = self.parametric_relu_1(self.fc1(x))
-            x = nn.LayerNorm(normalized_shape=1024, eps=1e-9)(fc1_out)
+            x = nn.LayerNorm(normalized_shape=1024, eps=1e-9, device=self.device, dtype=self.dtype)(fc1_out)
             x = torch.dropout(x, p=0.2, train=self.training)
             x = self.parametric_relu_2(self.fc2(x))
-            x = nn.LayerNorm(normalized_shape=768, eps=1e-9)(x)
+            x = nn.LayerNorm(normalized_shape=768, eps=1e-9, device=self.device, dtype=self.dtype)(x)
             x = torch.dropout(x, p=0.2, train=self.training)
             x = self.parametric_relu_3(self.fc3(x))
             x = torch.dropout(x, p=0.2, train=self.training)

{deeplotx-0.4.13 → deeplotx-0.4.15}/README.md

@@ -160,31 +160,33 @@
 
     import torch
     from torch import nn
-
+    
     from deeplotx.nn.base_neural_network import BaseNeuralNetwork
-
-
+    
+    
     class LinearRegression(BaseNeuralNetwork):
-        def __init__(self, input_dim: int, output_dim: int, model_name: str | None = None):
-            super().__init__(model_name=model_name)
-            self.fc1 = nn.Linear(input_dim, 1024)
-            self.fc1_to_fc4_res = nn.Linear(1024, 64)
-            self.fc2 = nn.Linear(1024, 768)
-            self.fc3 = nn.Linear(768, 128)
-            self.fc4 = nn.Linear(128, 64)
-            self.fc5 = nn.Linear(64, output_dim)
-            self.parametric_relu_1 = nn.PReLU(num_parameters=1, init=5e-3)
-            self.parametric_relu_2 = nn.PReLU(num_parameters=1, init=5e-3)
-            self.parametric_relu_3 = nn.PReLU(num_parameters=1, init=5e-3)
-            self.parametric_relu_4 = nn.PReLU(num_parameters=1, init=5e-3)
-
+        def __init__(self, input_dim: int, output_dim: int, model_name: str | None = None,
+                     device: str | None = None, dtype: torch.dtype | None = None):
+            super().__init__(model_name=model_name, device=device, dtype=dtype)
+            self.fc1 = nn.Linear(input_dim, 1024, device=self.device, dtype=self.dtype)
+            self.fc1_to_fc4_res = nn.Linear(1024, 64, device=self.device, dtype=self.dtype)
+            self.fc2 = nn.Linear(1024, 768, device=self.device, dtype=self.dtype)
+            self.fc3 = nn.Linear(768, 128, device=self.device, dtype=self.dtype)
+            self.fc4 = nn.Linear(128, 64, device=self.device, dtype=self.dtype)
+            self.fc5 = nn.Linear(64, output_dim, device=self.device, dtype=self.dtype)
+            self.parametric_relu_1 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+            self.parametric_relu_2 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+            self.parametric_relu_3 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+            self.parametric_relu_4 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+    
         @override
         def forward(self, x) -> torch.Tensor:
+            x = self.ensure_device_and_dtype(x, device=self.device, dtype=self.dtype)
             fc1_out = self.parametric_relu_1(self.fc1(x))
-            x = nn.LayerNorm(normalized_shape=1024, eps=1e-9)(fc1_out)
+            x = nn.LayerNorm(normalized_shape=1024, eps=1e-9, device=self.device, dtype=self.dtype)(fc1_out)
             x = torch.dropout(x, p=0.2, train=self.training)
             x = self.parametric_relu_2(self.fc2(x))
-            x = nn.LayerNorm(normalized_shape=768, eps=1e-9)(x)
+            x = nn.LayerNorm(normalized_shape=768, eps=1e-9, device=self.device, dtype=self.dtype)(x)
             x = torch.dropout(x, p=0.2, train=self.training)
             x = self.parametric_relu_3(self.fc3(x))
             x = torch.dropout(x, p=0.2, train=self.training)

{deeplotx-0.4.13 → deeplotx-0.4.15}/deeplotx/nn/base_neural_network.py

@@ -58,5 +58,5 @@ class BaseNeuralNetwork(nn.Module):
         return self
 
     def load(self):
-        self.load_state_dict(torch.load(f'{self._model_name}.deeplotx'))
+        self.load_state_dict(torch.load(f'{self._model_name}.deeplotx', map_location=self.device, weights_only=True))
         return self

{deeplotx-0.4.13 → deeplotx-0.4.15}/deeplotx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deeplotx
-Version: 0.4.13
+Version: 0.4.15
 Summary: Easy-2-use long text NLP toolkit.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -177,31 +177,33 @@ Dynamic: license-file
 
     import torch
     from torch import nn
-
+    
     from deeplotx.nn.base_neural_network import BaseNeuralNetwork
-
-
+    
+    
     class LinearRegression(BaseNeuralNetwork):
-        def __init__(self, input_dim: int, output_dim: int, model_name: str | None = None):
-            super().__init__(model_name=model_name)
-            self.fc1 = nn.Linear(input_dim, 1024)
-            self.fc1_to_fc4_res = nn.Linear(1024, 64)
-            self.fc2 = nn.Linear(1024, 768)
-            self.fc3 = nn.Linear(768, 128)
-            self.fc4 = nn.Linear(128, 64)
-            self.fc5 = nn.Linear(64, output_dim)
-            self.parametric_relu_1 = nn.PReLU(num_parameters=1, init=5e-3)
-            self.parametric_relu_2 = nn.PReLU(num_parameters=1, init=5e-3)
-            self.parametric_relu_3 = nn.PReLU(num_parameters=1, init=5e-3)
-            self.parametric_relu_4 = nn.PReLU(num_parameters=1, init=5e-3)
-
+        def __init__(self, input_dim: int, output_dim: int, model_name: str | None = None,
+                     device: str | None = None, dtype: torch.dtype | None = None):
+            super().__init__(model_name=model_name, device=device, dtype=dtype)
+            self.fc1 = nn.Linear(input_dim, 1024, device=self.device, dtype=self.dtype)
+            self.fc1_to_fc4_res = nn.Linear(1024, 64, device=self.device, dtype=self.dtype)
+            self.fc2 = nn.Linear(1024, 768, device=self.device, dtype=self.dtype)
+            self.fc3 = nn.Linear(768, 128, device=self.device, dtype=self.dtype)
+            self.fc4 = nn.Linear(128, 64, device=self.device, dtype=self.dtype)
+            self.fc5 = nn.Linear(64, output_dim, device=self.device, dtype=self.dtype)
+            self.parametric_relu_1 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+            self.parametric_relu_2 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+            self.parametric_relu_3 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+            self.parametric_relu_4 = nn.PReLU(num_parameters=1, init=5e-3, device=self.device, dtype=self.dtype)
+    
         @override
         def forward(self, x) -> torch.Tensor:
+            x = self.ensure_device_and_dtype(x, device=self.device, dtype=self.dtype)
             fc1_out = self.parametric_relu_1(self.fc1(x))
-            x = nn.LayerNorm(normalized_shape=1024, eps=1e-9)(fc1_out)
+            x = nn.LayerNorm(normalized_shape=1024, eps=1e-9, device=self.device, dtype=self.dtype)(fc1_out)
             x = torch.dropout(x, p=0.2, train=self.training)
             x = self.parametric_relu_2(self.fc2(x))
-            x = nn.LayerNorm(normalized_shape=768, eps=1e-9)(x)
+            x = nn.LayerNorm(normalized_shape=768, eps=1e-9, device=self.device, dtype=self.dtype)(x)
             x = torch.dropout(x, p=0.2, train=self.training)
             x = self.parametric_relu_3(self.fc3(x))
             x = torch.dropout(x, p=0.2, train=self.training)

{deeplotx-0.4.13 → deeplotx-0.4.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deeplotx"
-version = "0.4.13"
+version = "0.4.15"
 description = "Easy-2-use long text NLP toolkit."
 readme = "README.md"
 requires-python = ">=3.10"