nkululeko 0.95.3__tar.gz → 0.95.4__tar.gz

{nkululeko-0.95.3 → nkululeko-0.95.4}/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+Version 0.95.4 (25-07-08)
+--------------------------
+* add supercategory label mapping e.g. angry, sad -> negative
+* fix bug that mlp_reg might crash with CCC (no variance in training batch)
+
 Version 0.95.3 (25-07-03)
 --------------------------
 * fix bug with classifying integers

{nkululeko-0.95.3/nkululeko.egg-info → nkululeko-0.95.4}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: nkululeko
-Version: 0.95.3
+Version: 0.95.4
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
-Author-email: Felix Burkhardt <fxburk@gmail.com>, Bagus Tris Atmaja <bagus@ep.its.ac.id>
+Author-email: Felix Burkhardt <fxburk@gmail.com>, Bagus Tris Atmaja <btatmaja@gmail.com>
 License: MIT
 Project-URL: Homepage, https://github.com/felixbur/nkululeko
 Project-URL: Repository, https://github.com/felixbur/nkululeko

{nkululeko-0.95.3 → nkululeko-0.95.4}/nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.95.3"
+VERSION="0.95.4"
 SAMPLING_RATE = 16000

{nkululeko-0.95.3 → nkululeko-0.95.4}/nkululeko/data/dataset.py

@@ -6,7 +6,6 @@ from random import sample
 
 import numpy as np
 import pandas as pd
-
 import audformat
 
 from nkululeko.filter_data import DataFilter
@@ -905,6 +904,20 @@ class Dataset:
         mappings = self.util.config_val_data(self.name, "mapping", False)
         if mappings:
             mapping = ast.literal_eval(mappings)
+            # mapping should be a dictionary, the keys might encode lists.
+            keys = list(mapping.keys())
+            for key in keys:
+                # a comma in the key means that the key is a list of labels
+                if "," in key:
+                    # split the key and create a list
+                    key_list = [k.strip() for k in key.split(",")]
+                    # create a new mapping for each key
+                    for k in key_list:
+                        mapping[k] = mapping[key]
+                    # remove the old key
+                    del mapping[key]
+            if pd.api.types.is_numeric_dtype(df[target]):
+                df[target] = df[target].astype("string")
             df[target] = df[target].map(mapping)
             # remove any exiting nan values after mapping
             df = df.dropna()

{nkululeko-0.95.3 → nkululeko-0.95.4}/nkululeko/experiment.py

@@ -23,7 +23,7 @@ from nkululeko.plots import Plots
 from nkululeko.reporting.report import Report
 from nkululeko.runmanager import Runmanager
 from nkululeko.scaler import Scaler
-from nkululeko.test_predictor import TestPredictor
+from nkululeko.testing_predictor import TestPredictor
 from nkululeko.utils.util import Util
 
 

{nkululeko-0.95.3 → nkululeko-0.95.4}/nkululeko/modelrunner.py

@@ -250,14 +250,19 @@ class Modelrunner:
         balancing = self.util.config_val("FEATS", "balancing", False)
         if balancing:
             self.util.debug("Applying feature balancing using DataBalancer")
-            
-            # Initialize the data balancer
-            balancer = DataBalancer(random_state=42)
-            
+
+            # Get random state from config, fallback to 42 for backward compatibility
+            random_state = int(
+                self.util.config_val("FEATS", "balancing_random_state", 42)
+            )
+
+            # Initialize the data balancer with configurable random state
+            balancer = DataBalancer(random_state=random_state)
+
             # Apply balancing
             self.df_train, self.feats_train = balancer.balance_features(
                 df_train=self.df_train,
                 feats_train=self.feats_train,
                 target_column=self.target,
-                method=balancing
+                method=balancing,
             )

{nkululeko-0.95.3 → nkululeko-0.95.4}/nkululeko/models/model_mlp_regression.py

@@ -174,6 +174,9 @@ class MLP_Reg_model(Model):
             logits = model(features.to(device)).reshape(-1)
             loss = self.criterion(logits, labels.to(device))
             # print(f'loss: {loss.item()}')
+            if torch.isnan(loss):
+                # possible that ccc returns NaN if batch contains only one value
+                continue
             losses.append(loss.item())
             optimizer.zero_grad()
             loss.backward()

{nkululeko-0.95.3 → nkululeko-0.95.4}/nkululeko/nkuluflag.py

@@ -5,7 +5,7 @@ import os.path
 import sys
 
 from nkululeko.nkululeko import doit as nkulu
-from nkululeko.test import do_it as test_mod
+from nkululeko.testing import do_it as test_mod
 
 
 def doit(cla):

nkululeko-0.95.4/nkululeko/optim.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+
+import argparse
+import configparser
+import os
+import sys
+import time
+
+from nkululeko.constants import VERSION
+
+# Import the OptimizationRunner class from the dedicated module
+from nkululeko.optimizationrunner import OptimizationRunner
+
+
+def doit(config_file):
+    """Run hyperparameter optimization experiment."""
+    if not os.path.isfile(config_file):
+        print(f"ERROR: no such file: {config_file}")
+        sys.exit(1)
+
+    config = configparser.ConfigParser()
+    config.read(config_file)
+
+    optimizer = OptimizationRunner(config)
+
+    # Start timing the optimization
+    start_time = time.time()
+
+    # Run optimization using the unified approach
+    try:
+        best_params, best_result, all_results = optimizer.run_optimization()
+    except Exception as e:
+        print(f"Optimization failed: {e}")
+        return None, None
+
+    # Calculate optimization time
+    end_time = time.time()
+    optimization_time = end_time - start_time
+
+    optimizer.util.debug(
+        f"Optimization time: {optimization_time:.2f} seconds ({optimization_time/60:.2f} minutes)"
+    )
+    print("DONE")
+    return best_params, best_result
+
+
+def main():
+    """Main entry point for optimization module."""
+    parser = argparse.ArgumentParser(
+        description="Run nkululeko hyperparameter optimization."
+    )
+    parser.add_argument("--version", action="version", version=f"Nkululeko {VERSION}")
+    parser.add_argument(
+        "--config", default="exp.ini", help="The optimization configuration file"
+    )
+    args = parser.parse_args()
+
+    config_file = args.config
+    doit(config_file)
+
+
+if __name__ == "__main__":
+    main()