code-loader 1.0.66.dev3__tar.gz → 1.0.68__tar.gz

{code_loader-1.0.66.dev3 → code_loader-1.0.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: code-loader
-Version: 1.0.66.dev3
+Version: 1.0.68
 Summary: 
 Home-page: https://github.com/tensorleap/code-loader
 License: MIT

{code_loader-1.0.66.dev3 → code_loader-1.0.68}/code_loader/default_losses.py

@@ -1,7 +1,5 @@
 from enum import Enum
 
-from code_loader.contract.datasetclasses import ConfusionMatrixElement  # type: ignore
-from code_loader.contract.enums import ConfusionMatrixValue, MetricDirection  # type: ignore
 from code_loader.default_metrics import mean_absolute_percentage_error_dimension_reduced, \
     mean_absolute_error_dimension_reduced, mean_squared_logarithmic_error_dimension_reduced, \
     mean_squared_error_dimension_reduced, categorical_crossentropy, binary_crossentropy

{code_loader-1.0.66.dev3 → code_loader-1.0.68}/code_loader/default_metrics.py

@@ -21,12 +21,18 @@ class Metric(Enum):
 
 def binary_crossentropy(ground_truth: np.array, prediction: np.array) -> np.array:
     ground_truth, prediction = flatten_non_batch_dims(ground_truth, prediction)
-    return -(ground_truth * np.log(prediction) + (1 - ground_truth) * np.log(1 - prediction)).mean(axis=1).astype(np.float32)
+    epsilon = 1e-07
+    prediction = np.clip(prediction, epsilon, 1.0 - epsilon)
+    return -(ground_truth * np.log(prediction) + (1 - ground_truth) *
+             np.log(1 - prediction)).sum(axis=1).astype(np.float32)
 
 
 def categorical_crossentropy(ground_truth: np.array, prediction: np.array) -> np.array:
     ground_truth, prediction = flatten_non_batch_dims(ground_truth, prediction)
-    return -(ground_truth * np.log(prediction)).mean(axis=1).astype(np.float32)
+    prediction = prediction / np.sum(prediction, axis=1)
+    epsilon = 1e-07
+    prediction = np.clip(prediction, epsilon, 1.0 - epsilon)
+    return -(ground_truth * np.log(prediction)).sum(axis=1).astype(np.float32)
 
 def accuracy_reduced(ground_truth: np.array, prediction: np.array) -> np.array:
     ground_truth, prediction = flatten_non_batch_dims(ground_truth, prediction)

{code_loader-1.0.66.dev3 → code_loader-1.0.68}/code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -355,7 +355,7 @@ def tensorleap_custom_loss(name: str):
                         assert isinstance(elem, valid_types), (f'tensorleap_custom_loss validation failed: '
                                                                f'Element #{y} of list should be a numpy array. Got {type(elem)}.')
                 else:
-                    assert isinstance(arg, tf.Tensor), (f'tensorleap_custom_loss validation failed: '
+                    assert isinstance(arg, valid_types), (f'tensorleap_custom_loss validation failed: '
                                                         f'Argument #{i} should be a numpy array. Got {type(arg)}.')
             for _arg_name, arg in kwargs.items():
                 if isinstance(arg, list):

{code_loader-1.0.66.dev3 → code_loader-1.0.68}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "code-loader"
-version = "1.0.66.dev3"
+version = "1.0.68"
 description = ""
 authors = ["dorhar <doron.harnoy@tensorleap.ai>"]
 license = "MIT"