added option to use tensorflow.keras

pumpp/feature/base.py

@@ -116,8 +116,10 @@ def layers(self, api='keras'):
             field keys.
         '''
 
-        if api == 'keras':
+        if api in ('k', 'keras'):
             return self.layers_keras()
+        elif api in ('tf.keras', 'tensorflow.keras', 'tfk'):
+            return self.layers_tfkeras()
         elif api in ('tf', 'tensorflow'):
             return self.layers_tensorflow()
         else:
@@ -144,6 +146,17 @@ def layers_keras(self):
 
         return L
 
+    def layers_tfkeras(self):
+        from tensorflow.keras.layers import Input
+
+        L = dict()
+        for key in self.fields:
+            L[key] = Input(name=key,
+                           shape=self.fields[key].shape,
+                           dtype=np.dtype(self.fields[key].dtype).name)
+
+        return L
+
     def n_frames(self, duration):
         '''Get the number of frames for a given duration
 

tests/test_core.py

@@ -213,6 +213,10 @@ def test_pump_layers(sr, hop_length):
         for d1, d2 in zip(L1[k].shape, L2[k].shape):
             assert str(d1) == str(d2)
 
+    # test other input layers
+    P.layers('tf.keras')
+    P.layers('tf')
+
 
 def test_pump_str(sr, hop_length):