Skip to content

Commit 10081bf

Browse files
author
codebot
committed
Update main
# Conflicts: # apps/services/metrics_hub.cpp # apps/services/metrics_hub.h # apps/services/metrics_log_helper.cpp # apps/services/metrics_log_helper.h # apps/services/metrics_plotter_json.cpp # apps/services/metrics_plotter_json.h # apps/services/metrics_plotter_stdout.cpp # apps/services/metrics_plotter_stdout.h # apps/services/rlc_metrics_plotter_json.h # cmake/modules/FindSSE.cmake # include/srsran/adt/bitmap_utils.h # include/srsran/ofh/compression/compressed_prb.h # include/srsran/phy/support/resource_grid_reader_empty.h # include/srsran/ran/qos/qos_info.h # include/srsran/rrc/rrc.h # include/srsran/support/file_sink.h # include/srsran/support/math/lcm.h # include/srsran/support/span_printer.h # lib/cu_cp/adapters/cu_cp_adapters.h # lib/cu_cp/routine_managers/cu_cp_routine_manager.cpp # lib/cu_cp/routine_managers/cu_cp_routine_manager.h # lib/du_manager/ran_resource_management/cell_group_config.h # lib/f1ap/du/procedures/f1ap_du_ue_context_common.h # lib/hal/dpdk/bbdev/bbdev.cpp # lib/hal/dpdk/bbdev/bbdev.h # lib/hal/dpdk/bbdev/bbdev_acc.cpp # lib/hal/dpdk/bbdev/bbdev_op_pool_factory.cpp # lib/hal/dpdk/bbdev/ldpc/bbdev_ldpc_decoder.cpp # lib/hal/dpdk/bbdev/ldpc/bbdev_ldpc_decoder.h # lib/hal/dpdk/bbdev/ldpc/bbdev_ldpc_encoder.cpp # lib/hal/dpdk/bbdev/ldpc/bbdev_ldpc_encoder.h # lib/hal/phy/upper/channel_processors/hw_accelerator_pdsch_enc_acc100_impl.cpp # lib/hal/phy/upper/channel_processors/hw_accelerator_pdsch_enc_acc100_impl.h # lib/hal/phy/upper/channel_processors/hw_accelerator_pdsch_enc_impl.cpp # lib/hal/phy/upper/channel_processors/hw_accelerator_pdsch_enc_impl.h # lib/hal/phy/upper/channel_processors/pusch/hw_accelerator_pusch_dec_acc100_impl.cpp # lib/hal/phy/upper/channel_processors/pusch/hw_accelerator_pusch_dec_acc100_impl.h # lib/hal/phy/upper/channel_processors/pusch/hw_accelerator_pusch_dec_impl.cpp # lib/hal/phy/upper/channel_processors/pusch/hw_accelerator_pusch_dec_impl.h # lib/ofh/compression/compressed_prb_packer.h # lib/ofh/compression/compressed_prb_unpacker.cpp # lib/ofh/compression/compressed_prb_unpacker.h # lib/phy/support/resource_grid_pool_asynchronous_impl.cpp # lib/phy/support/resource_grid_pool_asynchronous_impl.h # lib/phy/support/resource_grid_pool_generic_impl.cpp # lib/phy/support/resource_grid_pool_generic_impl.h # lib/rlc/rlc_sdu_queue.h # lib/support/version/CMakeLists.txt # tests/unittests/apps/services/CMakeLists.txt # tests/unittests/cu_cp/cu_cp_test.cpp # tests/unittests/cu_cp/cu_cp_test_helpers.cpp # tests/unittests/cu_cp/cu_cp_test_helpers.h # tests/unittests/cu_cp/mobility/inter_cu_handover_routine_test.cpp # tests/unittests/cu_cp/mobility/inter_du_handover_routine_test.cpp # tests/unittests/cu_cp/routines/CMakeLists.txt # tests/unittests/cu_cp/routines/cu_cp_routine_manager_test_helpers.cpp # tests/unittests/cu_cp/routines/cu_cp_routine_manager_test_helpers.h # tests/unittests/cu_cp/routines/pdu_session_resource_modification_routine_test.cpp # tests/unittests/cu_cp/routines/pdu_session_resource_release_routine_test.cpp # tests/unittests/cu_cp/routines/pdu_session_resource_routine_test_helpers.h # tests/unittests/cu_cp/routines/pdu_session_resource_setup_routine_test.cpp # tests/unittests/cu_cp/routines/ue_context_release_routine_test.cpp # tests/unittests/f1ap/cu_cp/f1ap_cu_msg_filler_test.cpp # tests/unittests/ofh/compression/ofh_compression_test_data.tar.gz # tests/unittests/phy/lower/modulation/ofdm_demodulator_test_data.tar.gz # tests/unittests/phy/lower/modulation/ofdm_modulator_test_data.tar.gz # tests/unittests/phy/lower/modulation/ofdm_prach_demodulator_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pusch/pusch_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pusch_estimator_test_data.tar.gz # tests/unittests/rlc/rlc_sdu_queue_test.cpp # tests/unittests/scheduler/ue_scheduling/harq_entity_test.cpp # tests/unittests/scheduler/ue_scheduling/harq_process_test.cpp
2 parents 4ac5300 + dace8f1 commit 10081bf

