refactored SVM + RVM, deleted PCA for now

Author: agrimagsrl

.gitignore

@@ -1,3 +1,4 @@
 venv
 .idea
-tests
+tests
+dist

MANIFEST

@@ -3,17 +3,15 @@ setup.cfg
 setup.py
 micromlgen/__init__.py
 micromlgen/micromlgen.py
-micromlgen/templates/_scalar_product.jinja
-micromlgen/templates/binary_classification.jinja
+micromlgen/platforms.py
 micromlgen/templates/classmap.jinja
-micromlgen/templates/compute_class.jinja
-micromlgen/templates/compute_decisions.jinja
-micromlgen/templates/compute_kernels.bck.jinja
-micromlgen/templates/compute_kernels.jinja
-micromlgen/templates/compute_votes.jinja
-micromlgen/templates/kernel_function.jinja
-micromlgen/templates/pca_function.jinja
-micromlgen/templates/self_test.jinja
-micromlgen/templates/svm.jinja
-micromlgen/templates/pca/_dot_product.jinja
-micromlgen/templates/pca/pca.jinja
+micromlgen/templates/rvm/rvm.jinja
+micromlgen/templates/svm/svm.jinja
+micromlgen/templates/svm/computations/class.jinja
+micromlgen/templates/svm/computations/decisions.jinja
+micromlgen/templates/svm/computations/votes.jinja
+micromlgen/templates/svm/computations/kernel/arduino.jinja
+micromlgen/templates/svm/computations/kernel/attiny.jinja
+micromlgen/templates/svm/kernel/arduino.jinja
+micromlgen/templates/svm/kernel/attiny.jinja
+micromlgen/templates/svm/kernel/kernel.jinja

dist/micromlgen-0.13.tar.gz

@@ -1 +1,2 @@
-from micromlgen.micromlgen import port, port_pca, port_rvm
+import micromlgen.platforms as platforms
+from micromlgen.micromlgen import port

micromlgen/__init__.py

@@ -1,10 +1,13 @@
 import os
 import re
-from math import factorial
+from micromlgen import platforms
+from sklearn.svm import SVC, LinearSVC, OneClassSVM
+from skbayes.rvm_ard_models import RVC
 from jinja2 import FileSystemLoader, Environment
 
 
 def jinja(template_file, data):
+    """Render Jinja template"""
     dir_path = os.path.dirname(os.path.realpath(__file__))
     loader = FileSystemLoader(dir_path + '/templates')
     template = Environment(loader=loader).get_template(template_file)
@@ -13,67 +16,85 @@ def jinja(template_file, data):
     return code
 
 
