More fixes for the non-blob weight export

Author: jmvalin

dnn/torch/lossgen/export_lossgen.py

@@ -52,7 +52,7 @@ def c_export(args, model):
 
     message = f"Auto generated from checkpoint {os.path.basename(args.checkpoint)}"
 
-    writer = CWriter(os.path.join(args.output_dir, "lossgen_data"), message=message, model_struct_name='LossGen', enable_binary_blob=False)
+    writer = CWriter(os.path.join(args.output_dir, "lossgen_data"), message=message, model_struct_name='LossGen', enable_binary_blob=False, add_typedef=True)
     writer.header.write(
 f"""
 #include "opus_types.h"

dnn/torch/weight-exchange/wexchange/c_export/common.py

@@ -64,8 +64,7 @@ def print_vector(writer, vector, name, dtype='float', reshape_8x4=False, static=
 
     if debug_float:
         f.write('#ifndef DISABLE_DEBUG_FLOAT\n')
-    if binary_blob:
-        f.write(
+    f.write(
 f'''
 #define WEIGHTS_{name}_DEFINED
 #define WEIGHTS_{name}_TYPE WEIGHT_TYPE_{dtype_suffix[dtype]}
@@ -384,4 +383,4 @@ def print_tconv1d_layer(writer : CWriter,
     writer.header.write(f"\n#define {name.upper()}_KERNEL_SIZE {kernel_size}\n")
     writer.header.write(f"\n#define {name.upper()}_STRIDE {stride}\n")
     writer.header.write(f"\n#define {name.upper()}_IN_CHANNELS {in_channels}\n")
-    writer.header.write(f"\n#define {name.upper()}_OUT_CHANNELS {out_channels}\n")
+    writer.header.write(f"\n#define {name.upper()}_OUT_CHANNELS {out_channels}\n")