lt-tensor 0.0.1a9__py3-none-any.whl → 0.0.1a10__py3-none-any.whl

lt_tensor/misc_utils.py

@@ -152,7 +152,12 @@ class LogTensor:
             print(message)
             sys.stdout.flush()
 
-    def _process(self, name: str, resp: Union[Callable[[Any], Any], Any]):
+    def _process(
+        self,
+        name: str,
+        resp: Union[Callable[[Any], Any], Any],
+        do_not_print: bool = False,
+    ):
         if callable(resp):
             try:
                 response = resp()
@@ -161,15 +166,16 @@ class LogTensor:
                 print(e)
         else:
             response = resp
-        msg = self._setup_message(name, response)
-        self._print(msg)
-        return dict(name=name, results=response, message=msg)
+        if not do_not_print and self.do_print:
+            msg = self._setup_message(name, response)
+            self._print(msg)
+        return dict(item=name, value=response)
 
     def __call__(
         self,
-        main_item: Union[Tensor, np.ndarray, Sequence[Number]],
+        inputs: Union[Tensor, np.ndarray, Sequence[Number]],
         title: Optional[str] = None,
-        loss_targets: Optional[Union[Tensor, np.ndarray, Sequence[Number]]] = None,
+        target: Optional[Union[Tensor, np.ndarray, Sequence[Number]]] = None,
         *,
         log_tensor: bool = False,
         log_device: bool = False,
@@ -177,7 +183,7 @@ class LogTensor:
         log_std: bool = False,
         dim_mean: int = -1,
         dim_std: int = -1,
-        do_print_external: bool = False,
+        print_extended: bool = False,
         external_logs: List[Tuple[str, Union[Dict[str, Any], List[Any], Any]]] = [
             ("softmax", {"dim": 0}),
             ("relu", None),
@@ -188,10 +194,8 @@ class LogTensor:
         validate_item_type: bool = False,
         **kwargs,
     ):
-        if kwargs:
-            self.update_settings(**kwargs)
-        invalid_type = not isinstance(main_item, (Tensor, np.ndarray, list, tuple))
-        _main_item_tp = type(main_item)
+        invalid_type = not isinstance(inputs, (Tensor, np.ndarray, list, tuple))
+        _main_item_tp = type(inputs)
         assert (
             not validate_item_type or not invalid_type
         ), f"Invalid Type: {_main_item_tp}"
@@ -199,8 +203,8 @@ class LogTensor:
             self._print(f"Invalid Type: {_main_item_tp}")
             return
 
-        main_item = self._setup_tensor(main_item)
-        loss_targets = self._setup_tensor(loss_targets)
+        inputs = self._setup_tensor(inputs)
+        target = self._setup_tensor(target)
         if is_str(title):
             title = re.sub(r"\s+", " ", title.replace("_", " "))
             has_title = is_str(title)
@@ -209,43 +213,42 @@ class LogTensor:
         else:
             title = "Unnamed"
 
-        current_register = {"title": title}
-
-        current_register.update(self._process("shape", main_item.shape))
-        current_register.update(self._process("ndim", main_item.ndim))
-        current_register.update(self._process("dtype", main_item.dtype))
+        current_register = {"title": title, "values": []}
+        current_register["shape"] = self._process("shape", inputs.shape)
+        current_register["ndim"] = self._process("ndim", inputs.ndim)
+        current_register["dtype"] = self._process("dtype", inputs.dtype)
         if log_device:
-            current_register.update(self._process("device", main_item.device))
+            current_register["device"] = self._process("device", inputs.device)
 
         if log_mean:
-            fn = lambda: main_item.mean(
+            fn = lambda: inputs.mean(
                 dim=dim_mean,
             )
-            current_register.update(self._process("mean", fn))
+            current_register["mean"] = self._process("mean", fn)
 
         if log_std:
-            fn = lambda: main_item.std(dim=dim_std)
-            current_register.update(self._process("std", fn))
+            fn = lambda: inputs.std(dim=dim_std)
+            current_register["std"] = self._process("std", fn)
 
         if external_logs:
             old_print = self.do_print
-            self.do_print = do_print_external
+            self.do_print = print_extended
             self._print("\n---[ External Logs ] ---")
             for log_fn, log_args in external_logs:
                 if isinstance(log_args, Sequence) and not isinstance(log_args, str):
-                    value = try_torch(log_fn, main_item, *log_args)
+                    value = try_torch(log_fn, inputs, *log_args)
                 elif isinstance(log_args, dict):
-                    value = try_torch(log_fn, main_item, **log_args)
+                    value = try_torch(log_fn, inputs, **log_args)
                 elif log_args is None:
-                    value = try_torch(log_fn, main_item)
+                    value = try_torch(log_fn, inputs)
                 else:
-                    value = try_torch(log_fn, main_item, log_args)
+                    value = try_torch(log_fn, inputs, log_args)
                 results = self._process(log_fn, value)
                 current_register[log_fn] = results
             self.do_print = old_print
 
-        if loss_targets is not None:
-            losses = get_losses(main_item, loss_targets, False)
+        if target is not None:
+            losses = get_losses(inputs, target, False)
             started_ls = False
             if self.do_print:
                 for loss, res in losses.items():
@@ -258,7 +261,9 @@ class LogTensor:
             current_register["loss"] = losses
 
         if log_tensor:
-            current_register.update(self._process("Tensor", main_item))
+            current_register["values"].append(
+                self._process("Tensor", inputs, not print_extended)
+            )
 
         self._print(self.end_with)
         self._store_item_and_update(current_register)

{lt_tensor-0.0.1a9.dist-info → lt_tensor-0.0.1a10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lt-tensor
-Version: 0.0.1a9
+Version: 0.0.1a10
 Summary: General utilities for PyTorch and others. Built for general use.
 Home-page: https://github.com/gr1336/lt-tensor/
 Author: gr1336

{lt_tensor-0.0.1a9.dist-info → lt_tensor-0.0.1a10.dist-info}/RECORD

@@ -2,7 +2,7 @@ lt_tensor/__init__.py,sha256=uwJ7uiO18VYj8Z1V4KSOQ3ZrnowSgJWKCIiFBrzLMOI,429
 lt_tensor/losses.py,sha256=TinZJP2ypZ7Tdg6d9nnFWFkPyormfgQ0Z9P2ER3sqzE,4341
 lt_tensor/lr_schedulers.py,sha256=LSZzqrOOLzSthD8k-W4cYPJt0vCjmHkiJkLr5e3yRTE,3659
 lt_tensor/math_ops.py,sha256=ewIYkvxIy_Lab_9ExjFUgLs-oYLOu8IRRDo7f1pn3i8,2248
-lt_tensor/misc_utils.py,sha256=-MGqs3Dt35M7EsgBqqTLin9v0xVu8V29HQZVtsxK5QU,24746
+lt_tensor/misc_utils.py,sha256=N9Rf-i6m51Q3YYdmI5tI5Rb3wPz8OAJrTrLlqfCwWrk,24792
 lt_tensor/model_base.py,sha256=8qN7oklALFanOz-eqVzdnB9RD2kN_3ltynSMAPOl-TI,13413
 lt_tensor/monotonic_align.py,sha256=LhBd8p1xdBzg6jQrQX1j7b4PNeYGwIqM24zcU-pHOLE,2239
 lt_tensor/noise_tools.py,sha256=JkWw0-bCMRNNMShwXKKt5KbO3104tvNiBePt-ThPkEo,11366
@@ -21,8 +21,8 @@ lt_tensor/model_zoo/rsd.py,sha256=5bba50g1Hm5kMexuJ4SwOIJuyQ1qJd8Acrq-Ax6CqE8,69
 lt_tensor/model_zoo/tfrms.py,sha256=kauh-A13pk08SZ5OspEE5a-gPKD4rZr6tqMKWu3KGhk,4237
 lt_tensor/processors/__init__.py,sha256=4b9MxAJolXiJfSm20ZEspQTDm1tgLazwlPWA_jB1yLM,63
 lt_tensor/processors/audio.py,sha256=2Sta_KytTqGZh-ZeHpcCbqP6O8VT6QQVkx-7szA3Itc,8830
-lt_tensor-0.0.1a9.dist-info/licenses/LICENSE,sha256=HUnu_iSPpnDfZS_PINhO3AoVizJD1A2vee8WX7D7uXo,11358
-lt_tensor-0.0.1a9.dist-info/METADATA,sha256=4T6spgppj3ijgyjaVFt5-J6885dpOSdpJXIMnd4pQ3E,965
-lt_tensor-0.0.1a9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lt_tensor-0.0.1a9.dist-info/top_level.txt,sha256=35FuhFeXnUyvHWdbVHGPh0hS8euofafnJ_GJAVSF4Kk,10
-lt_tensor-0.0.1a9.dist-info/RECORD,,
+lt_tensor-0.0.1a10.dist-info/licenses/LICENSE,sha256=HUnu_iSPpnDfZS_PINhO3AoVizJD1A2vee8WX7D7uXo,11358
+lt_tensor-0.0.1a10.dist-info/METADATA,sha256=-VDQmGfkd5uW4_8B_TbwH-xvRivsGn3jWEtXTyeCT0s,966
+lt_tensor-0.0.1a10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lt_tensor-0.0.1a10.dist-info/top_level.txt,sha256=35FuhFeXnUyvHWdbVHGPh0hS8euofafnJ_GJAVSF4Kk,10
+lt_tensor-0.0.1a10.dist-info/RECORD,,