-def port_pca(pca):
-    return jinja('pca/pca.jinja', {
-        'X_DIM': pca.components_.shape[1],
-        'PCA_DIM': pca.components_.shape[0],
-        'F': {
-            'round': round
-        },
-        'pca_components': pca.components_,
+def _port(template, data):
+    """Add common template data before rendering"""
+    data.update(**{
+        'f': {
+            'enumerate': enumerate,
+            'round': lambda x: round(x, data.get('precision', 9) or 9),
+            'zip': zip
+        }
     })
+    return jinja(template, data)
 
 
-def port_rvm(clf, classmap=None, test_set=None, **kwargs):
-    from skbayes.rvm_ard_models import RVC
-    assert isinstance(clf, RVC), 'Not an RVC classifier'
-    return jinja('rvm/rvm.jinja', {
-        'clf': clf,
-        'FEATURES_DIM': clf.relevant_vectors_[0].shape[1],
-        'KERNEL_TYPE': clf.kernel,
-        'KERNEL_GAMMA': clf.gamma,
-        'KERNEL_COEF': clf.coef0,
-        'KERNEL_DEGREE': clf.degree,
-        'N_CLASSES': len(clf.classes_),
-        'classmap': classmap,
-        'X': test_set[0] if test_set else None,
-        'y': test_set[1] if test_set else None,
-        'enumerate': enumerate,
-        'zip': zip,
-        'round': round
-    })
+def port_rvm(clf, classname, **kwargs):
+    """Port a RVM classifier"""
+    assert classname is None or len(classname) > 0, 'Invalid class name'
+    template_data = {
+        **kwargs,
+        'kernel': {
+            'type': clf.kernel,
+            'gamma': clf.gamma,
+            'coef0': clf.coef0,
+            'degree': clf.degree
+        },
+        'sizes': {
+            'features': len(clf.relevant_vectors_[0]),
+        },
+        'arrays': {
+            'vectors': clf.relevant_vectors_,
+            'coefs': clf.coef_,
+            'actives': clf.active_,
+            'intercepts': clf.intercept_,
+            'mean': clf._x_mean,
+            'std': clf._x_std
+        },
+        'classname': classname if classname is not None else 'RVM',
+    }
+    return _port('rvm/rvm.jinja', template_data)
 
 
-def port(clf,
-         test_set=None,
-         classmap=None,
-         platform='arduino',
-         **kwargs):
-    assert type(clf).__name__ == 'SVC', 'Only sklearn.svm.SVC is supported for now'
+def port_svm(clf, classname=None, **kwargs):
+    """Port a SVC / LinearSVC classifier"""
     assert isinstance(clf.gamma, float), 'You probably didn\'t set an explicit value for gamma: 0.001 is a good default'
+    assert classname is None or len(classname) > 0, 'Invalid class name'
     support_v = clf.support_vectors_
     n_classes = len(clf.n_support_)
     template_data = {
-        'KERNEL_TYPE': clf.kernel,
-        'KERNEL_GAMMA': clf.gamma,
-        'KERNEL_COEF': clf.coef0,
-        'KERNEL_DEGREE': clf.degree,
-        'FEATURES_DIM': len(support_v[0]),
-        'VECTORS_COUNT': len(support_v),
-        'CLASSES_COUNT': n_classes,
-        'DECISIONS_COUNT': n_classes * (n_classes - 1) // 2,
-        'support_v': support_v,
-        'n_support': clf.n_support_,
-        'intercepts': clf.intercept_,
-        'coefs': clf.dual_coef_,
-        'X': test_set[0] if test_set else None,
-        'y': test_set[1] if test_set else None,
-        'classmap': classmap,
-        'F': {
-            'enumerate': enumerate,
-            'round': round
+        **kwargs,
+        'kernel': {
+            'type': clf.kernel,
+            'gamma': clf.gamma,
+            'coef0': clf.coef0,
+            'degree': clf.degree
         },
-        'isAttiny': platform == 'attiny',
+        'sizes': {
+            'features': len(support_v[0]),
+            'vectors': len(support_v),
+            'classes': n_classes,
+            'decisions': n_classes * (n_classes - 1) // 2,
+            'supports': clf.n_support_
+        },
+        'arrays': {
+            'supports': support_v,
+            'intercepts': clf.intercept_,
+            'coefs': clf.dual_coef_
+        },
+        'classname': classname if classname is not None else 'SVM'
     }
-    return jinja('svm.jinja', template_data)
+    return _port('svm/svm.jinja', template_data)
+
 
+def port(
+        clf,
+        classname=None,
+        classmap=None,
+        platform=platforms.ARDUINO,
+        precision=None):
+    assert platform in platforms.ALL, 'Unknown platform %s. Use one of %s' % (platform, ', '.join(platforms.ALL))
+    if isinstance(clf, (SVC, LinearSVC, OneClassSVM)):
+        return port_svm(**locals())
+    elif isinstance(clf, RVC):
+        return port_rvm(**locals())
+    raise TypeError('clf MUST be one of SVC, LinearSVC, OneClassSVC, RVC')

micromlgen/__pycache__/__init__.cpython-36.pyc

@@ -0,0 +1,6 @@
+ARDUINO = 'arduino'
+ATTINY = 'attiny'
+ALL = [
+    ARDUINO,
+    ATTINY
+]

micromlgen/__pycache__/micromlgen.cpython-36.pyc

@@ -10,7 +10,8 @@ const char* classIdxToName(uint8_t classIdx) {
                 return "{{ name }}";
         {% endfor %}
         default:
-            return "UNKNOWN";
+            return "Houston we have a problem";
     }
 }
+
 {% endif %}