nkululeko 0.90.4__tar.gz → 0.91.1__tar.gz

{nkululeko-0.90.4 → nkululeko-0.91.1}/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+--------------
+* minor refactoring in ensemble module
+
+Version 0.91.0
+--------------
+* fixed duration display in segmentation
+* added possibility to use original segmentations (without max. duration)
+
 Version 0.90.4
 --------------
 * added plot format for multidb

{nkululeko-0.90.4/nkululeko.egg-info → nkululeko-0.91.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.90.4
+Version: 0.91.1
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -10,7 +10,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 3 - Alpha
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.6
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: audeer
@@ -23,7 +23,6 @@ Requires-Dist: audonnx
 Requires-Dist: confidence_intervals
 Requires-Dist: datasets
 Requires-Dist: imageio
-Requires-Dist: laion-clap
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: opensmile
@@ -356,6 +355,14 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+--------------
+* minor refactoring in ensemble module
+
+Version 0.91.0
+--------------
+* fixed duration display in segmentation
+* added possibility to use original segmentations (without max. duration)
+
 Version 0.90.4
 --------------
 * added plot format for multidb

{nkululeko-0.90.4 → nkululeko-0.91.1}/nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.90.4"
+VERSION="0.91.1"
 SAMPLING_RATE = 16000

{nkululeko-0.90.4 → nkululeko-0.91.1}/nkululeko/ensemble.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """
 Ensemble predictions from multiple experiments.
 
@@ -16,9 +17,6 @@ Raises:
     AssertionError: If the number of config files is less than 2 for majority voting.
 """
 
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 
 import configparser
 import time
@@ -300,10 +298,10 @@ def ensemble_predictions(
     return ensemble_preds
 
 
-def main(src_dir: Path) -> None:
+def main():
     parser = ArgumentParser()
     parser.add_argument(
-        "configs",
+        "--config",
         nargs="+",
         help="Paths to the configuration files of the experiments to ensemble. \
              Can be INI files for Nkululeko.nkululeko or CSV files from Nkululeko.demo.",
@@ -356,7 +354,7 @@ def main(src_dir: Path) -> None:
     start = time.time()
 
     ensemble_preds = ensemble_predictions(
-        args.configs, args.method, args.threshold, args.weights, args.no_labels
+        args.config, args.method, args.threshold, args.weights, args.no_labels
     )
 
     # save to csv
@@ -368,5 +366,4 @@ def main(src_dir: Path) -> None:
 
 
 if __name__ == "__main__":
-    cwd = Path(__file__).parent
-    main(cwd)
+    main()

{nkululeko-0.90.4 → nkululeko-0.91.1}/nkululeko/segment.py

@@ -1,5 +1,22 @@
-# segment.py
-# segment data splits
+"""
+Segments the samples in the dataset into chunks based on voice activity detection using SILERO VAD [1].
+
+The segmentation results are saved to a file, and the distributions of the original and
+segmented durations are plotted.
+
+The module also handles configuration options, such as the segmentation method and sample
+selection, and reports the segmentation results.
+
+Usage:
+    python3 -m nkululeko.segment [--config CONFIG_FILE]
+
+Example:
+    nkululeko.segment --config tests/exp_androids_segment.ini
+
+References:
+    [1] https://github.com/snakers4/silero-vad
+    
+"""
 
 import argparse
 import configparser
@@ -7,9 +24,9 @@ import os
 
 import pandas as pd
 
-import nkululeko.glob_conf as glob_conf
 from nkululeko.constants import VERSION
 from nkululeko.experiment import Experiment
+import nkululeko.glob_conf as glob_conf
 from nkululeko.reporting.report_item import ReportItem
 from nkululeko.utils.util import Util
 
@@ -78,6 +95,7 @@ def main():
 
     if "duration" not in df.columns:
         df["duration"] = df.index.to_series().map(lambda x: calc_dur(x))
+    df_seg["duration"] = df_seg.index.to_series().map(lambda x: calc_dur(x))
     num_before = df.shape[0]
     num_after = df_seg.shape[0]
     # plot distributions
@@ -115,36 +133,5 @@ def main():
     print("DONE")
 
 
-def get_segmentation(file):
-    #    print(f'segmenting {file[0]}')
-    print(".", end="")
-    wav = read_audio(file[0], sampling_rate=SAMPLING_RATE)
-    speech_timestamps = get_speech_timestamps(
-        wav, vad_model, sampling_rate=SAMPLING_RATE
-    )
-    files, starts, ends = [], [], []
-    for entry in speech_timestamps:
-        start = float(entry["start"] / 1000.0)
-        end = float(entry["end"] / 1000.0)
-        files.append(file[0])
-        starts.append(start)
-        ends.append(end)
-    seg_index = segmented_index(files, starts, ends)
-    return seg_index
-
-
-def segment_dataframe(df):
-    dfs = []
-    for file, values in df.iterrows():
-        index = get_segmentation(file)
-        dfs.append(
-            pd.DataFrame(
-                values.to_dict(),
-                index,
-            )
-        )
-    return audformat.utils.concat(dfs)
-
-
 if __name__ == "__main__":
     main()  # use this if you want to state the config file path on command line

{nkululeko-0.90.4 → nkululeko-0.91.1}/nkululeko/segmenting/seg_silero.py

@@ -32,8 +32,30 @@ class Silero_segmenter:
         self.no_testing = not_testing
         self.util = Util(has_config=not_testing)
 
-    def get_segmentation(self, file):
-        #    print(f'segmenting {file[0]}')
+    def get_segmentation_simple(self, file):
+        (
+            get_speech_timestamps,
+            save_audio,
+            read_audio,
+            VADIterator,
+            collect_chunks,
+        ) = vad_utils
+        SAMPLING_RATE = 16000
+        wav = read_audio(file[0], sampling_rate=SAMPLING_RATE)
+        speech_timestamps = get_speech_timestamps(
+            wav, vad_model, sampling_rate=SAMPLING_RATE
+        )
+        files, starts, ends = [], [], []
+        for entry in speech_timestamps:
+            start = float(entry["start"] / SAMPLING_RATE)
+            end = float(entry["end"] / SAMPLING_RATE)
+            files.append(file[0])
+            starts.append(start)
+            ends.append(end)
+        seg_index = segmented_index(files, starts, ends)
+        return seg_index
+
+    def get_segmentation(self, file, min_length, max_length):
         (
             get_speech_timestamps,
             save_audio,
@@ -42,12 +64,6 @@ class Silero_segmenter:
             collect_chunks,
         ) = vad_utils
         SAMPLING_RATE = 16000
-        if self.no_testing:
-            min_length = float(self.util.config_val("SEGMENT", "min_length", 2))
-            max_length = float(self.util.config_val("SEGMENT", "max_length", 10))
-        else:
-            min_length = 2
-            max_length = 10
         wav = read_audio(file[0], sampling_rate=SAMPLING_RATE)
         speech_timestamps = get_speech_timestamps(
             wav, vad_model, sampling_rate=SAMPLING_RATE
@@ -76,8 +92,18 @@ class Silero_segmenter:
 
     def segment_dataframe(self, df):
         dfs = []
+        max_length = eval(self.util.config_val("SEGMENT", "max_length", "False"))
+        if max_length:
+            if self.no_testing:
+                min_length = float(self.util.config_val("SEGMENT", "min_length", 2))
+            else:
+                min_length = 2
+            self.util.debug(f"segmenting with max length: {max_length+min_length}")
         for file, values in tqdm(df.iterrows()):
-            index = self.get_segmentation(file)
+            if max_length:
+                index = self.get_segmentation(file, min_length, max_length)
+            else:
+                index = self.get_segmentation_simple(file)
             dfs.append(
                 pd.DataFrame(
                     values.to_dict(),

{nkululeko-0.90.4 → nkululeko-0.91.1/nkululeko.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.90.4
+Version: 0.91.1
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -10,7 +10,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 3 - Alpha
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.6
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: audeer
@@ -23,7 +23,6 @@ Requires-Dist: audonnx
 Requires-Dist: confidence_intervals
 Requires-Dist: datasets
 Requires-Dist: imageio
-Requires-Dist: laion-clap
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: opensmile
@@ -356,6 +355,14 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+--------------
+* minor refactoring in ensemble module
+
+Version 0.91.0
+--------------
+* fixed duration display in segmentation
+* added possibility to use original segmentations (without max. duration)
+
 Version 0.90.4
 --------------
 * added plot format for multidb

{nkululeko-0.90.4 → nkululeko-0.91.1}/nkululeko.egg-info/entry_points.txt

@@ -1,6 +1,7 @@
 [console_scripts]
 nkululeko.augment = nkululeko.augment:main
 nkululeko.demo = nkululeko.demo:main
+nkululeko.ensemble = nkululeko.ensemble:main
 nkululeko.explore = nkululeko.explore:main
 nkululeko.export = nkululeko.export:main
 nkululeko.nkululeko = nkululeko.nkululeko:main

{nkululeko-0.90.4 → nkululeko-0.91.1}/nkululeko.egg-info/requires.txt

@@ -8,7 +8,6 @@ audonnx
 confidence_intervals
 datasets
 imageio
-laion-clap
 matplotlib
 numpy
 opensmile

{nkululeko-0.90.4 → nkululeko-0.91.1}/setup.cfg

@@ -27,7 +27,6 @@ install_requires =
 	confidence_intervals
 	datasets
 	imageio
-	laion-clap
 	matplotlib
 	numpy
 	opensmile
@@ -45,7 +44,7 @@ install_requires =
 	umap-learn
 	xgboost
 	pylatex
-python_requires = >=3.6
+python_requires = >=3.9
 include_package_data = False
 
 [egg_info]

{nkululeko-0.90.4 → nkululeko-0.91.1}/setup.py

@@ -16,6 +16,7 @@ setup(
             "nkululeko.resample=nkululeko.resample:main",
             "nkululeko.segment=nkululeko.segment:main",
             "nkululeko.test=nkululeko.test:main",
+            "nkululeko.ensemble=nkululeko.ensemble:main",
         ],
     },
 )