Commit d5e6a933 authored by Jason Wu's avatar Jason Wu
Browse files

Merge branch 'master' into 'production'

Master

See merge request !51
parents 22025c6b 6dbe8a8e
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
] ]
}, },
{ {
"id": "pulsar_timing1", "id": "timing1",
"dada_header_params": "dada_header_params":
{ {
"bandwidth": 400, "bandwidth": 400,
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
] ]
}, },
{ {
"id": "pulsar_searching1", "id": "search1",
"mode": "Searching", "mode": "Searching",
"filterbank_nchannels": 512, "filterbank_nchannels": 512,
"decimation": 1, "decimation": 1,
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
] ]
}, },
{ {
"id": "pulsar_baseband1", "id": "baseband1",
"mode": "Baseband", "mode": "Baseband",
"active":0, "active":0,
"dada_header_params":{"bandwidth": 400,"frequency_mhz": 1400,"tsamp": 0.00125,"idx1_modulo": 195312.5,"slots_skip":0,"dada_nslots":2}, "dada_header_params":{"bandwidth": 400,"frequency_mhz": 1400,"tsamp": 0.00125,"idx1_modulo": 195312.5,"slots_skip":0,"dada_nslots":2},
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
edd_group: 50000 edd_group: 50000
roles: roles:
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_timing1 container_name: timing1
container_env: "EDD_ALLOWED_NUMA_NODES=1" container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9700 edd_group: 9700
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/timing/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: gated_full_stokes_spectrometer - role: gated_full_stokes_spectrometer
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9702 edd_group: 9702
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
container_name: dig_pack_controller container_name: dig_pack_controller
device: packetizer-pfk-01 device: packetizer-pfk-01
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_baseband1 container_name: baseband1
container_env: "EDD_ALLOWED_NUMA_NODES=1" container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9703 edd_group: 9703
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/baseband/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_searching1 container_name: search1
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9701 edd_group: 9701
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/search/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: fits_interface - role: fits_interface
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
] ]
}, },
{ {
"id": "pulsar_timing1", "id": "timing1",
"dada_header_params": { "dada_header_params": {
"bandwidth": 400, "bandwidth": 400,
"frequency_mhz": 1400, "frequency_mhz": 1400,
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
] ]
}, },
{ {
"id": "pulsar_timing2", "id": "timing2",
"nchannels": 64000, "nchannels": 64000,
"nbins": 128, "nbins": 128,
"fft_length": 1024, "fft_length": 1024,
...@@ -149,4 +149,4 @@ ...@@ -149,4 +149,4 @@
] ]
} }
] ]
} }
\ No newline at end of file
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9702 edd_group: 9702
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_timing1 container_name: timing1
container_env: "EDD_ALLOWED_NUMA_NODES=1" container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9700 edd_group: 9700
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/timing/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- hosts: gpu_server[0] - hosts: gpu_server[0]
vars: vars:
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
container_name: dig_pack_controller container_name: dig_pack_controller
device: packetizer-pfk-01 device: packetizer-pfk-01
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_timing2 container_name: timing2
container_env: "EDD_ALLOWED_NUMA_NODES=1" container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9700 edd_group: 9700
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/timing/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: fits_interface - role: fits_interface
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
} }
}, },
{ {
"id": "pulsar_timing1", "id": "timing1",
"merge_threads": 1, "merge_threads": 1,
"dada_header_params": { "dada_header_params": {
"bandwidth": 400, "bandwidth": 400,
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
] ]
}, },
{ {
"id": "pulsar_timing2", "id": "timing2",
"merge_threads": 1, "merge_threads": 1,
"nchannels": 64000, "nchannels": 64000,
"nbins": 128, "nbins": 128,
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
] ]
}, },
{ {
"id": "pulsar_baseband_leap", "id": "leap",
"mode": "Leap_baseband", "mode": "Leap_baseband",
"npart": 8, "npart": 8,
"input_data_streams": [ "input_data_streams": [
...@@ -287,4 +287,4 @@ ...@@ -287,4 +287,4 @@
} }
} }
] ]
} }
\ No newline at end of file
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
edd_group: 50000 edd_group: 50000
roles: roles:
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_timing1 container_name: timing1
container_env: "EDD_ALLOWED_NUMA_NODES=1" container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9700 edd_group: 9700
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/timing/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: gated_full_stokes_spectrometer - role: gated_full_stokes_spectrometer
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9702 edd_group: 9702
...@@ -30,15 +30,15 @@ ...@@ -30,15 +30,15 @@
container_name: dig_pack_controller_1 container_name: dig_pack_controller_1
device: packetizer-pfk-01 device: packetizer-pfk-01
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_baseband_leap container_name: leap
container_env: "EDD_ALLOWED_NUMA_NODES=1" container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9703 edd_group: 9703
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/leap/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_timing2 container_name: timing2
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9700 edd_group: 9700
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/timing/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: fits_interface - role: fits_interface
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
] ]
}, },
{ {
"id": "pulsar_timing1", "id": "timing1",
"dada_header_params": "dada_header_params":
{ {
"bandwidth":400, "bandwidth":400,
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
] ]
}, },
{ {
"id": "pulsar_searching1", "id": "search1",
"mode": "Searching", "mode": "Searching",
"filterbank_nchannels": 512, "filterbank_nchannels": 512,
"active":0, "active":0,
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
] ]
}, },
{ {
"id": "pulsar_baseband1", "id": "baseband1",
"mode": "Baseband", "mode": "Baseband",
"active":0, "active":0,
"dada_header_params":{"bandwidth": 400,"frequency_mhz": 1430,"tsamp": 0.00125,"idx1_modulo": 195312.5,"slots_skip":0,"dada_nslots":2}, "dada_header_params":{"bandwidth": 400,"frequency_mhz": 1430,"tsamp": 0.00125,"idx1_modulo": 195312.5,"slots_skip":0,"dada_nslots":2},
...@@ -169,4 +169,4 @@ ...@@ -169,4 +169,4 @@
] ]
} }
] ]
} }
\ No newline at end of file
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
edd_group: 50000 edd_group: 50000
roles: roles:
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_timing1 container_name: timing1
container_env: "EDD_ALLOWED_NUMA_NODES=1" container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9700 edd_group: 9700
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/timing/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: gated_full_stokes_spectrometer - role: gated_full_stokes_spectrometer
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9702 edd_group: 9702
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
container_name: dig_pack_controller container_name: dig_pack_controller
device: packetizer-fr-01 device: packetizer-fr-01
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_baseband1 container_name: baseband1
container_env: "EDD_ALLOWED_NUMA_NODES=1" container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9703 edd_group: 9703
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/baseband/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_searching1 container_name: search1
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9701 edd_group: 9701
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/search/" data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/"
- role: fits_interface - role: fits_interface
container_env: "EDD_ALLOWED_NUMA_NODES=0" container_env: "EDD_ALLOWED_NUMA_NODES=0"
{
"products": [
{
"id": "dig_pack_controller",
"bit_depth": 8,
"sampling_rate": 4000000000.0,
"predecimation_factor": 2,
"flip_spectrum": false,
"output_data_streams": {
"polarization_0": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "225.0.0.110+3",
"port": "7148"
},
"polarization_1": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "225.0.0.114+3",
"port": "7148"
}
}
},
{
"id": "gated_stokes_spectrometer",
"input_data_streams": {
"polarization_0": {
"source": "dig_pack_controller:polarization_0",
"format": "MPIFR_EDD_Packetizer:1"
},
"polarization_1": {
"source": "dig_pack_controller:polarization_1",
"format": "MPIFR_EDD_Packetizer:1"
}
},
"output_data_streams": {
"Stokes_I_0": {
"format": "GatedSpectrometer:1",
"ip": "225.0.1.172",
"port": "7152"
},
"Stokes_I_1": {
"format": "GatedSpectrometer:1",
"ip": "225.0.1.173",
"port": "7152"
},
"Stokes_Q_0": {
"format": "GatedSpectrometer:1",
"ip": "225.0.1.174",
"port": "7152"
},
"Stokes_Q_1": {
"format": "GatedSpectrometer:1",
"ip": "225.0.1.175",
"port": "7152"
},
"Stokes_U_0": {
"format": "GatedSpectrometer:1",
"ip": "225.0.1.176",
"port": "7152"
},
"Stokes_U_1": {
"format": "GatedSpectrometer:1",
"ip": "225.0.1.177",
"port": "7152"
},
"Stokes_V_0": {
"format": "GatedSpectrometer:1",
"ip": "225.0.1.178",
"port": "7152"
},
"Stokes_V_1": {
"format": "GatedSpectrometer:1",
"ip": "225.0.1.179",
"port": "7152"
}
},
"naccumulate": 16384,
"fft_length": 262144
},
{
"id": "fits_interface",
"input_data_streams": [
{
"source": "gated_stokes_spectrometer:Stokes_I_0",
"format": "GatedSpectrometer:1"
},
{
"source": "gated_stokes_spectrometer:Stokes_Q_0",
"format": "GatedSpectrometer:1"
},
{
"source": "gated_stokes_spectrometer:Stokes_U_0",
"format": "GatedSpectrometer:1"
},
{
"source": "gated_stokes_spectrometer:Stokes_V_0",
"format": "GatedSpectrometer:1"
},
{
"source": "gated_stokes_spectrometer:Stokes_I_1",
"format": "GatedSpectrometer:1"
},
{
"source": "gated_stokes_spectrometer:Stokes_Q_1",
"format": "GatedSpectrometer:1"
},
{
"source": "gated_stokes_spectrometer:Stokes_U_1",
"format": "GatedSpectrometer:1"
},
{
"source": "gated_stokes_spectrometer:Stokes_V_1",
"format": "GatedSpectrometer:1"
}
]
},
{
"id": "timing1",
"input_data_streams": [
{
"source": "dig_pack_controller:polarization_0"
},
{
"source": "dig_pack_controller:polarization_1"
}
],
"dada_header_params": {
"bandwidth": 1000,
"frequency_mhz": 500.0,
"tsamp": 0.0005
}
},
{
"id": "search1",
"merge_threads": 1,
"active":0,
"npol": 1,
"mode": "Searching",
"input_data_streams": [
{
"source": "dig_pack_controller:polarization_0"
},
{
"source": "dig_pack_controller:polarization_1"
}
],
"dada_header_params": {
"bandwidth": 1000,
"frequency_mhz": 500.0,
"tsamp": 0.0005
}
},
{
"id": "baseband1",
"mode": "Baseband",
"active":0,
"input_data_streams": [
{
"source": "dig_pack_controller:polarization_0"
},
{
"source": "dig_pack_controller:polarization_1"
}
],
"dada_header_params": {
"bandwidth": 1000,
"frequency_mhz": 500.0,
"tsamp": 0.0005,
"slots_skip": 0,
"dada_nslots": 2
},
"dadc": {
"size": 6553600000,
"number": 3
},
"dada": {
"size": 6553600000,
"number": 3
}
}
]
}
---
########################################################################
# Provision configuration for the run. This defines which edd components are
# set up.
- hosts: gpu_server[1]
roles:
- role: pulsar_pipeline
container_name: timing1
container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9700
- role: gated_full_stokes_spectrometer
container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9702
- hosts: gpu_server[0]
roles:
- role: dig_pack_controller
container_name: dig_pack_controller
device: packetizer-fr-01
- role: pulsar_pipeline
container_name: baseband1
container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9703
- role: pulsar_pipeline
container_name: search1
container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9701
- role: fits_interface
container_env: "EDD_ALLOWED_NUMA_NODES=0"
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
] ]
}, },
{ {
"id": "pulsar_timing1", "id": "timing1",
"zaplist": "2400:2500", "zaplist": "2400:2500",
"input_data_streams": [ "input_data_streams": [
{ {
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
} }
}, },
{ {
"id": "pulsar_searching1", "id": "search1",
"merge_threads": 1, "merge_threads": 1,
"active":0, "active":0,
"npol": 1, "npol": 1,
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
} }
}, },
{ {
"id": "pulsar_baseband1", "id": "baseband1",
"mode": "Baseband", "mode": "Baseband",
"active":0, "active":0,
"input_data_streams": [ "input_data_streams": [
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
edd_group: 50000 edd_group: 50000
roles: roles:
- role: pulsar_pipeline - role: pulsar_pipeline
container_name: pulsar_timing1 container_name: timing1
container_env: "EDD_ALLOWED_NUMA_NODES=1" container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9700