diff keras_model_config.xml @ 1:0fd7d8e90e2a draft

"planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/sklearn commit ba6a47bdf76bbf4cb276206ac1a8cbf61332fd16"
author bgruening
date Fri, 13 Sep 2019 12:19:45 -0400
parents 1046cf73236b
children 4471d2b2de79
line wrap: on
line diff
--- a/keras_model_config.xml	Fri Aug 09 07:14:22 2019 -0400
+++ b/keras_model_config.xml	Fri Sep 13 12:19:45 2019 -0400
@@ -168,29 +168,35 @@
             <when value="LocallyConnected2D">
               <expand macro="layer_LocallyConnected2D"/>
             </when>
-            <when value="RNN">
-            </when>
-            <when value="Masking">
-            </when>
             <when value="SimpleRNN">
+              <expand macro="layer_SimpleRNN"/>
             </when>
             <when value="GRU">
+              <expand macro="layer_GRU"/>
             </when>
             <when value="LSTM">
+              <expand macro="layer_LSTM"/>
             </when>
             <when value="ConvLSTM2D">
+              <expand macro="layer_ConvLSTM2D"/>
             </when>
             <when value="ConvLSTM2DCell">
+              <expand macro="layer_ConvLSTM2DCell"/>
             </when>
             <when value="SimpleRNNCell">
+              <expand macro="layer_SimpleRNNCell"/>
             </when>
             <when value="GRUCell">
+              <expand macro="layer_GRUCell"/>
             </when>
             <when value="LSTMCell">
+              <expand macro="layer_LSTMCell"/>
             </when>
             <when value="CuDNNGRU">
+              <expand macro="layer_CuDNNGRU"/>
             </when>
             <when value="CuDNNLSTM">
+              <expand macro="layer_CuDNNLSTM"/>
             </when>
             <when value="Embedding">
               <expand macro="layer_Embedding"/>
@@ -214,16 +220,16 @@
               <expand macro="layer_ReLU"/>
             </when>
             <when value="BatchNormalization">
-              <expand macro="layer_Embedding"/>
+              <expand macro="layer_BatchNormalization"/>
             </when>
             <when value="GaussianNoise">
-              <expand macro="layer_Embedding"/>
+              <expand macro="layer_GaussianNoise"/>
             </when>
             <when value="GaussianDropout">
-              <expand macro="layer_Embedding"/>
+              <expand macro="layer_GaussianDropout"/>
             </when>
             <when value="AlphaDropout">
-              <expand macro="layer_Embedding"/>
+              <expand macro="layer_AlphaDropout"/>
             </when>
           </conditional>
         </repeat>
@@ -462,13 +468,15 @@
                 <expand macro="inbound_nodes_index"/>
               </expand>
             </when>
-            <when value="RNN">
-            </when>
-            <when value="Masking">
-            </when>
             <when value="SimpleRNN">
+              <expand macro="layer_SimpleRNN">
+                <expand macro="inbound_nodes_index"/>
+              </expand>
             </when>
             <when value="GRU">
+              <expand macro="layer_GRU">
+                <expand macro="inbound_nodes_index"/>
+              </expand>
             </when>
             <when value="LSTM">
               <expand macro="layer_LSTM">
@@ -476,18 +484,39 @@
               </expand>
             </when>
             <when value="ConvLSTM2D">
+              <expand macro="layer_ConvLSTM2D">
+                <expand macro="inbound_nodes_index"/>
+              </expand>
             </when>
             <when value="ConvLSTM2DCell">
+              <expand macro="layer_ConvLSTM2DCell">
+                <expand macro="inbound_nodes_index"/>
+              </expand>
             </when>
             <when value="SimpleRNNCell">
+              <expand macro="layer_SimpleRNNCell">
+                <expand macro="inbound_nodes_index"/>
+              </expand>
             </when>
             <when value="GRUCell">
