Skip to content

Commit

Permalink
Update main
Browse files Browse the repository at this point in the history 
# 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
  • Loading branch information
codebot committed Sep 3, 2024
2 parents 4ac5300 + dace8f1 commit 10081bf
Show file tree
Hide file tree
Showing 1,092 changed files with 32,653 additions and 24,478 deletions.
39 changes: 18 additions & 21 deletions .github/workflows/docker.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- TAGNAME: ""
REPOSITORY: metrics-server
EXTRA_CMAKE_ARGS: ""
ARCH: ""
MARCH: ""
PLATFORM: amd64
LIB: ""
LIB_VERSION: ""
Expand All @@ -27,7 +27,7 @@ jobs:
- TAGNAME: ""
REPOSITORY: grafana
EXTRA_CMAKE_ARGS: ""
ARCH: ""
MARCH: ""
PLATFORM: amd64
LIB: ""
LIB_VERSION: ""
Expand All @@ -37,59 +37,56 @@ jobs:
# AMD AVX2
- TAGNAME: split72_release_avx2
REPOSITORY: srsran-project
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
ARCH: x86-64-v3
MARCH: x86-64-v3
PLATFORM: amd64
LIB: dpdk
LIB_VERSION: "23.11"
LIB_VERSION: "23.11.1"
DOCKERFILE: ./docker/Dockerfile
CONTEXT: ./
- TAGNAME: split72_release_with_debug_avx2
REPOSITORY: srsran-project
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
ARCH: x86-64-v3
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
MARCH: x86-64-v3
PLATFORM: amd64
LIB: dpdk
LIB_VERSION: "23.11"
LIB_VERSION: "23.11.1"
DOCKERFILE: ./docker/Dockerfile
CONTEXT: ./
# AMD AVX512
- TAGNAME: split72_release_avx512
REPOSITORY: srsran-project
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
ARCH: x86-64-v4
MARCH: x86-64-v4
PLATFORM: amd64
LIB: dpdk
LIB_VERSION: "23.11"
LIB_VERSION: "23.11.1"
DOCKERFILE: ./docker/Dockerfile
CONTEXT: ./
- TAGNAME: split72_release_with_debug_avx512
REPOSITORY: srsran-project
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
ARCH: x86-64-v4
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
MARCH: x86-64-v4
PLATFORM: amd64
LIB: dpdk
LIB_VERSION: "23.11"
LIB_VERSION: "23.11.1"
DOCKERFILE: ./docker/Dockerfile
CONTEXT: ./
# --> split8
# AMD AVX2
- TAGNAME: split8_release_avx2
REPOSITORY: srsran-project
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
ARCH: x86-64-v3
MARCH: x86-64-v3
PLATFORM: amd64
LIB: uhd
LIB_VERSION: "4.6.0.0"
LIB_VERSION: "4.7.0.0"
DOCKERFILE: ./docker/Dockerfile
CONTEXT: ./
- TAGNAME: split8_release_with_debug_avx2
REPOSITORY: srsran-project
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
ARCH: x86-64-v3
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
MARCH: x86-64-v3
PLATFORM: amd64
LIB: uhd
LIB_VERSION: "4.6.0.0"
LIB_VERSION: "4.7.0.0"
DOCKERFILE: ./docker/Dockerfile
CONTEXT: ./
env:
Expand Down Expand Up @@ -145,4 +142,4 @@ jobs:
NAME="${{ env.NAME }}"
LIB=${{ matrix.LIB }}
LIB_VERSION=${{ matrix.LIB_VERSION }}
ARCH=${{ matrix.ARCH }}
MARCH=${{ matrix.MARCH }}
8 changes: 5 additions & 3 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ full-code-format:
export CXX=/usr/bin/clang++
mkdir -p build
cd build || exit
cmake -DASSERT_LEVEL=PARANOID -DAUTO_DETECT_ISA=False -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_TESTS=False ..
make srsran_build_info # needed to generate hashes.h
cmake -DASSERT_LEVEL=PARANOID -DMARCH=x86-64-v3 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_TESTS=False ..
make srsran_versioning # needed to generate hashes.h
- |
monitor_child_process() {
while true; do
Expand Down Expand Up @@ -477,13 +477,15 @@ create-tags:
stage: .post
rules:
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
when: always
when: delayed
start_in: 3 hours
script:
- |
for name in $TAG_NAME_ARRAY; do
create_tag "${name}_$(date -u +"%Y.%m.%d")"
done
needs: []
retry: 2

################################################################################
# Enable / Disable pipelines
Expand Down
Loading

0 comments on commit 10081bf

Please sign in to comment.