fpga: Remove Python2 support from build system
- 2to3 was used to convert the Python scripts, except where the tool choked and manual intervention was required - All references to "python" where replaced with "python3" - buffer() was replaced by memoryview() Original-commit: ca68195b5d12c5410cfac8d459a0b0902c4c72c7
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
Dependencies:
|
||||
- python2
|
||||
- graphviz
|
||||
- python-graphviz
|
||||
- python-numpy
|
||||
- python-matplotlib
|
||||
- python3
|
||||
- python3-graphviz
|
||||
- python3-numpy
|
||||
- python3-matplotlib
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# Copyright 2016 Ettus Research
|
||||
#
|
||||
@@ -16,8 +16,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
import rfnocsim
|
||||
import math
|
||||
import rfnocsim
|
||||
import ni_hw_models as hw
|
||||
|
||||
class ColGlobals():
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# Copyright 2016 Ettus Research
|
||||
#
|
||||
@@ -16,8 +16,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
import rfnocsim
|
||||
import math
|
||||
import rfnocsim
|
||||
|
||||
class UsrpX310(rfnocsim.SimComp):
|
||||
# Hardware specific constants
|
||||
|
||||
@@ -623,7 +623,7 @@ class Visualizer():
|
||||
for c in sorted(comps):
|
||||
comp = self.__sim_core.lookup(c)
|
||||
for s in sorted(comp.get_items()):
|
||||
print(' - %s: (%s) Latency = %gs'%(s,c,comp.get_latency(s)))
|
||||
print((' - %s: (%s) Latency = %gs' % (s, c, comp.get_latency(s))))
|
||||
print('=================================================================')
|
||||
|
||||
def dump_debug_audit_log(self, ctype, name_filt='.*'):
|
||||
@@ -645,7 +645,7 @@ class Visualizer():
|
||||
status = 'WARNING (Used but Undriven)'
|
||||
else:
|
||||
status = 'Unused'
|
||||
print(' - %s: Status = %s'%(c,status))
|
||||
print((' - %s: Status = %s'%(c,status)))
|
||||
print('=================================================================')
|
||||
|
||||
def new_figure(self, grid_dims=[1,1], fignum=1, figsize=(16, 9), dpi=72):
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# Copyright 2016 Ettus Research
|
||||
#
|
||||
@@ -16,11 +16,11 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
import argparse
|
||||
import re
|
||||
import rfnocsim
|
||||
import ni_hw_models as hw
|
||||
import colosseum_models
|
||||
import argparse
|
||||
import re
|
||||
|
||||
def main():
|
||||
# Arguments
|
||||
@@ -101,39 +101,39 @@ def main():
|
||||
for u in sim_core.list_components('', '.*/' + ln):
|
||||
c = sim_core.lookup(u)
|
||||
m = re.match('(.+)/(SER_.*)', u)
|
||||
if (c.get_utilization('bandwidth') != master_stats[ln]):
|
||||
if c.get_utilization('bandwidth') != master_stats[ln]:
|
||||
print('[WARN] Data flowing over ' + ln + ' is probably different between ' + master_fpga + ' and ' + m.group(1))
|
||||
|
||||
# Visualize various metrics
|
||||
vis = rfnocsim.Visualizer(sim_core)
|
||||
vis.show_network()
|
||||
vis.new_figure([1,2])
|
||||
vis.new_figure([1, 2])
|
||||
vis.plot_utilization(rfnocsim.comptype.hardware, 'BEE7.*', 1)
|
||||
vis.plot_utilization(rfnocsim.comptype.producer, 'USRP.*', 2)
|
||||
vis.show_figure()
|
||||
vis.new_figure([1,2])
|
||||
vis.new_figure([1, 2])
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_000.*FPGA_NW.*EXT.*', 1)
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_006.*FPGA_SE.*EXT.*', 2)
|
||||
vis.show_figure()
|
||||
vis.new_figure([1,3])
|
||||
vis.new_figure([1, 3])
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_010.*FPGA_NW.*SER_EW_.*', 1)
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_010.*FPGA_NW.*SER_NS_.*', 2)
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_010.*FPGA_NW.*SER_XX_.*', 3)
|
||||
vis.show_figure()
|
||||
vis.new_figure([1,4])
|
||||
vis.new_figure([1, 4])
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_000.*FPGA_NW.*EXT.*', 1)
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_001.*FPGA_NW.*EXT.*', 2)
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_002.*FPGA_NW.*EXT.*', 3)
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_003.*FPGA_NW.*EXT.*', 4)
|
||||
vis.show_figure()
|
||||
vis.new_figure([1,4])
|
||||
vis.new_figure([1, 4])
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_010.*FPGA_NW.*EXT.*', 1)
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_010.*FPGA_NE.*EXT.*', 2)
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_010.*FPGA_SW.*EXT.*', 3)
|
||||
vis.plot_utilization(rfnocsim.comptype.channel, 'BEE7_010.*FPGA_SE.*EXT.*', 4)
|
||||
vis.show_figure()
|
||||
vis.new_figure([1,2])
|
||||
vis.plot_consumption_latency('.*','.*USRP_.*', 1)
|
||||
vis.new_figure([1, 2])
|
||||
vis.plot_consumption_latency('.*', '.*USRP_.*', 1)
|
||||
vis.plot_path_latency('tx[(0)]', '.*', 2)
|
||||
vis.show_figure()
|
||||
vis.plot_utilization(rfnocsim.comptype.producer, '.*MGMT_HOST.*')
|
||||
|
||||
Reference in New Issue
Block a user