+              <expand macro="layer_GRUCell">
+                <expand macro="inbound_nodes_index"/>
+              </expand>
             </when>
             <when value="LSTMCell">
+              <expand macro="layer_LSTMCell">
+                <expand macro="inbound_nodes_index"/>
+              </expand>
             </when>
             <when value="CuDNNGRU">
+              <expand macro="layer_CuDNNGRU">
+                <expand macro="inbound_nodes_index"/>
+              </expand>
             </when>
             <when value="CuDNNLSTM">
+              <expand macro="layer_CuDNNLSTM">
+                <expand macro="inbound_nodes_index"/>
+              </expand>
             </when>
             <when value="Add">
               <expand macro="layer_merge"/>
@@ -549,22 +578,22 @@
               </expand>
             </when>
             <when value="BatchNormalization">
-              <expand macro="layer_Embedding">
+              <expand macro="layer_BatchNormalization">
                 <expand macro="inbound_nodes_index"/>
               </expand>
             </when>
             <when value="GaussianNoise">
-              <expand macro="layer_Embedding">
+              <expand macro="layer_GaussianNoise">
                 <expand macro="inbound_nodes_index"/>
               </expand>
             </when>
             <when value="GaussianDropout">
-              <expand macro="layer_Embedding">
+              <expand macro="layer_GaussianDropout">
                 <expand macro="inbound_nodes_index"/>
               </expand>
             </when>
             <when value="AlphaDropout">
-              <expand macro="layer_Embedding">
+              <expand macro="layer_AlphaDropout">
                 <expand macro="inbound_nodes_index"/>
               </expand>
             </when>
@@ -642,9 +671,7 @@
             <param name="layer_type" value="Embedding"/>
             <param name="input_dim" value="10000"/>
             <param name="output_dim" value="512"/>
-            <section name="layer_options">
-              <param name="input_length" value="100"/>
-            </section>
+            <param name="kwargs" value="input_length=100"/>
             <param name="inbound_nodes" value="1"/>
           </conditional>
         </repeat>
@@ -659,9 +686,7 @@
           <conditional name="layer_selection">
             <param name="layer_type" value="Dense"/>
             <param name="units" value="1"/>
-            <section name="layer_options">
-              <param name="activation" value="sigmoid"/>
-            </section>
+            <param name="activation" value="sigmoid"/>
             <param name="inbound_nodes" value="3"/>
           </conditional>
         </repeat>
@@ -683,9 +708,7 @@
           <conditional name="layer_selection">
             <param name="layer_type" value="Dense"/>
             <param name="units" value="64"/>
-            <section name="layer_options">
-              <param name="activation" value="relu"/>
-            </section>
+            <param name="activation" value="relu"/>
             <param name="inbound_nodes" value="6"/>
           </conditional>
         </repeat>
@@ -693,9 +716,7 @@
           <conditional name="layer_selection">
             <param name="layer_type" value="Dense"/>
             <param name="units" value="64"/>
-            <section name="layer_options">
-              <param name="activation" value="relu"/>
-            </section>
+            <param name="activation" value="relu"/>
             <param name="inbound_nodes" value="7"/>
           </conditional>
         </repeat>
@@ -703,9 +724,7 @@
           <conditional name="layer_selection">
             <param name="layer_type" value="Dense"/>
             <param name="units" value="64"/>
-            <section name="layer_options">
-              <param name="activation" value="relu"/>
-            </section>
+            <param name="activation" value="relu"/>
             <param name="inbound_nodes" value="8"/>
           </conditional>
         </repeat>
@@ -713,9 +732,7 @@
           <conditional name="layer_selection">
             <param name="layer_type" value="Dense"/>
             <param name="units" value="1"/>
-            <section name="layer_options">
-              <param name="activation" value="sigmoid"/>
-            </section>
+            <param name="activation" value="sigmoid"/>
             <param name="inbound_nodes" value="9"/>
           </conditional>
         </repeat>