Commit 9a1bbdbc authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline
Browse files

Doc: add CPU-0 to lima, update Tango doc for pixel_depth_cpu_affinity_map

parent df3718f1
......@@ -1665,7 +1665,7 @@ Add LimaCCDs and SlsDetector class devices.
+----------------------------------------------------------+------------------------------------------------------+
| id10/limaccds/eiger500k->LimaCameraType | SlsDetector |
+----------------------------------------------------------+------------------------------------------------------+
| id10/limaccds/eiger500k->NbProcessingThread | 11 |
| id10/limaccds/eiger500k->NbProcessingThread | 12 |
+----------------------------------------------------------+------------------------------------------------------+
| id10/limaccds/eiger500k->BufferMaxMemory | 25 |
+----------------------------------------------------------+------------------------------------------------------+
......@@ -1678,7 +1678,7 @@ Add LimaCCDs and SlsDetector class devices.
+----------------------------------------------------------+------------------------------------------------------+
| id10/slsdetector/eiger500k->pixel_depth_cpu_affinity_map | | { 4: ((((CPU( 6), CPU( 7)), (CPU(18), CPU(19))), |
| | | ((CPU( 9), CPU(10)), (CPU(21), CPU(22)))), |
| | | CPU(*chain(range(1, 6), range(12, 18))), |
| | | CPU(*chain(range(0, 6), range(12, 18))), |
| | | CPU(0), |
| | | (('eth0,eth1,eth2,eth4,eth6,eth7,eth8,eth9', |
| | {-1: (CPU(0), CPU(0))}), |
......@@ -1703,8 +1703,8 @@ Add LimaCCDs and SlsDetector class devices.
The previous example is based on a dual 6-core CPUs backend with *Hyper-Threading Technology* (12 cores,
24 threads). The configuration is optimised to work in pipe-line mode: cores/threads in Socket #1
(6-11, 18-23) will perform network data acquisition and basic image reconstruction (4-to-8 bit conversion,
gap pixel insertion), and cores/threads in Socket #0 (1-5, 12-17) will perform Lima processing tasks.
That's why the NbProcessingThread is set to 11. Please note that there are three network groups and four
gap pixel insertion), and cores/threads in Socket #0 (0-5, 12-17) will perform Lima processing tasks.
That's why the NbProcessingThread is set to 12. Please note that there are three network groups and four
pixel_depth->cpu_affinity settings (4-, 8-, 16- and 32-bit). The special global_affinity '@X' is a reference
to pixel_depth X.
......
......@@ -22,9 +22,8 @@ tolerate_lost_packets No True Initial tolerance to lost packets
pixel_depth_cpu_affinity_map No [] Default PixelDepthCPUAffinityMap as Python string(s) defining a dict:
{<pixel_depth>: <global_affinity>}, being global_affinity a tuple:
(<recv_list>, <lima>, <other>, <netdev_grp_list>), where recv_list
is a list of tupples in the form: (<port_1>, <port_2>), where portX
is a tupple: (<listener>, <writer>, <port_threads>) where listener
and writer are affinities and port_threads a tuple of affinities,
is a list of tupples in the form: (<listeners>, <port_threads>),
where listeners and port_threads are tuples of affinities,
lima and and other are affinities, and netdev_grp_list is a list of
tuples in the form:
(<comma_separated_netdev_name_list>, <rx_queue_affinity_map>), the
......
......@@ -543,8 +543,10 @@ class SlsDetectorClass(PyTango.DeviceClass):
"Default PixelDepthCPUAffinityMap as Python string(s) defining a dict: "
"{<pixel_depth>: <global_affinity>}, being global_affinity a tuple: "
"(<recv_list>, <lima>, <other>, <netdev_grp_list>), where recv_list "
"is a list of <recv_threads> tuples of affinities, lima and other are "
"affinities, and netdev_grp_list is a list of tuples in the form: "
"is a list of tupples in the form: (<listeners>, <port_threads>), "
"where listeners and port_threads are tuples of affinities, "
"lima and and other are affinities, and netdev_grp_list is a list of "
"tuples in the form: "
"(<comma_separated_netdev_name_list>, <rx_queue_affinity_map>), the "
"latter in the form of: {<queue>: (<irq>, <processing>)}. "
"Each affinity can be expressed by one of the functions: Mask(mask) "
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment