global: various cleanup

Signed-off-by: Josh Morman <[email protected]>
gnuradio · Jul 18, 2022 · 613e50d · 613e50d
1 parent 5d32b14
commit 613e50d
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 88 deletions.
diff --git a/gr/include/gnuradio/domain.h b/gr/include/gnuradio/domain.h
diff --git a/gr/include/gnuradio/graph_utils.h b/gr/include/gnuradio/graph_utils.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <gnuradio/domain.h>
 #include <gnuradio/graph.h>
 #include <gnuradio/scheduler.h>
 

diff --git a/gr/include/gnuradio/meson.build b/gr/include/gnuradio/meson.build
@@ -8,9 +8,8 @@ runtime_headers = [
     'block_group_properties.h',
     'clonable_block.h',
     'concurrent_queue.h',
-    # 'buffer_cuda.h',
-    # 'buffer_cuda_pinned.h',
-    'domain.h',
+    'buffer_cuda.h',
+    'buffer_cuda_pinned.h',
     'edge.h',
     'flat_graph.h',
     'flowgraph.h',
@@ -32,7 +31,7 @@ runtime_headers = [
     'tag.h',
     'thread.h',
     'types.h',
-    # 'buffer_cpu_vmcirc.h',
+    'buffer_cpu_vmcirc.h',
     'helper_cuda.h',
     'helper_string.h',
     'python_block.h',

diff --git a/gr/lib/buffer_cuda_sm.cc b/gr/lib/buffer_cuda_sm.cc
@@ -71,9 +71,6 @@ void buffer_cuda_sm::post_write(int num_items)
     size_t wi1 = _write_index;
 
     // num_items were written to the buffer
-    // copy the data to the second half of the buffer
-
-    size_t num_bytes_1 = std::min(_buf_size - wi1, bytes_written);
 
     if (_type == buffer_cuda_sm_type::H2D) {
         cudaMemcpyAsync(&_device_buffer[wi1],

diff --git a/gr/lib/graph_utils.cc b/gr/lib/graph_utils.cc
@@ -1,7 +1,6 @@
 #include <gnuradio/graph_utils.h>
 
 #include <gnuradio/block.h>
-#include <gnuradio/domain.h>
 
 namespace gr {
 

diff --git a/gr/python/gr/bindings/domain_pybind.cc b/gr/python/gr/bindings/domain_pybind.cc
diff --git a/gr/python/gr/bindings/gr_pybind.cc b/gr/python/gr/bindings/gr_pybind.cc
@@ -33,11 +33,10 @@ void bind_hier_block(py::module&);
 void bind_flowgraph(py::module&);
 void bind_scheduler(py::module&);
 void bind_buffer(py::module&);
-// void bind_vmcircbuf(py::module&);
-void bind_domain(py::module&);
+void bind_vmcircbuf(py::module&);
 void bind_constants(py::module&);
 void bind_python_block(py::module&);
-// void bind_buffer_net_zmq(py::module& m);
+void bind_buffer_net_zmq(py::module& m);
 void bind_runtime(py::module&);
 void bind_runtime_proxy(py::module&);
 void bind_graph_utils(py::module&);
@@ -75,14 +74,13 @@ PYBIND11_MODULE(gr_python, m)
     bind_block(m);
     bind_sync_block(m);
     bind_edge(m);
-    bind_domain(m);
     bind_graph(m);
     bind_hier_block(m);
     bind_flowgraph(m);
     bind_scheduler(m);
     bind_buffer(m);
-    // bind_buffer_net_zmq(m);
-    // bind_vmcircbuf(m);
+    bind_buffer_net_zmq(m);
+    bind_vmcircbuf(m);
     bind_constants(m);
     bind_python_block(m);
     bind_runtime(m);

diff --git a/gr/python/gr/bindings/meson.build b/gr/python/gr/bindings/meson.build
@@ -12,9 +12,8 @@ runtime_pybind_sources = files([
     'gr_pybind.cc',
     'scheduler_pybind.cc',
     'buffer_pybind.cc',
-    'domain_pybind.cc',
-    # 'buffer_cpu_vmcirc_pybind.cc',
-    # 'buffer_net_zmq_pybind.cc',
+    'buffer_cpu_vmcirc_pybind.cc',
+    'buffer_net_zmq_pybind.cc',
     'constants_pybind.cc',
     'python_block_pybind.cc',
     'pyblock_detail_pybind.cc',

diff --git a/schedulers/nbt/include/gnuradio/schedulers/nbt/scheduler_nbt.h b/schedulers/nbt/include/gnuradio/schedulers/nbt/scheduler_nbt.h
@@ -1,7 +1,6 @@
 #include <gnuradio/block_group_properties.h>
-// #include <gnuradio/buffer_cpu_vmcirc.h>
-#include <gnuradio/buffer_cpu_simple.h>
-#include <gnuradio/domain.h>
+#include <gnuradio/buffer_cpu_vmcirc.h>
+// #include <gnuradio/buffer_cpu_simple.h>
 #include <gnuradio/graph_utils.h>
 #include <gnuradio/scheduler.h>
 
@@ -27,8 +26,8 @@ class scheduler_nbt : public scheduler
                   const unsigned int fixed_buf_size = 32768)
         : scheduler(name), s_fixed_buf_size(fixed_buf_size)
     {
-        _default_buf_properties = buffer_cpu_simple_properties::make();
-        // buffer_cpu_vmcirc_properties::make(buffer_cpu_vmcirc_type::AUTO);
+        _default_buf_properties =
+            buffer_cpu_vmcirc_properties::make(buffer_cpu_vmcirc_type::AUTO);
     }
     ~scheduler_nbt() override{};