Skip to content

Commit 9d63186

Browse files
SDA USRsdausr
authored andcommitted
Squashed 'ultrasound' changes from aaf31fe..18ec13b (#1193)
18ec13b Merge pull request #215 from ryanw/doc_2 b1cd562 Refined overview.rst 0a8d63b Merge pull request #214 from ryanw/doc_2 331d024 Refined details_L2.rst 83d8980 Merge pull request #213 from ryanw/doc_2 4707089 Merge remote-tracking branch 'origin/doc_2' into doc_2 c82a7e6 refined Makefile and description.json 5d9f560 update doc for L1 and L2 Co-authored-by: sdausr <[email protected]>
1 parent ebd3879 commit 9d63186

File tree

11 files changed

+112
-12
lines changed

11 files changed

+112
-12
lines changed

ultrasound/L2/tests/tests_aieml/Apodization_aieml_float/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ AIE_PKG_DIR = $(AIE_WORK_DIR)
130130

131131
AIE_CXXFLAGS += -I $(XFLIB_DIR)/L1/include/ -I $(XFLIB_DIR)/L2/include/ -I $(XFLIB_DIR)/L2/src/Apodization_aieml/aiengine/
132132

133-
AIE_CXXFLAGS += --aie.Xpreproc -DKERNEL_TYPE=float
133+
AIE_CXXFLAGS += --aie.Xpreproc -DKERNEL_TYPE=float --aie.Xpreproc -DTYPE_IS_FLOAT
134134

135135
$(AIE_WORK_DIR)/ps/c_rts/aie_control_xrt.cpp: $(AIE_CONTAINER)
136136

ultrasound/L2/tests/tests_aieml/Apodization_aieml_float/description.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
"LIB_DIR/L2/src/Apodization_aieml/aiengine/"
5656
],
5757
"symbols": [
58-
"--aie.Xpreproc -DKERNEL_TYPE=float"
58+
"--aie.Xpreproc -DKERNEL_TYPE=float",
59+
"--aie.Xpreproc -DTYPE_IS_FLOAT"
5960
]
6061
}
6162
},

ultrasound/L2/tests/tests_aieml/CatumllRom_aieml_float/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ AIE_PKG_DIR = $(AIE_WORK_DIR)
130130

131131
AIE_CXXFLAGS += -I $(XFLIB_DIR)/L1/include/ -I $(XFLIB_DIR)/L2/include/ -I $(XFLIB_DIR)/L2/src/CatumllRom_aieml/aiengine/
132132

133-
AIE_CXXFLAGS += --aie.Xpreproc -DKERNEL_TYPE=float
133+
AIE_CXXFLAGS += --aie.Xpreproc -DKERNEL_TYPE=float --aie.Xpreproc -DTYPE_IS_FLOAT
134134

135135
$(AIE_WORK_DIR)/ps/c_rts/aie_control_xrt.cpp: $(AIE_CONTAINER)
136136

ultrasound/L2/tests/tests_aieml/CatumllRom_aieml_float/description.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
"LIB_DIR/L2/src/CatumllRom_aieml/aiengine/"
5656
],
5757
"symbols": [
58-
"--aie.Xpreproc -DKERNEL_TYPE=float"
58+
"--aie.Xpreproc -DKERNEL_TYPE=float",
59+
"--aie.Xpreproc -DTYPE_IS_FLOAT"
5960
]
6061
}
6162
},

ultrasound/L2/tests/tests_aieml/Delay_aieml_float/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ AIE_PKG_DIR = $(AIE_WORK_DIR)
130130

131131
AIE_CXXFLAGS += -I $(XFLIB_DIR)/L1/include/ -I $(XFLIB_DIR)/L2/include/ -I $(XFLIB_DIR)/L2/src/Delay_aieml/aiengine/
132132

133-
AIE_CXXFLAGS += --aie.Xpreproc -DKERNEL_TYPE=float
133+
AIE_CXXFLAGS += --aie.Xpreproc -DKERNEL_TYPE=float --aie.Xpreproc -DTYPE_IS_FLOAT
134134

135135
$(AIE_WORK_DIR)/ps/c_rts/aie_control_xrt.cpp: $(AIE_CONTAINER)
136136

