diff options
-rw-r--r-- | gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt | 1 | ||||
-rw-r--r-- | gnuradio-runtime/python/gnuradio/gru/__init__.py | 1 | ||||
-rw-r--r-- | gnuradio-runtime/python/gnuradio/gru/mathmisc.py | 21 | ||||
-rw-r--r-- | gr-audio/examples/python/test_resampler.py | 7 | ||||
-rw-r--r-- | gr-digital/python/digital/packet_utils.py | 4 | ||||
-rw-r--r-- | gr-filter/python/filter/rational_resampler.py | 7 | ||||
-rwxr-xr-x | gr-uhd/apps/uhd_rx_nogui | 7 |
7 files changed, 13 insertions, 35 deletions
diff --git a/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt index 8e6e150bbf..d7d05ec86a 100644 --- a/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt +++ b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt @@ -12,7 +12,6 @@ GR_PYTHON_INSTALL(FILES freqz.py gnuplot_freqz.py hexint.py - mathmisc.py msgq_runner.py daemon.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/gru diff --git a/gnuradio-runtime/python/gnuradio/gru/__init__.py b/gnuradio-runtime/python/gnuradio/gru/__init__.py index a7684b3c5b..5f20c17aa1 100644 --- a/gnuradio-runtime/python/gnuradio/gru/__init__.py +++ b/gnuradio-runtime/python/gnuradio/gru/__init__.py @@ -5,5 +5,4 @@ from .daemon import * from .freqz import * from .gnuplot_freqz import * from .hexint import * -from .mathmisc import * from .msgq_runner import * diff --git a/gnuradio-runtime/python/gnuradio/gru/mathmisc.py b/gnuradio-runtime/python/gnuradio/gru/mathmisc.py deleted file mode 100644 index 86594db087..0000000000 --- a/gnuradio-runtime/python/gnuradio/gru/mathmisc.py +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright 2005 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# SPDX-License-Identifier: GPL-3.0-or-later -# -# - -import math - -def gcd(a,b): - while b: - a,b = b, a % b - return a - -def lcm(a,b): - return a * b // gcd(a, b) - -def log2(x): - return math.log(x) / math.log(2) diff --git a/gr-audio/examples/python/test_resampler.py b/gr-audio/examples/python/test_resampler.py index 72622714d4..e97836c61a 100644 --- a/gr-audio/examples/python/test_resampler.py +++ b/gr-audio/examples/python/test_resampler.py @@ -8,7 +8,8 @@ # # -from gnuradio import gr, gru +import math +from gnuradio import gr from gnuradio import audio from gnuradio import filter from gnuradio.eng_arg import eng_float, intx @@ -42,8 +43,8 @@ class my_top_block(gr.top_block): input_rate = int(args.input_rate) output_rate = int(args.output_rate) - interp = gru.lcm(input_rate, output_rate) // input_rate - decim = gru.lcm(input_rate, output_rate) // output_rate + interp = output_rate // math.gcd(input_rate, output_rate) + decim = input_rate // math.gcd(input_rate, output_rate) print("interp =", interp) print("decim =", decim) diff --git a/gr-digital/python/digital/packet_utils.py b/gr-digital/python/digital/packet_utils.py index b79994b667..84566c5d40 100644 --- a/gr-digital/python/digital/packet_utils.py +++ b/gr-digital/python/digital/packet_utils.py @@ -8,11 +8,11 @@ # +import math import struct import numpy -from gnuradio import gru from . import crc @@ -166,7 +166,7 @@ def _npadding_bytes(pkt_byte_len, samples_per_symbol, bits_per_symbol): number of bytes of padding to append. """ modulus = 128 - byte_modulus = gru.lcm(modulus // 8, samples_per_symbol) * bits_per_symbol // samples_per_symbol + byte_modulus = (modulus // 8) // math.gcd(modulus // 8, samples_per_symbol) * bits_per_symbol r = pkt_byte_len % byte_modulus if r == 0: return 0 diff --git a/gr-filter/python/filter/rational_resampler.py b/gr-filter/python/filter/rational_resampler.py index d12db52047..1af9698e2b 100644 --- a/gr-filter/python/filter/rational_resampler.py +++ b/gr-filter/python/filter/rational_resampler.py @@ -8,7 +8,8 @@ # -from gnuradio import gr, gru +import math +from gnuradio import gr from . import filter_python as filter _plot = None @@ -80,7 +81,7 @@ class _rational_resampler_base(gr.hier_block2): if taps is None and fractional_bw is None: fractional_bw = 0.4 - d = gru.gcd(interpolation, decimation) + d = math.gcd(interpolation, decimation) # If we have user-provided taps and the interp and decim # values have a common divisor, we don't reduce these values @@ -142,5 +143,3 @@ class rational_resampler_fcc(_rational_resampler_base): """ _rational_resampler_base.__init__(self, filter.rational_resampler_base_fcc, interpolation, decimation, taps, fractional_bw) - - diff --git a/gr-uhd/apps/uhd_rx_nogui b/gr-uhd/apps/uhd_rx_nogui index 3fd9297c55..f477898fb7 100755 --- a/gr-uhd/apps/uhd_rx_nogui +++ b/gr-uhd/apps/uhd_rx_nogui @@ -48,6 +48,7 @@ Please see fm_demod.py and am_demod.py for details of the demodulation blocks. """ +import math import sys from argparse import ArgumentParser from gnuradio import gr, gru, uhd, audio @@ -174,9 +175,9 @@ class app_top_block(gr.top_block): tail = ctcss if options.output_rate != audio_rate: - out_lcm = gru.lcm(audio_rate, options.output_rate) - out_interp = out_lcm // audio_rate - out_decim = out_lcm // options.output_rate + out_gcd = math.gcd(audio_rate, options.output_rate) + out_interp = options.output_rate // out_gcd + out_decim = audio_rate // out_gcd rsamp = filter.rational_resampler_fff(out_interp, out_decim) self.connect(tail, rsamp) tail = rsamp |