nkululeko 0.81.3__tar.gz → 0.81.4__tar.gz

{nkululeko-0.81.3 → nkululeko-0.81.4}/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+Version 0.81.4
+--------------
+* fixed bug in demo module
+* removed [MODEL] save
+
 Version 0.81.3
 --------------
 * added confidence intervals to result reporting

{nkululeko-0.81.3/nkululeko.egg-info → nkululeko-0.81.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.81.3
+Version: 0.81.4
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -323,6 +323,11 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.81.4
+--------------
+* fixed bug in demo module
+* removed [MODEL] save
+
 Version 0.81.3
 --------------
 * added confidence intervals to result reporting

{nkululeko-0.81.3 → nkululeko-0.81.4}/nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.81.3"
+VERSION="0.81.4"
 SAMPLING_RATE = 16000

{nkululeko-0.81.3 → nkululeko-0.81.4}/nkululeko/data/dataset.py

@@ -96,8 +96,8 @@ class Dataset:
         """Load the dataframe with files, speakers and task labels"""
         # store the dataframe
         store = self.util.get_path("store")
-        store_file = f"{store}{self.name}"
         store_format = self.util.config_val("FEATS", "store_format", "pkl")
+        store_file = f"{store}{self.name}.{store_format}"
         self.root = self._load_db()
         if not self.start_fresh and os.path.isfile(store_file):
             self.util.debug(f"{self.name}: reusing previously stored file {store_file}")
@@ -241,7 +241,7 @@ class Dataset:
         # store the dataframe
         store = self.util.get_path("store")
         store_format = self.util.config_val("FEATS", "store_format", "pkl")
-        store_file = f"{store}{self.name}"
+        store_file = f"{store}{self.name}.{store_format}"
         self.util.write_store(self.df, store_file, store_format)
 
     def _get_df_for_lists(self, db, df_files):

{nkululeko-0.81.3 → nkululeko-0.81.4}/nkululeko/experiment.py

@@ -685,7 +685,7 @@ class Experiment:
         glob_conf.set_labels(self.labels)
 
     def save(self, filename):
-        if self.runmgr.modelrunner.model.is_ANN():
+        if self.runmgr.modelrunner.model.is_ann():
             self.runmgr.modelrunner.model = None
             self.util.warn(
                 f"Save experiment: Can't pickle the learning model so saving without it."
@@ -708,7 +708,7 @@ class Experiment:
     def save_onnx(self, filename):
         # export the model to onnx
         model = self.runmgr.get_best_model()
-        if model.is_ANN():
+        if model.is_ann():
             print("converting to onnx from torch")
         else:
             from skl2onnx import to_onnx

{nkululeko-0.81.3 → nkululeko-0.81.4}/nkululeko/feat_extract/feats_audmodel_dim.py

@@ -1,12 +1,16 @@
 # feats_audmodel_dim.py
-from nkululeko.feat_extract.featureset import Featureset
 import os
+
+import numpy as np
 import pandas as pd
+import torch
+
 import audeer
-import nkululeko.glob_conf as glob_conf
-import audonnx
-import numpy as np
 import audinterface
+import audonnx
+
+from nkululeko.feat_extract.featureset import Featureset
+import nkululeko.glob_conf as glob_conf
 
 
 class AudModelDimSet(Featureset):

{nkululeko-0.81.3 → nkululeko-0.81.4}/nkululeko/modelrunner.py

@@ -39,7 +39,7 @@ class Modelrunner:
         plot_epochs = self.util.config_val("PLOT", "epochs", False)
         only_test = self.util.config_val("MODEL", "only_test", False)
         epoch_num = int(self.util.config_val("EXP", "epochs", 1))
-        if not self.model.is_ANN() and epoch_num > 1:
+        if not self.model.is_ann() and epoch_num > 1:
             self.util.warn(f"setting epoch num to 1 (was {epoch_num}) if model not ANN")
             epoch_num = 1
             glob_conf.config["EXP"]["epochs"] = "1"
@@ -69,7 +69,7 @@ class Modelrunner:
             if plot_epochs:
                 self.util.debug(f"plotting conf matrix to {plot_name}")
                 report.plot_confmatrix(plot_name, epoch)
-            store_models = self.util.config_val("MODEL", "save", False)
+            store_models = self.util.config_val("EXP", "save", False)
             plot_best_model = self.util.config_val("PLOT", "best_model", False)
             if (store_models or plot_best_model) and (
                 not only_test

{nkululeko-0.81.3 → nkululeko-0.81.4}/nkululeko/models/model.py

@@ -1,23 +1,25 @@
 # model.py
-from nkululeko.utils.util import Util
-import pandas as pd
-import numpy as np
-import nkululeko.glob_conf as glob_conf
-import sklearn.utils
-from nkululeko.reporting.reporter import Reporter
 import ast
-from sklearn.model_selection import GridSearchCV
 import pickle
 import random
+
+import numpy as np
+import pandas as pd
+from sklearn.model_selection import GridSearchCV
 from sklearn.model_selection import LeaveOneGroupOut
 from sklearn.model_selection import StratifiedKFold
+import sklearn.utils
+
+import nkululeko.glob_conf as glob_conf
+from nkululeko.reporting.reporter import Reporter
+from nkululeko.utils.util import Util
 
 
 class Model:
-    """Generic model class for linear (non-neural) algorithms"""
+    """Generic model class for linear (non-neural) algorithms."""
 
     def __init__(self, df_train, df_test, feats_train, feats_test):
-        """Constructor taking the configuration and all dataframes"""
+        """Constructor taking the configuration and all dataframes."""
         self.df_train, self.df_test, self.feats_train, self.feats_test = (
             df_train,
             df_test,
@@ -35,7 +37,7 @@ class Model:
     def set_model_type(self, type):
         self.model_type = type
 
-    def is_ANN(self):
+    def is_ann(self):
         if self.model_type == "ann":
             return True
         else:
@@ -277,8 +279,6 @@ class Model:
         prediction = {}
         if self.util.exp_is_classification():
             # get the class probabilities
-            if not self.get_type() == "xgb":
-                features = [features]
             predictions = self.clf.predict_proba(features)
             # pred = self.clf.predict(features)
             for i in range(len(self.clf.classes_)):
@@ -302,7 +302,7 @@ class Model:
                 self.clf = pickle.load(handle)
         except FileNotFoundError as fe:
             self.util.error(
-                f"did you forget to store your models? needs: \n[MODEL]\nsave=True\n{fe}"
+                f"Did you forget to store your models? needs: \n[MODEL]\nsave=True\n{fe}"
             )
 
     def load_path(self, path, run, epoch):

{nkululeko-0.81.3 → nkululeko-0.81.4}/nkululeko/models/model_svm.py

@@ -25,6 +25,9 @@ class SVM_model(Model):
             class_weight=class_weight,
         )  # set up the classifier
 
-    def set_C(self, c):
-        """Set the C parameter"""
+    def set_c(self, c):
+        """Set the C parameter."""
         self.clf.C = c
+
+    def get_type(self):
+        return "svm"

{nkululeko-0.81.3 → nkululeko-0.81.4}/nkululeko/predict.py

@@ -28,7 +28,9 @@ def main(src_dir):
     config.read(config_file)
     # create a new experiment
     expr = Experiment(config)
-    util = Util("predict")
+    module = "predict"
+    expr.set_module(module)
+    util = Util(module)
     util.debug(
         f"running {expr.name} from config {config_file}, nkululeko version"
         f" {VERSION}"

{nkululeko-0.81.3 → nkululeko-0.81.4/nkululeko.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.81.3
+Version: 0.81.4
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -323,6 +323,11 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.81.4
+--------------
+* fixed bug in demo module
+* removed [MODEL] save
+
 Version 0.81.3
 --------------
 * added confidence intervals to result reporting