[software] Import functions from data generation modules

pulp-platform · Sep 24, 2024 · f10c95f · f10c95f
1 parent a596488
commit f10c95f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/software/data/generate_cfft.py b/software/data/generate_cfft.py
@@ -11,6 +11,11 @@
 import math as M
 from sympy.combinatorics import Permutation
 
+__all__ = [
+    'generate_cfft_q16',
+    'generate_twiddleCoefq15',
+    'generate_bitreversal']
+
 
 def generate_cfft_q16(N):
     # Q16:

diff --git a/software/data/generate_chest.py b/software/data/generate_chest.py
@@ -10,6 +10,9 @@
 import numpy as np
 
 
+__all__ = ['generate_chest_q16']
+
+
 def q_sat(x):
     if x > 2**15 - 1:
         return x - 2**16

diff --git a/software/data/print_header.py b/software/data/print_header.py
@@ -10,9 +10,8 @@
 import argparse
 import os
 import math
-from generate_cfft import *
-from generate_chest import *
-import numpy as np
+import generate_cfft as cfft
+import generate_chest as chest
 
 
 def extract_data_args(filename):
@@ -97,12 +96,12 @@ def print_file(string, filename):
 
         if app_name == "cfft_radix4_q16":
             # cfft_radix4_q16
-            src_cfft_q16, dst_cfft_q16, tolerance_q16 = generate_cfft_q16(
+            src_cfft_q16, dst_cfft_q16, tolerance_q16 = cfft.generate_cfft_q16(
                 data_args.LEN)
-            brv_cfft_q16 = generate_bitreversal(data_args.LEN, 2)
-            twi_cfft_q16 = generate_twiddleCoefq15(data_args.LEN)
+            brv_cfft_q16 = cfft.generate_bitreversal(data_args.LEN, 2)
+            twi_cfft_q16 = cfft.generate_twiddleCoefq15(data_args.LEN)
             string += "#define LOG2 ({})\n".format(
-                np.int(math.log2(data_args.LEN)))
+                int(math.log2(data_args.LEN)))
             string += "#define N_CSAMPLES ({})\n".format(data_args.LEN)
             string += "#define N_TWIDDLES ({})\n".format(3 *
                                                          data_args.LEN // 4)
@@ -121,12 +120,12 @@ def print_file(string, filename):
 
         elif app_name == "cfft_radix2_q16":
             # cfft_radix2_q16
-            src_cfft_q16, dst_cfft_q16, tolerance_q16 = generate_cfft_q16(
+            src_cfft_q16, dst_cfft_q16, tolerance_q16 = cfft.generate_cfft_q16(
                 data_args.LEN)
-            brv_cfft_q16 = generate_bitreversal(data_args.LEN, 2)
-            twi_cfft_q16 = generate_twiddleCoefq15(data_args.LEN)
+            brv_cfft_q16 = cfft.generate_bitreversal(data_args.LEN, 2)
+            twi_cfft_q16 = cfft.generate_twiddleCoefq15(data_args.LEN)
             string += "#define LOG2 ({})\n".format(
-                np.int(math.log2(data_args.LEN)))
+                int(math.log2(data_args.LEN)))
             string += "#define N_CSAMPLES ({})\n".format(data_args.LEN)
             string += "#define N_TWIDDLES ({})\n".format(3 *
                                                          data_args.LEN // 4)
@@ -143,8 +142,9 @@ def print_file(string, filename):
             filename = app_path + "/data_cfft_radix2_q16.h"
 
         elif app_name == "chest_q16":
-            src1_chest_q16, src2_chest_q16, dst_chest_q16 = generate_chest_q16(
-                data_args.N_TX, data_args.N_RX, data_args.N_SAMPLES)
+            src1_chest_q16, src2_chest_q16, dst_chest_q16 = \
+                chest.generate_chest_q16(data_args.N_TX, data_args.N_RX,
+                                         data_args.N_SAMPLES)
             string += "#define N_TX ({})\n".format(data_args.N_TX)
             string += "#define N_RX ({})\n".format(data_args.N_RX)
             string += "#define N_SAMPLES ({})\n".format(data_args.N_SAMPLES)