code-loader 1.0.64.dev4__tar.gz → 1.0.66.dev1__tar.gz

{code_loader-1.0.64.dev4 → code_loader-1.0.66.dev1}/PKG-INFO

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

code_loader-1.0.66.dev1/code_loader/default_losses.py

@@ -0,0 +1,26 @@
+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
+
+
+class LossName(Enum):
+    MeanSquaredError = 'MeanSquaredError'
+    MeanSquaredLogarithmicError = 'MeanSquaredLogarithmicError'
+    MeanAbsoluteError = 'MeanAbsoluteError'
+    MeanAbsolutePercentageError = 'MeanAbsolutePercentageError'
+    CategoricalCrossentropy = 'CategoricalCrossentropy'
+    BinaryCrossentropy = 'BinaryCrossentropy'
+
+
+loss_name_to_function = {
+    LossName.MeanSquaredError.name: mean_squared_error_dimension_reduced,
+    LossName.MeanSquaredLogarithmicError.name: mean_squared_logarithmic_error_dimension_reduced,
+    LossName.MeanAbsoluteError.name: mean_absolute_error_dimension_reduced,
+    LossName.MeanAbsolutePercentageError.name: mean_absolute_percentage_error_dimension_reduced,
+    LossName.CategoricalCrossentropy.name: categorical_crossentropy,
+    LossName.BinaryCrossentropy.name: binary_crossentropy
+}

{code_loader-1.0.64.dev4 → code_loader-1.0.66.dev1}/code_loader/default_metrics.py

@@ -13,8 +13,19 @@ class Metric(Enum):
     MeanAbsolutePercentageError = 'MeanAbsolutePercentageError'
     Accuracy = 'Accuracy'
     ConfusionMatrixClassification = 'ConfusionMatrixClassification'
+    CategoricalCrossentropy = 'CategoricalCrossentropy'
+    BinaryCrossentropy = 'BinaryCrossentropy'
 
 
+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)
+
+
+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)
+
 def accuracy_reduced(ground_truth: np.array, prediction: np.array) -> np.array:
     ground_truth, prediction = flatten_non_batch_dims(ground_truth, prediction)
     return np.mean((np.round(prediction).astype(np.bool_) == ground_truth.astype(np.bool_)), axis=1)
@@ -78,4 +89,6 @@ metrics_names_to_functions_and_direction = {
         mean_absolute_percentage_error_dimension_reduced, MetricDirection.Downward),
     Metric.Accuracy.name: (accuracy_reduced, MetricDirection.Upward),
     Metric.ConfusionMatrixClassification.name: (confusion_matrix_classification_metric, None),
+    Metric.CategoricalCrossentropy.name: (categorical_crossentropy, MetricDirection.Downward),
+    Metric.BinaryCrossentropy.name: (binary_crossentropy, MetricDirection.Downward)
 }

{code_loader-1.0.64.dev4 → code_loader-1.0.66.dev1}/code_loader/inner_leap_binder/leapbinder.py

@@ -14,6 +14,7 @@ from code_loader.contract.datasetclasses import SectionCallableInterface, InputH
 from code_loader.contract.enums import LeapDataType, DataStateEnum, DataStateType, MetricDirection
 from code_loader.contract.responsedataclasses import DatasetTestResultPayload
 from code_loader.contract.visualizer_classes import map_leap_data_type_to_visualizer_class
+from code_loader.default_losses import loss_name_to_function
 from code_loader.default_metrics import metrics_names_to_functions_and_direction
 from code_loader.utils import to_numpy_return_wrapper, get_shape
 from code_loader.visualizers.default_visualizers import DefaultVisualizer, \
@@ -58,6 +59,10 @@ class LeapBinder:
         self.set_visualizer(function=default_text_mask_visualizer, name=DefaultVisualizer.TextMask.value,
                             visualizer_type=LeapDataType.TextMask)
 
+    def _extend_with_default_losses(self) -> None:
+        for loss_name, func in loss_name_to_function.items():
+            self.add_custom_loss(func, loss_name)
+
     def _extend_with_default_metrics(self) -> None:
         for metric_name, (func, direction) in metrics_names_to_functions_and_direction.items():
             self.add_custom_metric(func, metric_name, direction)

{code_loader-1.0.64.dev4 → code_loader-1.0.66.dev1}/pyproject.toml

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