nkululeko 0.82.4__tar.gz → 0.83.1__tar.gz

{nkululeko-0.82.4 → nkululeko-0.83.1}/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+Version 0.83.1
+--------------
+* add test module to nkuluflag
+
+Version 0.83.0
+--------------
+* test module now prints out reports
+
 Version 0.82.4
 --------------
 * fixed bug in wavlm 

{nkululeko-0.82.4/nkululeko.egg-info → nkululeko-0.83.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.82.4
+Version: 0.83.1
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -333,6 +333,14 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.83.1
+--------------
+* add test module to nkuluflag
+
+Version 0.83.0
+--------------
+* test module now prints out reports
+
 Version 0.82.4
 --------------
 * fixed bug in wavlm 

{nkululeko-0.82.4 → nkululeko-0.83.1}/nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.82.4"
+VERSION="0.83.1"
 SAMPLING_RATE = 16000

{nkululeko-0.82.4 → nkululeko-0.83.1}/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 Test_predictor
+from nkululeko.test_predictor import TestPredictor
 from nkululeko.utils.util import Util
 
 
@@ -672,10 +672,11 @@ class Experiment:
     def predict_test_and_save(self, result_name):
         model = self.runmgr.get_best_model()
         model.set_testdata(self.df_test, self.feats_test)
-        test_predictor = Test_predictor(
+        test_predictor = TestPredictor(
             model, self.df_test, self.label_encoder, result_name
         )
-        test_predictor.predict_and_store()
+        result = test_predictor.predict_and_store()
+        return result
 
     def load(self, filename):
         f = open(filename, "rb")

{nkululeko-0.82.4 → nkululeko-0.83.1}/nkululeko/modelrunner.py

@@ -2,18 +2,16 @@
 
 import pandas as pd
 
-from nkululeko.utils.util import Util
 from nkululeko import glob_conf
-import nkululeko.glob_conf as glob_conf
+from nkululeko.utils.util import Util
 
 
 class Modelrunner:
-    """
-    Class to model one run
-    """
+    """Class to model one run."""
 
     def __init__(self, df_train, df_test, feats_train, feats_test, run):
-        """Constructor setting up the dataframes
+        """Constructor setting up the dataframes.
+
         Args:
             df_train: train dataframe
             df_test: test dataframe

{nkululeko-0.82.4 → nkululeko-0.83.1}/nkululeko/nkuluflag.py

@@ -2,13 +2,16 @@ import argparse
 import configparser
 import os
 import os.path
+import sys
 
 from nkululeko.nkululeko import doit as nkulu
+from nkululeko.test import do_it as test_mod
 
 
-def do_it(src_dir):
+def doit(cla):
     parser = argparse.ArgumentParser(description="Call the nkululeko framework.")
     parser.add_argument("--config", help="The base configuration")
+    parser.add_argument("--mod", default="nkulu", help="Which nkululeko module to call")
     parser.add_argument("--data", help="The databases", nargs="*", action="append")
     parser.add_argument(
         "--label", nargs="*", help="The labels for the target", action="append"
@@ -25,20 +28,23 @@ def do_it(src_dir):
     parser.add_argument("--model", default="xgb", help="The model type")
     parser.add_argument("--feat", default="['os']", help="The feature type")
     parser.add_argument("--set", help="The opensmile set")
-    parser.add_argument("--with_os", help="To add os features")
     parser.add_argument("--target", help="The target designation")
     parser.add_argument("--epochs", help="The number of epochs")
     parser.add_argument("--runs", help="The number of runs")
     parser.add_argument("--learning_rate", help="The learning rate")
     parser.add_argument("--drop", help="The dropout rate [0:1]")
 
-    args = parser.parse_args()
+    args = parser.parse_args(cla)
 
     if args.config is not None:
         config_file = args.config
     else:
         print("ERROR: need config file")
         quit(-1)
+
+    if args.mod is not None:
+        nkulu_mod = args.mod
+
     # test if config is there
     if not os.path.isfile(config_file):
         print(f"ERROR: no such file {config_file}")
@@ -86,10 +92,17 @@ def do_it(src_dir):
     with open(tmp_config, "w") as tmp_file:
         config.write(tmp_file)
 
-    result, last_epoch = nkulu(tmp_config)
+    result, last_epoch = 0, 0
+    if nkulu_mod == "nkulu":
+        result, last_epoch = nkulu(tmp_config)
+    elif nkulu_mod == "test":
+        result, last_epoch = test_mod(tmp_config, "test_results.csv")
+    else:
+        print(f"ERROR: unknown module: {nkulu_mod}, should be [nkulu | test]")
     return result, last_epoch
 
 
 if __name__ == "__main__":
-    cwd = os.path.dirname(os.path.abspath(__file__))
-    do_it(cwd)  # sys.argv[1])
+    cla = sys.argv
+    cla.pop(0)
+    doit(cla)  # sys.argv[1])

{nkululeko-0.82.4 → nkululeko-0.83.1}/nkululeko/reporting/reporter.py

@@ -55,6 +55,7 @@ class Reporter:
         self.run = run
         self.epoch = epoch
         self.__set_measure()
+        self.filenameadd = ""
         self.cont_to_cat = False
         if len(self.truths) > 0 and len(self.preds) > 0:
             if self.util.exp_is_classification():
@@ -206,7 +207,7 @@ class Reporter:
                 f"Confusion Matrix, UAR: {uar_str} "
                 + f"(+-{up_str}/{low_str}) {reg_res}"
             )
-        img_path = f"{fig_dir}{plot_name}.{self.format}"
+        img_path = f"{fig_dir}{plot_name}{self.filenameadd}.{self.format}"
         plt.savefig(img_path)
         fig.clear()
         plt.close(fig)
@@ -228,14 +229,17 @@ class Reporter:
         )
         # print(rpt)
         self.util.debug(rpt)
-        file_name = f"{res_dir}{self.util.get_exp_name()}_conf.txt"
+        file_name = f"{res_dir}{self.util.get_exp_name()}{self.filenameadd}_conf.txt"
         with open(file_name, "w") as text_file:
             text_file.write(rpt)
 
+    def set_filename_add(self, my_string):
+        self.filenameadd = f"_{my_string}"
+
     def print_results(self, epoch):
         """Print all evaluation values to text file."""
         res_dir = self.util.get_path("res_dir")
-        file_name = f"{res_dir}{self.util.get_exp_name()}_{epoch}.txt"
+        file_name = f"{res_dir}{self.util.get_exp_name()}_{epoch}{self.filenameadd}.txt"
         if self.util.exp_is_classification():
             labels = glob_conf.labels
             try:

{nkululeko-0.82.4 → nkululeko-0.83.1}/nkululeko/test.py

@@ -10,20 +10,7 @@ from nkululeko.experiment import Experiment
 from nkululeko.utils.util import Util
 
 
-def main(src_dir):
-    parser = argparse.ArgumentParser(
-        description="Call the nkululeko TEST framework.")
-    parser.add_argument("--config", default="exp.ini",
-                        help="The base configuration")
-    parser.add_argument(
-        "--outfile",
-        default="my_results.csv",
-        help="File name to store the predictions",
-    )
-
-    args = parser.parse_args()
-
-    config_file = args.config
+def do_it(config_file, outfile):
 
     # test if the configuration file exists
     if not os.path.isfile(config_file):
@@ -48,10 +35,28 @@ def main(src_dir):
     expr.load(f"{util.get_save_name()}")
     expr.fill_tests()
     expr.extract_test_feats()
-    expr.predict_test_and_save(args.outfile)
+    result = expr.predict_test_and_save(outfile)
 
     print("DONE")
 
+    return result, 0
+
+
+def main(src_dir):
+    parser = argparse.ArgumentParser(description="Call the nkululeko TEST framework.")
+    parser.add_argument("--config", default="exp.ini", help="The base configuration")
+    parser.add_argument(
+        "--outfile",
+        default="my_results.csv",
+        help="File name to store the predictions",
+    )
+    args = parser.parse_args()
+    if args.config is not None:
+        config_file = args.config
+    else:
+        config_file = f"{src_dir}/exp.ini"
+    do_it(config_file, args.outfile)
+
 
 if __name__ == "__main__":
     cwd = os.path.dirname(os.path.abspath(__file__))

{nkululeko-0.82.4 → nkululeko-0.83.1}/nkululeko/test_predictor.py

@@ -1,21 +1,25 @@
-""" test_predictor.py
+"""test_predictor.py.
+
     Predict targets from a model and save as csv file.
 
 """
 
-import nkululeko.glob_conf as glob_conf
-from nkululeko.utils.util import Util
+import ast
+
+import numpy as np
 import pandas as pd
+from sklearn.preprocessing import LabelEncoder
+
 from nkululeko.data.dataset import Dataset
 from nkululeko.feature_extractor import FeatureExtractor
+import nkululeko.glob_conf as glob_conf
 from nkululeko.scaler import Scaler
-import numpy as np
-from sklearn.preprocessing import LabelEncoder
+from nkululeko.utils.util import Util
 
 
-class Test_predictor:
+class TestPredictor:
     def __init__(self, model, orig_df, labenc, name):
-        """Constructor setting up name and configuration"""
+        """Constructor setting up name and configuration."""
         self.model = model
         self.orig_df = orig_df
         self.label_encoder = labenc
@@ -25,6 +29,7 @@ class Test_predictor:
 
     def predict_and_store(self):
         label_data = self.util.config_val("DATA", "label_data", False)
+        result = 0
         if label_data:
             data = Dataset(label_data)
             data.load()
@@ -49,7 +54,15 @@ class Test_predictor:
             df[self.target] = labelenc.inverse_transform(predictions.tolist())
             df.to_csv(self.name)
         else:
+            test_dbs = ast.literal_eval(glob_conf.config["DATA"]["tests"])
+            test_dbs_string = "_".join(test_dbs)
             predictions = self.model.get_predictions()
+            report = self.model.predict()
+            result = report.result.get_result()
+            report.set_filename_add(f"test-{test_dbs_string}")
+            self.util.print_best_results([report])
+            report.plot_confmatrix(self.util.get_plot_name(), 0)
+            report.print_results(0)
             # print(predictions)
             # df = pd.DataFrame(index=self.orig_df.index)
             # df["speaker"] = self.orig_df["speaker"]
@@ -63,3 +76,4 @@ class Test_predictor:
                 df = df.rename(columns={"class_label": target})
             df.to_csv(self.name)
         self.util.debug(f"results stored in {self.name}")
+        return result

{nkululeko-0.82.4 → nkululeko-0.83.1/nkululeko.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.82.4
+Version: 0.83.1
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -333,6 +333,14 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.83.1
+--------------
+* add test module to nkuluflag
+
+Version 0.83.0
+--------------
+* test module now prints out reports
+
 Version 0.82.4
 --------------
 * fixed bug in wavlm 

{nkululeko-0.82.4 → nkululeko-0.83.1}/nkululeko.egg-info/SOURCES.txt

@@ -51,7 +51,6 @@ meta/demos/demo_best_model.py
 meta/demos/my_experiment.py
 meta/demos/my_experiment_local.py
 meta/demos/plot_faster_anim.py
-meta/demos/multiple_exeriments/do_experiments.py
 nkululeko/__init__.py
 nkululeko/aug_train.py
 nkululeko/augment.py
@@ -73,7 +72,6 @@ nkululeko/nkuluflag.py
 nkululeko/nkululeko.py
 nkululeko/plots.py
 nkululeko/predict.py
-nkululeko/reporter.py
 nkululeko/resample.py
 nkululeko/runmanager.py
 nkululeko/scaler.py

nkululeko-0.82.4/meta/demos/multiple_exeriments/do_experiments.py

@@ -1,35 +0,0 @@
-import os
-
-
-classifiers = [
-    {"--model": "mlp", "--layers": "\"{'l1':64,'l2':16}\"", "--epochs": 100},
-    {
-        "--model": "mlp",
-        "--layers": "\"{'l1':128,'l2':64,'l3':16}\"",
-        "--learning_rate": ".01",
-        "--drop": ".3",
-        "--epochs": 100,
-    },
-    {"--model": "xgb", "--epochs": 1},
-    {"--model": "svm", "--epochs": 1},
-]
-
-features = [
-    {"--feat": "os"},
-    # {'--feat': 'os',
-    # '--set': 'ComParE_2016',
-    # },
-    {"--feat": "praat"},
-]
-
-
-for c in classifiers:
-    for f in features:
-        cmd = "python -m nkululeko.nkuluflag --config exp.ini "
-        for item in c:
-            cmd += f"{item} {c[item]} "
-        for item in f:
-            cmd += f"{item} {f[item]} "
-        print(cmd)
-        os.system(cmd)
-        # print(f"results: {result}, {last_epoch}")