[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Wed, 15 Oct 2014 23:25:18 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 311df38dc444f5567a261db24017585fc1fead31
Merge: 6c5d722 8ebe90f
Author: Tom Rondeau <address@hidden>
Date: Wed Oct 15 19:24:18 2014 -0400
Merge branch 'master' into next
volk/apps/volk_profile.cc | 9 +
volk/kernels/volk/volk_16i_32fc_dot_prod_32fc.h | 22 ++
volk/kernels/volk/volk_16i_branch_4_state_8.h | 22 ++
volk/kernels/volk/volk_16i_convert_8i.h | 22 ++
volk/kernels/volk/volk_16i_max_star_16i.h | 24 +-
.../volk/volk_16i_max_star_horizontal_16i.h | 28 +-
.../kernels/volk/volk_16i_permute_and_scalar_add.h | 22 ++
volk/kernels/volk/volk_16i_s32f_convert_32f.h | 136 ++++++++++
volk/kernels/volk/volk_16i_x4_quad_max_star_16i.h | 22 ++
volk/kernels/volk/volk_16i_x5_add_quad_16i_x4.h | 22 ++
volk/kernels/volk/volk_16ic_deinterleave_16i_x2.h | 22 ++
.../kernels/volk/volk_16ic_deinterleave_real_16i.h | 22 ++
volk/kernels/volk/volk_16ic_deinterleave_real_8i.h | 22 ++
volk/kernels/volk/volk_16ic_magnitude_16i.h | 22 ++
.../volk/volk_16ic_s32f_deinterleave_32f_x2.h | 22 ++
.../volk/volk_16ic_s32f_deinterleave_real_32f.h | 22 ++
volk/kernels/volk/volk_16ic_s32f_magnitude_32f.h | 22 ++
volk/kernels/volk/volk_16u_byteswap.h | 22 ++
volk/kernels/volk/volk_32f_accumulator_s32f.h | 22 ++
volk/kernels/volk/volk_32f_acos_32f.h | 194 ++++++++++++++
volk/kernels/volk/volk_32f_asin_32f.h | 189 +++++++++++++
volk/kernels/volk/volk_32f_atan_32f.h | 183 +++++++++++++
volk/kernels/volk/volk_32f_binary_slicer_32i.h | 22 ++
volk/kernels/volk/volk_32f_binary_slicer_8i.h | 22 ++
volk/kernels/volk/volk_32f_convert_64f.h | 94 +++++++
volk/kernels/volk/volk_32f_cos_32f.h | 211 +++++++++++++++
volk/kernels/volk/volk_32f_expfast_32f.h | 216 +++++++++++++++
volk/kernels/volk/volk_32f_index_max_16u.h | 22 ++
volk/kernels/volk/volk_32f_invsqrt_32f.h | 24 +-
volk/kernels/volk/volk_32f_log2_32f.h | 232 ++++++++++++++++
.../kernels/volk/volk_32f_s32f_32f_fm_detect_32f.h | 22 ++
.../volk_32f_s32f_calc_spectral_noise_floor_32f.h | 22 ++
volk/kernels/volk/volk_32f_s32f_convert_16i.h | 136 ++++++++++
volk/kernels/volk/volk_32f_s32f_convert_32i.h | 22 ++
volk/kernels/volk/volk_32f_s32f_convert_8i.h | 22 ++
volk/kernels/volk/volk_32f_s32f_multiply_32f.h | 22 ++
volk/kernels/volk/volk_32f_s32f_normalize.h | 22 ++
volk/kernels/volk/volk_32f_s32f_power_32f.h | 22 ++
volk/kernels/volk/volk_32f_s32f_stddev_32f.h | 22 ++
volk/kernels/volk/volk_32f_sin_32f.h | 211 +++++++++++++++
volk/kernels/volk/volk_32f_sqrt_32f.h | 22 ++
.../kernels/volk/volk_32f_stddev_and_mean_32f_x2.h | 22 ++
volk/kernels/volk/volk_32f_tan_32f.h | 220 +++++++++++++++
volk/kernels/volk/volk_32f_tanh_32f.h | 22 ++
volk/kernels/volk/volk_32f_x2_add_32f.h | 24 +-
volk/kernels/volk/volk_32f_x2_divide_32f.h | 22 ++
volk/kernels/volk/volk_32f_x2_dot_prod_16i.h | 22 ++
volk/kernels/volk/volk_32f_x2_dot_prod_32f.h | 22 ++
volk/kernels/volk/volk_32f_x2_interleave_32fc.h | 24 +-
volk/kernels/volk/volk_32f_x2_max_32f.h | 24 +-
volk/kernels/volk/volk_32f_x2_min_32f.h | 22 ++
volk/kernels/volk/volk_32f_x2_multiply_32f.h | 22 ++
volk/kernels/volk/volk_32f_x2_pow_32f.h | 298 +++++++++++++++++++++
.../volk/volk_32f_x2_s32f_interleave_16ic.h | 22 ++
volk/kernels/volk/volk_32f_x2_subtract_32f.h | 22 ++
volk/kernels/volk/volk_32f_x3_sum_of_poly_32f.h | 22 ++
volk/kernels/volk/volk_32fc_32f_dot_prod_32fc.h | 30 ++-
volk/kernels/volk/volk_32fc_32f_multiply_32fc.h | 22 ++
volk/kernels/volk/volk_32fc_conjugate_32fc.h | 98 +++++++
volk/kernels/volk/volk_32fc_deinterleave_32f_x2.h | 73 +++++
volk/kernels/volk/volk_32fc_deinterleave_64f_x2.h | 124 +++++++++
.../kernels/volk/volk_32fc_deinterleave_imag_32f.h | 66 +++++
.../kernels/volk/volk_32fc_deinterleave_real_32f.h | 22 ++
.../kernels/volk/volk_32fc_deinterleave_real_64f.h | 22 ++
volk/kernels/volk/volk_32fc_index_max_16u.h | 22 ++
volk/kernels/volk/volk_32fc_magnitude_32f.h | 114 ++++++++
.../kernels/volk/volk_32fc_magnitude_squared_32f.h | 110 ++++++++
volk/kernels/volk/volk_32fc_s32f_atan2_32f.h | 22 ++
.../volk/volk_32fc_s32f_deinterleave_real_16i.h | 22 ++
volk/kernels/volk/volk_32fc_s32f_magnitude_16i.h | 22 ++
volk/kernels/volk/volk_32fc_s32f_power_32fc.h | 22 ++
.../volk/volk_32fc_s32f_power_spectrum_32f.h | 22 ++
.../volk_32fc_s32f_x2_power_spectral_density_32f.h | 114 ++++++++
volk/kernels/volk/volk_32fc_s32fc_multiply_32fc.h | 114 ++++++++
.../volk/volk_32fc_s32fc_rotatorpuppet_32fc.h | 22 ++
.../kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h | 22 ++
.../volk/volk_32fc_x2_conjugate_dot_prod_32fc.h | 22 ++
volk/kernels/volk/volk_32fc_x2_dot_prod_32fc.h | 137 ++++++++++
volk/kernels/volk/volk_32fc_x2_multiply_32fc.h | 120 +++++++++
.../volk/volk_32fc_x2_multiply_conjugate_32fc.h | 128 +++++++++
...volk_32fc_x2_s32f_square_dist_scalar_mult_32f.h | 22 ++
volk/kernels/volk/volk_32fc_x2_square_dist_32f.h | 22 ++
volk/kernels/volk/volk_32i_s32f_convert_32f.h | 22 ++
volk/kernels/volk/volk_32i_x2_and_32i.h | 22 ++
volk/kernels/volk/volk_32i_x2_or_32i.h | 22 ++
volk/kernels/volk/volk_32u_byteswap.h | 22 ++
volk/kernels/volk/volk_32u_popcnt.h | 22 ++
volk/kernels/volk/volk_64f_convert_32f.h | 22 ++
volk/kernels/volk/volk_64f_x2_max_64f.h | 22 ++
volk/kernels/volk/volk_64f_x2_min_64f.h | 22 ++
volk/kernels/volk/volk_64u_byteswap.h | 22 ++
volk/kernels/volk/volk_64u_popcnt.h | 22 ++
volk/kernels/volk/volk_8i_convert_16i.h | 22 ++
volk/kernels/volk/volk_8i_s32f_convert_32f.h | 22 ++
volk/kernels/volk/volk_8ic_deinterleave_16i_x2.h | 103 ++++++-
volk/kernels/volk/volk_8ic_deinterleave_real_16i.h | 70 +++++
volk/kernels/volk/volk_8ic_deinterleave_real_8i.h | 80 ++++++
.../volk/volk_8ic_s32f_deinterleave_32f_x2.h | 22 ++
.../volk/volk_8ic_s32f_deinterleave_real_32f.h | 22 ++
.../volk/volk_8ic_x2_multiply_conjugate_16ic.h | 22 ++
.../volk_8ic_x2_s32f_multiply_conjugate_32fc.h | 22 ++
volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h | 22 ++
volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h | 22 ++
volk/lib/testqa.cc | 9 +
104 files changed, 5466 insertions(+), 19 deletions(-)