ultrasound/L2/tests/tests_aieml/Delay_aieml_float/description.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
"LIB_DIR/L2/src/Delay_aieml/aiengine/"
5656
],
5757
"symbols": [
58-
"--aie.Xpreproc -DKERNEL_TYPE=float"
58+
"--aie.Xpreproc -DKERNEL_TYPE=float",
59+
"--aie.Xpreproc -DTYPE_IS_FLOAT"
5960
]
6061
}
6162
},

ultrasound/L2/tests/tests_aieml/Focusing_aieml_float/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ AIE_PKG_DIR = $(AIE_WORK_DIR)
130130

131131
AIE_CXXFLAGS += -I $(XFLIB_DIR)/L1/include/ -I $(XFLIB_DIR)/L2/include/ -I $(XFLIB_DIR)/L2/src/Focusing_aieml/aiengine/
132132

133-
AIE_CXXFLAGS += --aie.Xpreproc -DKERNEL_TYPE=float
133+
AIE_CXXFLAGS += --aie.Xpreproc -DKERNEL_TYPE=float --aie.Xpreproc -DTYPE_IS_FLOAT
134134

135135
$(AIE_WORK_DIR)/ps/c_rts/aie_control_xrt.cpp: $(AIE_CONTAINER)
136136

ultrasound/L2/tests/tests_aieml/Focusing_aieml_float/description.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
"LIB_DIR/L2/src/Focusing_aieml/aiengine/"
5656
],
5757
"symbols": [
58-
"--aie.Xpreproc -DKERNEL_TYPE=float"
58+
"--aie.Xpreproc -DKERNEL_TYPE=float",
59+
"--aie.Xpreproc -DTYPE_IS_FLOAT"
5960
]
6061
}
6162
},

ultrasound/docs/src/features/details_L1.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ Element-Wise absolute values of a vector.
906906
- **Function params**:
907907
- `input_vector`: elements of the vector to be passed to the kernel.
908908
- `output`: elements of the result of the operation (vector) to be passed from the kernel.
909-
909+
910910
Kernel name: `CosV` for AIE-ML
911911
###################################
912912

@@ -968,7 +968,7 @@ Element-Wise division between the values of a vector and a scalar (SpeedOfSound)
968968
- `input_vector_1`: elements of the first dividend vector to be passed to the kernel.
969969
- `input_vector_2`: elements of the second divisor vector to be passed to the kernel.
970970
- `output_vector`: elements of the result of the operation (vector) to be passed from the kernel.
971-
971+
972972
Kernel name: `EqualS` for AIE-ML
973973
###################################
974974

ultrasound/docs/src/features/details_L2.rst

