nkululeko 0.91.0__tar.gz → 0.91.2__tar.gz

{nkululeko-0.91.0 → nkululeko-0.91.2}/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+Version 0.91.2
+--------------
+* making lint work by excluding constants from check
+
+Version 0.91.1
+--------------
+* minor refactoring in ensemble module
+
 Version 0.91.0
 --------------
 * fixed duration display in segmentation

{nkululeko-0.91.0/nkululeko.egg-info → nkululeko-0.91.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.91.0
+Version: 0.91.2
 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
@@ -201,7 +200,7 @@ All of them take *--config <my_config.ini>* as an argument.
 
 * **nkululeko.nkululeko**: do machine learning experiments combining features and learners
 * **nkululeko.ensemble**: [combine several nkululeko experiments](http://blog.syntheticspeech.de/2024/06/25/nkululeko-ensemble-classifiers-with-late-fusion/) and report on late fusion results
-  * *configurations*: which experiments to combine
+  * *--config*: which experiments (INI files) to combine
   * *--method* (optional): majority_voting, mean (default), max, sum, uncertainty, uncertainty_weighted, confidence_weighted, performance_weighted  
   * *--threshold*: uncertainty threshold (1.0 means no threshold)
   * *--weights*: weights for performance_weighted method (could be from previous UAR, ACC)
@@ -262,7 +261,7 @@ There's my [blog](http://blog.syntheticspeech.de/?s=nkululeko) with tutorials:
 * [Predict new labels for your data from public models and check bias](http://blog.syntheticspeech.de/2023/08/16/nkululeko-how-to-predict-labels-for-your-data-from-existing-models-and-check-them/)
 * [Resample](http://blog.syntheticspeech.de/2023/08/31/how-to-fix-different-sampling-rates-in-a-dataset-with-nkululeko/)
 * [Get some statistics on correlation and effect-size](http://blog.syntheticspeech.de/2023/09/05/nkululeko-get-some-statistics-on-correlation-and-effect-size/)
-* [Automatic generation  of a latex / pdf report](http://blog.syntheticspeech.de/2023/09/26/nkululeko-generate-a-latex-pdf-report/) 
+* [Automatic generation of a latex / pdf report](http://blog.syntheticspeech.de/2023/09/26/nkululeko-generate-a-latex-pdf-report/) 
 * [Inspect your data with Spotlight](http://blog.syntheticspeech.de/2023/10/31/nkululeko-inspect-your-data-with-spotlight/)
 * [Automatically stratify your split sets](http://blog.syntheticspeech.de/2023/11/07/nkululeko-automatically-stratify-your-split-sets/)
 * [re-name data column names](http://blog.syntheticspeech.de/2023/11/16/nkululeko-re-name-data-column-names/)
@@ -356,6 +355,14 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.91.2
+--------------
+* making lint work by excluding constants from check
+
+Version 0.91.1
+--------------
+* minor refactoring in ensemble module
+
 Version 0.91.0
 --------------
 * fixed duration display in segmentation

{nkululeko-0.91.0 → nkululeko-0.91.2}/README.md

@@ -157,7 +157,7 @@ All of them take *--config <my_config.ini>* as an argument.
 
 * **nkululeko.nkululeko**: do machine learning experiments combining features and learners
 * **nkululeko.ensemble**: [combine several nkululeko experiments](http://blog.syntheticspeech.de/2024/06/25/nkululeko-ensemble-classifiers-with-late-fusion/) and report on late fusion results
-  * *configurations*: which experiments to combine
+  * *--config*: which experiments (INI files) to combine
   * *--method* (optional): majority_voting, mean (default), max, sum, uncertainty, uncertainty_weighted, confidence_weighted, performance_weighted  
   * *--threshold*: uncertainty threshold (1.0 means no threshold)
   * *--weights*: weights for performance_weighted method (could be from previous UAR, ACC)
@@ -218,7 +218,7 @@ There's my [blog](http://blog.syntheticspeech.de/?s=nkululeko) with tutorials:
 * [Predict new labels for your data from public models and check bias](http://blog.syntheticspeech.de/2023/08/16/nkululeko-how-to-predict-labels-for-your-data-from-existing-models-and-check-them/)
 * [Resample](http://blog.syntheticspeech.de/2023/08/31/how-to-fix-different-sampling-rates-in-a-dataset-with-nkululeko/)
 * [Get some statistics on correlation and effect-size](http://blog.syntheticspeech.de/2023/09/05/nkululeko-get-some-statistics-on-correlation-and-effect-size/)
-* [Automatic generation  of a latex / pdf report](http://blog.syntheticspeech.de/2023/09/26/nkululeko-generate-a-latex-pdf-report/) 
+* [Automatic generation of a latex / pdf report](http://blog.syntheticspeech.de/2023/09/26/nkululeko-generate-a-latex-pdf-report/) 
 * [Inspect your data with Spotlight](http://blog.syntheticspeech.de/2023/10/31/nkululeko-inspect-your-data-with-spotlight/)
 * [Automatically stratify your split sets](http://blog.syntheticspeech.de/2023/11/07/nkululeko-automatically-stratify-your-split-sets/)
 * [re-name data column names](http://blog.syntheticspeech.de/2023/11/16/nkululeko-re-name-data-column-names/)

{nkululeko-0.91.0 → nkululeko-0.91.2}/data/ravdess/process_database.py

@@ -9,14 +9,9 @@ Download and unzip the file Audio_Speech_Actors_01-24.zip e.g., `ravdess_speech`
 
 adapted from https://www.kaggle.com/code/shivamburnwal/speech-emotion-recognition
 
-<<<<<<< HEAD
-Usage: `python3 process_database.py /data/ravdess_speech/`
-
-=======
 Usage: `python3 process_database.py -d /data/ravdess_speech
 OR
 `python3 process_database.py /data/ravdess_speech`
->>>>>>> e639b1104ec3f50b3944440119f2416aea6e31ac
 """
 
  
@@ -25,12 +20,6 @@ import sys
 
 import pandas as pd
 
-<<<<<<< HEAD
-
-# ravdess source directory as argument
-# source_dir = './'
-source_dir = sys.argv[1]
-=======
 import argparse
 from pathlib import Path, PurePath
 
@@ -40,7 +29,6 @@ parser = argparse.ArgumentParser()
 parser.add_argument('-d', '--dir', type=str, default='./', help='path to RAVDESS speech directory')
 args = parser.parse_args()
 source_dir = str(Path(args.dir))
->>>>>>> e639b1104ec3f50b3944440119f2416aea6e31ac
 database_name = 'ravdess'
 
 # check if directory (e.g., Actor_01) exists

{nkululeko-0.91.0 → nkululeko-0.91.2}/nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.91.0"
+VERSION="0.91.2"
 SAMPLING_RATE = 16000

{nkululeko-0.91.0 → nkululeko-0.91.2}/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.91.0 → nkululeko-0.91.2}/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

{nkululeko-0.91.0 → nkululeko-0.91.2}/nkululeko/test_pretrain.py

@@ -216,7 +216,6 @@ def doit(config_file):
     )
 
     class Trainer(transformers.Trainer):
-
         def compute_loss(
             self,
             model,

{nkululeko-0.91.0 → nkululeko-0.91.2/nkululeko.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.91.0
+Version: 0.91.2
 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
@@ -201,7 +200,7 @@ All of them take *--config <my_config.ini>* as an argument.
 
 * **nkululeko.nkululeko**: do machine learning experiments combining features and learners
 * **nkululeko.ensemble**: [combine several nkululeko experiments](http://blog.syntheticspeech.de/2024/06/25/nkululeko-ensemble-classifiers-with-late-fusion/) and report on late fusion results
-  * *configurations*: which experiments to combine
+  * *--config*: which experiments (INI files) to combine
   * *--method* (optional): majority_voting, mean (default), max, sum, uncertainty, uncertainty_weighted, confidence_weighted, performance_weighted  
   * *--threshold*: uncertainty threshold (1.0 means no threshold)
   * *--weights*: weights for performance_weighted method (could be from previous UAR, ACC)
@@ -262,7 +261,7 @@ There's my [blog](http://blog.syntheticspeech.de/?s=nkululeko) with tutorials:
 * [Predict new labels for your data from public models and check bias](http://blog.syntheticspeech.de/2023/08/16/nkululeko-how-to-predict-labels-for-your-data-from-existing-models-and-check-them/)
 * [Resample](http://blog.syntheticspeech.de/2023/08/31/how-to-fix-different-sampling-rates-in-a-dataset-with-nkululeko/)
 * [Get some statistics on correlation and effect-size](http://blog.syntheticspeech.de/2023/09/05/nkululeko-get-some-statistics-on-correlation-and-effect-size/)
-* [Automatic generation  of a latex / pdf report](http://blog.syntheticspeech.de/2023/09/26/nkululeko-generate-a-latex-pdf-report/) 
+* [Automatic generation of a latex / pdf report](http://blog.syntheticspeech.de/2023/09/26/nkululeko-generate-a-latex-pdf-report/) 
 * [Inspect your data with Spotlight](http://blog.syntheticspeech.de/2023/10/31/nkululeko-inspect-your-data-with-spotlight/)
 * [Automatically stratify your split sets](http://blog.syntheticspeech.de/2023/11/07/nkululeko-automatically-stratify-your-split-sets/)
 * [re-name data column names](http://blog.syntheticspeech.de/2023/11/16/nkululeko-re-name-data-column-names/)
@@ -356,6 +355,14 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.91.2
+--------------
+* making lint work by excluding constants from check
+
+Version 0.91.1
+--------------
+* minor refactoring in ensemble module
+
 Version 0.91.0
 --------------
 * fixed duration display in segmentation

{nkululeko-0.91.0 → nkululeko-0.91.2}/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.91.0 → nkululeko-0.91.2}/nkululeko.egg-info/requires.txt

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

{nkululeko-0.91.0 → nkululeko-0.91.2}/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.91.0 → nkululeko-0.91.2}/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",
         ],
     },
 )