diff options
| author | Tim O'Shea <tim.oshea753@gmail.com> | 2015-04-01 11:38:58 -0700 |
|---|---|---|
| committer | Tim O'Shea <tim.oshea753@gmail.com> | 2015-04-01 11:38:58 -0700 |
| commit | d8b1d478e1caaef086b05602a45984212ef6402b (patch) | |
| tree | 1ef49bc17c3b8a34cbde2b4d9dda8be02a24105d /gr-fec/grc | |
| parent | 5c199bafbc9aaced179f19bef8aa737e087067ed (diff) | |
fec: ldpc GRC compat cleanup
Diffstat (limited to 'gr-fec/grc')
| -rw-r--r-- | gr-fec/grc/ldpc_decoder_def_list.xml | 17 | ||||
| -rwxr-xr-x | gr-fec/grc/ldpc_encoder_def_list.xml | 24 |
2 files changed, 26 insertions, 15 deletions
diff --git a/gr-fec/grc/ldpc_decoder_def_list.xml b/gr-fec/grc/ldpc_decoder_def_list.xml index 9e21f245e7..22df93909f 100644 --- a/gr-fec/grc/ldpc_decoder_def_list.xml +++ b/gr-fec/grc/ldpc_decoder_def_list.xml @@ -9,7 +9,9 @@ <key>variable_ldpc_decoder_def</key> <import>from gnuradio import fec</import> <var_make> -#if int($ndim())==1 # +#if int($ndim())==0 # +self.$(id) = $(id) = fec.ldpc_decoder.make($file, $sigma, $max_iter); #slurp +#else if int($ndim())==1 # self.$(id) = $(id) = map( (lambda a: fec.ldpc_decoder.make($file, $sigma, $max_iter)), range(0,$dim1) ); #slurp #else self.$(id) = $(id) = map( (lambda b: map( ( lambda a: fec.ldpc_decoder.make($file, $sigma, $max_iter)), range(0,$dim2) ) ), range(0,$dim1)); #slurp @@ -26,19 +28,22 @@ self.$(id) = $(id) = map( (lambda b: map( ( lambda a: fec.ldpc_decoder.make($fil </param> <param> - <name>Threading Dimensions</name> + <name>Parallelism</name> <key>ndim</key> - <value></value> + <value>0</value> <type>enum</type> <option> - <name>2</name> - <key>2</key> + <name>0</name> + <key>0</key> </option> <option> <name>1</name> <key>1</key> </option> - + <option> + <name>2</name> + <key>2</key> + </option> </param> <param> diff --git a/gr-fec/grc/ldpc_encoder_def_list.xml b/gr-fec/grc/ldpc_encoder_def_list.xml index 9ec98b6240..5975f781dd 100755 --- a/gr-fec/grc/ldpc_encoder_def_list.xml +++ b/gr-fec/grc/ldpc_encoder_def_list.xml @@ -9,11 +9,14 @@ <key>variable_ldpc_encoder_def</key> <import>from gnuradio import fec</import> <var_make> -#if int($ndim())==1 # -self.$(id) = $(id) = map( (lambda a: fec.ldpc_encoder.make($file)), range(0,$dim1) ); #slurp +#if int($ndim())==0 # +self.$(id) = $(id) = fec.ldpc_encoder_make($file); #slurp +#else if int($ndim())==1 # +self.$(id) = $(id) = map( (lambda a: fec.ldpc_encoder_make($file)), range(0,$dim1) ); #slurp #else -self.$(id) = $(id) = map( (lambda b: map( ( lambda a: fec.ldpc_encoder.make($file)), range(0,$dim2) ) ), range(0,$dim1)); #slurp +self.$(id) = $(id) = map( (lambda b: map( ( lambda a: fec.ldpc_encoder_make($file)), range(0,$dim2) ) ), range(0,$dim1)); #slurp #end if</var_make> + <var_value>fec.ldpc_encoder_make($file)</var_value> <make></make> <!-- This definition below is wierd, it seems required for the GRC to be happy, im confused --> @@ -26,25 +29,28 @@ self.$(id) = $(id) = map( (lambda b: map( ( lambda a: fec.ldpc_encoder.make($fil </param> <param> - <name>Threading Dimensions</name> + <name>Parallelism</name> <key>ndim</key> - <value></value> + <value>0</value> <type>enum</type> <option> - <name>2</name> - <key>2</key> + <name>0</name> + <key>0</key> </option> <option> <name>1</name> <key>1</key> </option> - + <option> + <name>2</name> + <key>2</key> + </option> </param> <param> <name>Dimension 1</name> <key>dim1</key> - <value>4</value> + <value>1</value> <type>int</type> <hide>#if (int($ndim()) >= 1) then 'none' else 'all' #</hide> </param> |