File tree

1,092 files changed

+32653
-24478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,092 files changed

+32653
-24478
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- TAGNAME: ""
1818
REPOSITORY: metrics-server
1919
EXTRA_CMAKE_ARGS: ""
20-
ARCH: ""
20+
MARCH: ""
2121
PLATFORM: amd64
2222
LIB: ""
2323
LIB_VERSION: ""
@@ -27,7 +27,7 @@ jobs:
2727
- TAGNAME: ""
2828
REPOSITORY: grafana
2929
EXTRA_CMAKE_ARGS: ""
30-
ARCH: ""
30+
MARCH: ""
3131
PLATFORM: amd64
3232
LIB: ""
3333
LIB_VERSION: ""
@@ -37,59 +37,56 @@ jobs:
3737
# AMD AVX2
3838
- TAGNAME: split72_release_avx2
3939
REPOSITORY: srsran-project
40-
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
41-
ARCH: x86-64-v3
40+
MARCH: x86-64-v3
4241
PLATFORM: amd64
4342
LIB: dpdk
44-
LIB_VERSION: "23.11"
43+
LIB_VERSION: "23.11.1"
4544
DOCKERFILE: ./docker/Dockerfile
4645
CONTEXT: ./
4746
- TAGNAME: split72_release_with_debug_avx2
4847
REPOSITORY: srsran-project
49-
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
50-
ARCH: x86-64-v3
48+
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
49+
MARCH: x86-64-v3
5150
PLATFORM: amd64
5251
LIB: dpdk
53-
LIB_VERSION: "23.11"
52+
LIB_VERSION: "23.11.1"
5453
DOCKERFILE: ./docker/Dockerfile
5554
CONTEXT: ./
5655
# AMD AVX512
5756
- TAGNAME: split72_release_avx512
5857
REPOSITORY: srsran-project
59-
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
60-
ARCH: x86-64-v4
58+
MARCH: x86-64-v4
6159
PLATFORM: amd64
6260
LIB: dpdk
63-
LIB_VERSION: "23.11"
61+
LIB_VERSION: "23.11.1"
6462
DOCKERFILE: ./docker/Dockerfile
6563
CONTEXT: ./
6664
- TAGNAME: split72_release_with_debug_avx512
6765
REPOSITORY: srsran-project
68-
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
69-
ARCH: x86-64-v4
66+
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
67+
MARCH: x86-64-v4
7068
PLATFORM: amd64
7169
LIB: dpdk
72-
LIB_VERSION: "23.11"
70+
LIB_VERSION: "23.11.1"
7371
DOCKERFILE: ./docker/Dockerfile
7472
CONTEXT: ./
7573
# --> split8
7674
# AMD AVX2
7775
- TAGNAME: split8_release_avx2
7876
REPOSITORY: srsran-project
79-
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
80-
ARCH: x86-64-v3
77+
MARCH: x86-64-v3
8178
PLATFORM: amd64
8279
LIB: uhd
83-
LIB_VERSION: "4.6.0.0"
80+
LIB_VERSION: "4.7.0.0"
8481
DOCKERFILE: ./docker/Dockerfile
8582
CONTEXT: ./
8683
- TAGNAME: split8_release_with_debug_avx2
8784
REPOSITORY: srsran-project
88-
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
89-
ARCH: x86-64-v3
85+
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
86+
MARCH: x86-64-v3
9087
PLATFORM: amd64
9188
LIB: uhd
92-
LIB_VERSION: "4.6.0.0"
89+
LIB_VERSION: "4.7.0.0"
9390
DOCKERFILE: ./docker/Dockerfile
9491
CONTEXT: ./
9592
env:
@@ -145,4 +142,4 @@ jobs:
145142
NAME="${{ env.NAME }}"
146143
LIB=${{ matrix.LIB }}
147144
LIB_VERSION=${{ matrix.LIB_VERSION }}
148-
ARCH=${{ matrix.ARCH }}
145+
MARCH=${{ matrix.MARCH }}

‎.gitlab-ci.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ full-code-format:
203203
export CXX=/usr/bin/clang++
204204
mkdir -p build
205205
cd build || exit
206-
cmake -DASSERT_LEVEL=PARANOID -DAUTO_DETECT_ISA=False -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_TESTS=False ..
207-
make srsran_build_info # needed to generate hashes.h
206+
cmake -DASSERT_LEVEL=PARANOID -DMARCH=x86-64-v3 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_TESTS=False ..
207+
make srsran_versioning # needed to generate hashes.h
208208
- |
209209
monitor_child_process() {
210210
while true; do
@@ -477,13 +477,15 @@ create-tags:
477477
stage: .post
478478
rules:
479479
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
480-
when: always
480+
when: delayed
481+
start_in: 3 hours
481482
script:
482483
- |
483484
for name in $TAG_NAME_ARRAY; do
484485
create_tag "${name}_$(date -u +"%Y.%m.%d")"
485486
done
486487
needs: []
488+
retry: 2
487489

488490
################################################################################
489491
# Enable / Disable pipelines

0 commit comments

Comments
 (0)