commit fdcbb2fe6e5cf937c1ba3f8bcb21a98647388237
parent d662817cfb1c671a13db0e104bb96b6c00cf9e2b
Author: CarlSouthall <c-southall@live.co.uk>
Date: Wed, 3 Aug 2016 16:40:41 +0100
1.5
Diffstat:
9 files changed, 32 insertions(+), 62 deletions(-)
diff --git a/ADTLib.egg-info/PKG-INFO b/ADTLib.egg-info/PKG-INFO
@@ -1,19 +0,0 @@
-Metadata-Version: 1.1
-Name: ADTLib
-Version: 1.0
-Summary: Automated Drum Trancription Libray
-Home-page: https://github.com/CarlSouthall/ADTLib
-Author: Carl Southall
-Author-email: c-southall@live.co.uk
-License: BSD
-Download-URL: https://github.com/CarlSouthall/ADTLib
-Description: UNKNOWN
-Keywords: testing,logging,example
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
diff --git a/ADTLib.egg-info/SOURCES.txt b/ADTLib.egg-info/SOURCES.txt
@@ -1,18 +0,0 @@
-setup.cfg
-setup.py
-ADTLib/__init__.py
-ADTLib.egg-info/PKG-INFO
-ADTLib.egg-info/SOURCES.txt
-ADTLib.egg-info/dependency_links.txt
-ADTLib.egg-info/requires.txt
-ADTLib.egg-info/top_level.txt
-ADTLib/models/__init__.py
-ADTLib/nn/__init__.py
-ADTLib/nn/NNFiles/BDHAll-1000
-ADTLib/nn/NNFiles/BDHAll-1000.meta
-ADTLib/nn/NNFiles/BDKAll-1000
-ADTLib/nn/NNFiles/BDKAll-1000.meta
-ADTLib/nn/NNFiles/BDSAll-1000
-ADTLib/nn/NNFiles/BDSAll-1000.meta
-ADTLib/utils/__init__.py
-bin/ADTBDRNN
-\ No newline at end of file
diff --git a/ADTLib.egg-info/dependency_links.txt b/ADTLib.egg-info/dependency_links.txt
@@ -1 +0,0 @@
-
diff --git a/ADTLib.egg-info/requires.txt b/ADTLib.egg-info/requires.txt
@@ -1,5 +0,0 @@
-numpy
-scipy
-cython
-madmom
-tensorflow
diff --git a/ADTLib.egg-info/top_level.txt b/ADTLib.egg-info/top_level.txt
@@ -1 +0,0 @@
-ADTLib
diff --git a/ADTLib/models/__init__.py b/ADTLib/models/__init__.py
@@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
"""
@author: CarlSouthall
+ADTBDRNN
+
"""
@@ -16,7 +18,17 @@ import ADTLib.nn as ADTnn
from ADTLib.utils import Wavread, MeanPP, arrange_output, write_text
def ADTBDRNN(TrackNames, out_sort='time',ret='yes', out_text='no', savedir='current',close_error=0.05,lambd=[9.7,9.9,4.9]):
+
+ ''' Bi-directional neural network algorithm outlined in:
+
+ Southall, C., R. Stables, J. Hockman, Automatic Drum Transcription Using
+ Bi-directional Recurrent Neural Networks,
+ Proceedings of the 17th International Society for Music Information
+ Retrieval Conference (ISMIR), 2016.
+ For usage help see github.com/CarlSouthall/ADTLib/usage.md
+
+ '''
Time_Steps=1
WL=2048
HS=512
diff --git a/bin/ADTBDRNN b/bin/ADTBDRNN
@@ -2,6 +2,8 @@
# -*- coding: utf-8 -*-
"""
@author: CarlSouthall
+ADTBDRNN
+
"""
from __future__ import absolute_import, division, print_function
@@ -12,12 +14,12 @@ from subprocess import call
p = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,description='''
-ADTBDRNN is based on the BDRNN architecture outlined within:
-
- Carl Southall, Ryan Stables, Jason Hockman,
- Automatic Drum Transcription Using Bi-directional Recurrent Neural Networks,
+ADTBDRNN is based on the bi-directional neural network architecture outlined within:
+
+ Southall, C., R. Stables, J. Hockman, Automatic Drum Transcription Using
+ Bi-directional Recurrent Neural Networks,
Proceedings of the 17th International Society for Music Information
- Retrieval Conference (ISMIR), 2016.
+ Retrieval Conference (ISMIR), 2016.
Flag Name Description Default setting
-h help displays help file n/a
@@ -26,7 +28,8 @@ ADTBDRNN is based on the BDRNN architecture outlined within:
-p print defines whether the output is displayed in the terminal or not yes
-ot output_text defines whether the ouput is stored in a textfile or not yes
I input_file_names single or list of wav file names seperated by spaces n/a
-
+
+ For further usage help see github.com/CarlSouthall/ADTLib/usage.md
''')
p = argparse.ArgumentParser(prog='ADTBDRNN')
p.add_argument('I', nargs='*',help='InputFileNames',)
diff --git a/dist/ADTLib-1.0.tar.gz b/dist/ADTLib-1.0.tar.gz
Binary files differ.
diff --git a/setup.py b/setup.py
@@ -8,23 +8,23 @@ scripts = glob.glob('bin/*')
setup(
name = 'ADTLib',
packages=find_packages(exclude=[]),
- version = '1.1',
- description = 'Automated Drum Trancription Libray',
+ version = '1.5',
+ description = 'Automated Drum Trancription Library',
author = 'Carl Southall',
author_email = 'c-southall@live.co.uk',
license='BSD',
url = 'https://github.com/CarlSouthall/ADTLib',
download_url = 'https://github.com/CarlSouthall/ADTLib',
keywords = ['Drums', 'Transcription', 'Automated'],
- classifiers = ['Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.6',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.2',
- 'Programming Language :: Python :: 3.3',
- 'Programming Language :: Python :: 3.4',],
- scripts=scripts,
+ scripts=scripts,
+ classifiers = [
+ 'Programming Language :: Python :: 2.7',
+ 'License :: OSI Approved :: BSD License',
+ 'License :: Free for non-commercial use',
+ 'Topic :: Multimedia :: Sound/Audio :: Analysis',
+ 'Topic :: Scientific/Engineering :: Artificial Intelligence'],
install_requires=['numpy','scipy','cython','madmom'],
- package_data={'ADTLib': package_data},
+ package_data={'ADTLib': package_data},
+
)