Lines changed: 95 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,4 +276,98 @@ This graph is used to compute the chordal version of the Catmull-Rom. It is call
276276
- `P5`: Third point to be interpolated;
277277
- `P6`: Fourth point to be interpolated;
278278
- **Graph Outputs**:
279-
- `C`: A vector with the result of the interpolation
279+
- `C`: A vector with the result of the interpolation
280+
281+
Graph name: `TestGraphApodization` for AIE-ML
282+
###########################################
283+
284+
This graph is used to calculate the apodization for the reception. The graph suppots int32 and float data types.
285+
286+
- **Graph Inputs**:
287+
- `image_points`: the result of Image Points;
288+
- `apodization_reference`: X-Y-Z vector that represents the positions of our apodization reference;
289+
- `apodization_direction`: X-Y-Z values of propagation of the spherical emitted;
290+
- `two`: constant value of 2;
291+
- `apodization_distance`: Result of Focusing;
292+
- `f_number`: The selected F number for the application;
293+
- `one`: constant value of 1;
294+
- `pi`: constant value of pi;
295+
- **Graph Outputs**:
296+
- `output_apodization`: A vector that represents the Hanning Window for the reference point chosen;
297+
298+
Graph name: `TestGraphCatmullRom` for AIE-ML
299+
###########################################
300+
301+
This graph is used to compute the chordal version of the Catmull-Rom with supporting for int32, float and cint16 data types.
302+
303+
- **Graph Inputs**:
304+
- `point_0`: Input rf points to be interpolated;
305+
- `point_1`: Input rf points to be interpolated;
306+
- `point_2`: Input rf points to be interpolated;
307+
- `point_3`: Input rf points to be interpolated;
308+
- `t1t`: The coefficient used for interpolation;
309+
- `t2t`: The coefficient used for interpolation;
310+
- `t3t`: The coefficient used for interpolation;
311+
- `tt0`: The coefficient used for interpolation;
312+
- `tt1`: The coefficient used for interpolation;
313+
- `tt2`: The coefficient used for interpolation;
314+
- **Graph Outputs**:
315+
- `output_catmull_rom`: A vector with the result of the interpolation;
316+
317+
Graph name: `TestGraphDelay` for AIE-ML
318+
###########################################
319+
320+
This graph is used to compute the transmit delay. It returns an array of values that represent the transmission time for every incremental point of the investigation. The graph suppots int32 and float data types.
321+
322+
- **Graph Inputs**:
323+
- `image_points_from_pl_1`: the result of Image Points;
324+
- `image_points_from_pl_2`: the result of Image Points;
325+
- `tx_def_ref_point`: X-Y-Z array with the reference point of the investigation for that iteration;
326+
- `tx_def_delay_distance_1`: X-Y-Z array that represents the absolute distance with respect to the focus;
327+
- `tx_def_delay_distance_2`: X-Y-Z array that represents the absolute distance with respect to the focus;
328+
- `tx_def_focal_point`: X-Y-Z array that represent our focus;
329+
- `t_start`: The starting time of emission;
330+
- `direction`: X-Y-Z values of propagation of the spherical or planar wave emitted;
331+
- `speed_of_sound`: The speed of sound used in tests is 1540 m/s;
332+
- **Graph Outputs**:
333+
- `delay_output`: A vector that represents the time delay per point to analyze;
334+
335+
Graph name: `TestGraphFocusing` for AIE-ML
336+
###########################################
337+
338+
This graph is used to compute the distance of our reference apodization point for the dynamic apodization with respect to the image points. This version is used in SA to create a dynamic apodization also in transmission and not only in reception. The graph suppots int32 and float data types.
339+
340+
- **Graph Inputs**:
341+
- `apo_ref_0`: X component of the vector of apodization reference;
342+
- `xdc_def_0`: X component of the Image Points result;
343+
- `apo_ref_1`: Y component of the vector of apodization reference;
344+
- `xdc_def_1`: Y component of the Image Points result;
345+
- **Graph Outputs**:
346+
- `out`: A vector that represents apodization distance in transmission;
347+
348+
Graph name: `TestGraphImagePoints` for AIE-ML
349+
###########################################
350+
351+
The Image Points graph is used to create a matrix, which represents the part of investigation made by the specific emission of the Ultrasound Probe. The rows of this matrix have incremental values, which represents our values used to compute delay for the **virtual sources**. It is dependent on the investigation depth and the incremental investigation that you want to perform (based on our sampling frquency). The graph suppots int32 and float data types.
352+
353+
- **Graph Inputs**:
354+
- `start_position`: the position that you start the investigation in cartesian coordinate;
355+
- `directions`: X-Y-Z values of propagation of the spherical or planar wave emitted;
356+
- `samples_arange`: array with the index of the rf-data;
357+
- **Graph Outputs**:
358+
- `output_matrix`: A Nx4 matrix that represents the points to analyze;
359+
360+
Graph name: `TestGraphSamples` for AIE-ML
361+
###########################################
362+
363+
This graph is used to compute the delay in reception for every transducer. It also sums the delay in transmission to obtain the valid samples for the interpolation. The graph only suppots int32 data type.
364+
365+
- **Graph Inputs**:
366+
- `image_points`: Result of Image Points;
367+
- `delay`: Result of Delay;
368+
- `xdc_def_positions`: X-Y-Z vector that represents the positions of our transducers in the probe;
369+
- `sampling_frequency`: The sampling frequency of the probe;
370+
- `speed_of_sound`: The speed of sound used in tests is 1540 m/s;
371+
- **Graph Outputs**:
372+
- `output_vector`: A vector that represents our valid entries in the rf-data vector;
373+

0 commit comments

Comments
 (0)