diff options
author | Josh Morman <mormjb@gmail.com> | 2020-04-23 07:04:15 -0400 |
---|---|---|
committer | Josh Morman <mormjb@gmail.com> | 2020-06-04 10:05:47 -0400 |
commit | 9f6086161f8693b0643215f7a3935ec13661c882 (patch) | |
tree | 288c7c47665dce6f85167b4aca9e8fba83162f96 /gr-trellis | |
parent | grc: fixes crash when using function probe with bokehgui (diff) | |
download | gnuradio-9f6086161f8693b0643215f7a3935ec13661c882.tar.xz gnuradio-9f6086161f8693b0643215f7a3935ec13661c882.zip |
pybind: removal of swig components
Diffstat (limited to 'gr-trellis')
-rw-r--r-- | gr-trellis/CMakeLists.txt | 1 | ||||
-rw-r--r-- | gr-trellis/swig/CMakeLists.txt | 68 | ||||
-rw-r--r-- | gr-trellis/swig/trellis_swig.py.in | 15 | ||||
-rw-r--r-- | gr-trellis/swig/trellis_swig0.i | 55 | ||||
-rw-r--r-- | gr-trellis/swig/trellis_swig1.i | 50 | ||||
-rw-r--r-- | gr-trellis/swig/trellis_swig2.i | 42 | ||||
-rw-r--r-- | gr-trellis/swig/trellis_swig3.i | 47 |
7 files changed, 0 insertions, 278 deletions
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt index 1d5bde4f5..e192549f8 100644 --- a/gr-trellis/CMakeLists.txt +++ b/gr-trellis/CMakeLists.txt @@ -36,7 +36,6 @@ add_subdirectory(include/gnuradio/trellis) add_subdirectory(lib) add_subdirectory(docs) if(ENABLE_PYTHON) - add_subdirectory(swig) add_subdirectory(python/trellis) add_subdirectory(examples/python) add_subdirectory(examples/grc) diff --git a/gr-trellis/swig/CMakeLists.txt b/gr-trellis/swig/CMakeLists.txt deleted file mode 100644 index 71adb7d0d..000000000 --- a/gr-trellis/swig/CMakeLists.txt +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2012,2016,2019,2020 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# SPDX-License-Identifier: GPL-3.0-or-later -# - -######################################################################## -# Setup swig generation -######################################################################## -include(GrPython) -include(GrSwig) - -set(GR_SWIG_INCLUDE_DIRS $<TARGET_PROPERTY:runtime_swig,INCLUDE_DIRECTORIES>) -set(GR_SWIG_TARGET_DEPS runtime_swig) - -set(GR_SWIG_LIBRARIES gnuradio-trellis gnuradio-digital) - -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/trellis_swig.py.in - ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig.py -@ONLY) - -# We split up the swig files into multiple sections to minimize the -# memory overhead. If a .i file grows too large, create a new file -# named 'trellis_swigN.i' and add it to this list. -# -# Also add the line "from swig_trellisN import *" line to -# trellis_swig.py.in. -set(GR_SWIG_TRELLIS_IFILES - trellis_swig0 - trellis_swig1 - trellis_swig2 - trellis_swig3 -) - -foreach(swigfile ${GR_SWIG_TRELLIS_IFILES}) - set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i) - set(GR_SWIG_DOC_DIRS - ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/trellis - ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/trellis - ) - set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) - set(GR_SWIG_LIBRARIES gnuradio-trellis gnuradio-digital) - GR_SWIG_MAKE(${swigfile} ${swigfile}.i) - - GR_SWIG_INSTALL( - TARGETS ${swigfile} - DESTINATION ${GR_PYTHON_DIR}/gnuradio/trellis - ) - - list(APPEND SWIGFILES ${swigfile}.i) - list(APPEND SWIGDOCFILES ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i) -endforeach(swigfile) - -install( - FILES - ${SWIGFILES} - ${SWIGDOCFILES} - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig -) - -# Install the Python file that pulls in the swig built files. -GR_PYTHON_INSTALL( - FILES ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig.py - DESTINATION ${GR_PYTHON_DIR}/gnuradio/trellis - COMPONENT "trellis_python" -) diff --git a/gr-trellis/swig/trellis_swig.py.in b/gr-trellis/swig/trellis_swig.py.in deleted file mode 100644 index bc633c01b..000000000 --- a/gr-trellis/swig/trellis_swig.py.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright 2016,2020 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# SPDX-License-Identifier: GPL-3.0-or-later -# -# - -from __future__ import absolute_import - -from .trellis_swig0 import * -from .trellis_swig1 import * -from .trellis_swig2 import * -from .trellis_swig3 import * diff --git a/gr-trellis/swig/trellis_swig0.i b/gr-trellis/swig/trellis_swig0.i deleted file mode 100644 index 0d69784b7..000000000 --- a/gr-trellis/swig/trellis_swig0.i +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2012,2016,2020 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#define TRELLIS_API -#define DIGITAL_API - -%include "gnuradio.i" - -//load generated python docstrings -%include "trellis_swig0_doc.i" - -%include "gnuradio/digital/metric_type.h" -%include "gnuradio/digital/constellation.h" -%include "gnuradio/trellis/siso_type.h" -%include "gnuradio/trellis/fsm.h" -%include "gnuradio/trellis/interleaver.h" - -%{ -#include "gnuradio/trellis/constellation_metrics_cf.h" -#include "gnuradio/trellis/permutation.h" -#include "gnuradio/trellis/siso_combined_f.h" -#include "gnuradio/trellis/siso_f.h" -#include "gnuradio/trellis/encoder.h" -#include "gnuradio/trellis/sccc_encoder.h" -%} - -%include "gnuradio/trellis/constellation_metrics_cf.h" -%include "gnuradio/trellis/permutation.h" -%include "gnuradio/trellis/siso_combined_f.h" -%include "gnuradio/trellis/siso_f.h" -%include "gnuradio/trellis/encoder.h" -%include "gnuradio/trellis/sccc_encoder.h" - -GR_SWIG_BLOCK_MAGIC2(trellis, constellation_metrics_cf); -GR_SWIG_BLOCK_MAGIC2(trellis, permutation); -GR_SWIG_BLOCK_MAGIC2(trellis, siso_combined_f); -GR_SWIG_BLOCK_MAGIC2(trellis, siso_f); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, encoder_bb, encoder<std::uint8_t,std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, encoder_bs, encoder<std::uint8_t,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, encoder_bi, encoder<std::uint8_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, encoder_ss, encoder<std::int16_t,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, encoder_si, encoder<std::int16_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, encoder_ii, encoder<std::int32_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_encoder_bb, sccc_encoder<std::uint8_t,std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_encoder_bs, sccc_encoder<std::uint8_t,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_encoder_bi, sccc_encoder<std::uint8_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_encoder_ss, sccc_encoder<std::int16_t,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_encoder_si, sccc_encoder<std::int16_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_encoder_ii, sccc_encoder<std::int32_t,std::int32_t>); diff --git a/gr-trellis/swig/trellis_swig1.i b/gr-trellis/swig/trellis_swig1.i deleted file mode 100644 index 8aa5c8ea5..000000000 --- a/gr-trellis/swig/trellis_swig1.i +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2016,2020 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#define TRELLIS_API -#define DIGITAL_API - -%include "gnuradio.i" - -//load generated python docstrings -%include "trellis_swig1_doc.i" - -%include "gnuradio/digital/metric_type.h" -%include "gnuradio/trellis/siso_type.h" -%include "gnuradio/trellis/fsm.h" -%include "gnuradio/trellis/interleaver.h" - -%{ -#include "gnuradio/trellis/pccc_decoder_blk.h" -#include "gnuradio/trellis/viterbi.h" -#include "gnuradio/trellis/viterbi_combined.h" -%} - -%include "gnuradio/trellis/pccc_decoder_blk.h" -%include "gnuradio/trellis/viterbi.h" -%include "gnuradio/trellis/viterbi_combined.h" - -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_decoder_b, pccc_decoder_blk<std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_decoder_s, pccc_decoder_blk<std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_decoder_i, pccc_decoder_blk<std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_b, viterbi<std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_s, viterbi<std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_i, viterbi<std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_sb, viterbi_combined<std::int16_t,std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_ss, viterbi_combined<std::int16_t,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_si, viterbi_combined<std::int16_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_ib, viterbi_combined<std::int32_t,std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_is, viterbi_combined<std::int32_t,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_ii, viterbi_combined<std::int32_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_fb, viterbi_combined<float,std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_fs, viterbi_combined<float,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_fi, viterbi_combined<float,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_cb, viterbi_combined<gr_complex,std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_cs, viterbi_combined<gr_complex,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, viterbi_combined_ci, viterbi_combined<gr_complex,std::int32_t>); diff --git a/gr-trellis/swig/trellis_swig2.i b/gr-trellis/swig/trellis_swig2.i deleted file mode 100644 index f675eef3f..000000000 --- a/gr-trellis/swig/trellis_swig2.i +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012,2016,2020 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#define TRELLIS_API -#define DIGITAL_API - -%include "gnuradio.i" - -//load generated python docstrings -%include "trellis_swig2_doc.i" - -%include "gnuradio/digital/metric_type.h" -%include "gnuradio/trellis/siso_type.h" -%include "gnuradio/trellis/fsm.h" -%include "gnuradio/trellis/interleaver.h" - -%{ -#include "gnuradio/trellis/pccc_encoder.h" -#include "gnuradio/trellis/metrics.h" -#include "gnuradio/trellis/siso_f.h" -%} - -%include "gnuradio/trellis/pccc_encoder.h" -%include "gnuradio/trellis/metrics.h" -%include "gnuradio/trellis/siso_f.h" - -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_encoder_bb, pccc_encoder<std::uint8_t,std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_encoder_bs, pccc_encoder<std::uint8_t,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_encoder_bi, pccc_encoder<std::uint8_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_encoder_ss, pccc_encoder<std::int16_t,std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_encoder_si, pccc_encoder<std::int16_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_encoder_ii, pccc_encoder<std::int32_t,std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, metrics_s, metrics<std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, metrics_i, metrics<std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, metrics_f, metrics<float>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, metrics_c, metrics<gr_complex>); diff --git a/gr-trellis/swig/trellis_swig3.i b/gr-trellis/swig/trellis_swig3.i deleted file mode 100644 index 9184788cd..000000000 --- a/gr-trellis/swig/trellis_swig3.i +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2016,2020 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#define TRELLIS_API -#define DIGITAL_API - -%include "gnuradio.i" - -//load generated python docstrings -%include "trellis_swig3_doc.i" - -%include "gnuradio/digital/metric_type.h" -%include "gnuradio/trellis/siso_type.h" -%include "gnuradio/trellis/fsm.h" -%include "gnuradio/trellis/interleaver.h" - -%{ -#include "gnuradio/trellis/sccc_decoder_blk.h" -#include "gnuradio/trellis/sccc_decoder_combined_blk.h" -#include "gnuradio/trellis/pccc_decoder_combined_blk.h" -%} - -%include "gnuradio/trellis/sccc_decoder_blk.h" -%include "gnuradio/trellis/sccc_decoder_combined_blk.h" -%include "gnuradio/trellis/pccc_decoder_combined_blk.h" - -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_decoder_b, sccc_decoder_blk<std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_decoder_s, sccc_decoder_blk<std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_decoder_i, sccc_decoder_blk<std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_decoder_combined_fb, sccc_decoder_combined_blk<float, std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_decoder_combined_fs, sccc_decoder_combined_blk<float, std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_decoder_combined_fi, sccc_decoder_combined_blk<float, std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_decoder_combined_cb, sccc_decoder_combined_blk<gr_complex, std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_decoder_combined_cs, sccc_decoder_combined_blk<gr_complex, std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, sccc_decoder_combined_ci, sccc_decoder_combined_blk<gr_complex, std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_decoder_combined_fb, pccc_decoder_combined_blk<float, std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_decoder_combined_fs, pccc_decoder_combined_blk<float, std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_decoder_combined_fi, pccc_decoder_combined_blk<float, std::int32_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_decoder_combined_cb, pccc_decoder_combined_blk<gr_complex, std::uint8_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_decoder_combined_cs, pccc_decoder_combined_blk<gr_complex, std::int16_t>); -GR_SWIG_BLOCK_MAGIC2_TMPL(trellis, pccc_decoder_combined_ci, pccc_decoder_combined_blk<gr_complex, std::int32_t>); |