Skip to content

Commit

Permalink
Update main
Browse files Browse the repository at this point in the history
# Conflicts:
#	apps/units/flexible_o_du/split_dynamic/multicell_dynamic_o_du_factory.cpp
#	apps/units/flexible_o_du/split_dynamic/multicell_dynamic_o_du_factory.h
#	apps/units/flexible_o_du/split_helpers/multicell_flexible_o_du_factory.cpp
#	apps/units/flexible_o_du/split_helpers/multicell_flexible_o_du_factory.h
#	apps/units/flexible_o_du/split_helpers/multicell_flexible_o_du_impl.cpp
#	apps/units/flexible_o_du/split_helpers/multicell_flexible_o_du_impl.h
#	apps/units/flexible_o_du/split_helpers/o_du_high_factory.cpp
#	apps/units/flexible_o_du/split_helpers/o_du_high_factory.h
#	include/srsran/asn1/nrppa/nrppa.h
#	include/srsran/fapi/buffered_decorator.h
#	include/srsran/fapi/buffered_decorator_factories.h
#	include/srsran/fapi/logging_decorator_factories.h
#	include/srsran/gtpu/ngu_gateway.h
#	include/srsran/ngap/ngap_nrppa.h
#	include/srsran/support/format/fmt_optional.h
#	lib/asn1/nrppa/nrppa.cpp
#	lib/cu_cp/routines/dl_non_ue_associated_nrppa_transport_routine.cpp
#	lib/fapi/loggers/logging_decorator_factories.cpp
#	lib/fapi/message_buffering/buffered_decorator_factories.cpp
#	lib/fapi/message_buffering/buffered_decorator_impl.cpp
#	lib/fapi/message_buffering/buffered_decorator_impl.h
#	lib/fapi/message_buffering/buffered_slot_gateway_task_dispatcher.cpp
#	lib/ngap/procedures/ngap_dl_ue_associated_nrppa_transport_procedure.cpp
#	lib/ngap/procedures/ngap_dl_ue_associated_nrppa_transport_procedure.h
#	lib/scheduler/config/logical_channel_config_factory.cpp
  • Loading branch information
codebot committed Dec 18, 2024
2 parents e5d5b44 + 87a1ef1 commit e74f7f3
Show file tree
Hide file tree
Showing 913 changed files with 29,331 additions and 64,793 deletions.
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Checks: '-*,
-readability-identifier-length,
-readability-implicit-bool-conversion,
-readability-magic-numbers,
-readability-math-missing-parentheses,
-readability-static-accessed-through-instance,
-readability-uppercase-literal-suffix'
CheckOptions:
Expand Down
41 changes: 41 additions & 0 deletions .gdbinit
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

python

import struct

###### static_vector<T, N> ########

class StaticVectorPrinter(object):
Expand Down Expand Up @@ -225,5 +227,44 @@ def make_slotted_vector(val):

gdb.pretty_printers.append(make_slotted_vector)

###### Brain Floating Point 16 (bf16_t) ######

class BFloat16(object):
def __init__(self, val):
self.__val = val

def to_string(self):
value_uint16 = self.__val['val']
value_uint32 = value_uint16.cast(gdb.lookup_type('uint32_t')) << 16
value_float = struct.unpack('!f', struct.pack('!I', value_uint32))[0]
return value_float

def display_hint(self):
return None

def make_bf16_t(val):
s = str(val.type.strip_typedefs())
if 'srsran::strong_bf16_tag' in s:
return BFloat16(val)

gdb.pretty_printers.append(make_bf16_t)

class BFloat16Complex(object):
def __init__(self, val):
self.__val = val

def to_string(self):
return f'{self.__val["real"]} + {self.__val["imag"]}i'

def display_hint(self):
return None

def make_cbf16_t(val):
s = str(val.type.strip_typedefs())
if s == 'srsran::cbf16_t':
return BFloat16Complex(val)

gdb.pretty_printers.append(make_cbf16_t)

end

4 changes: 2 additions & 2 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, ubuntu-24.04]
compiler: [gcc, clang]
os: [ubuntu-24.04]
compiler: [gcc]
steps:
- uses: actions/checkout@v3
- name: Install Dependencies
Expand Down
40 changes: 16 additions & 24 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ variables:
SLACK_CHANNEL_FAIL: "#ci_gnb"
SLACK_CHANNEL_INFO_MSG: "#ci_gnb_verbose"
AUTOREBASER_PRS_IN_QUEUE: 1
MR_PLUGIN_REF: main

################################################################################
## CI
Expand All @@ -75,14 +76,14 @@ job cleaner:
extends: .job cleaner
timeout: 4h
rules:
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/

pr reminder:
extends: .pr reminder
rules:
- if: $NOTIFY_SLACK != "true"
when: never
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/

trigger builder:
stage: ci
Expand Down Expand Up @@ -111,7 +112,7 @@ trigger docker:
- docker/**/*.{yml,env,json,toml,py,sh,csv,py,toml}
- docker/**/Dockerfile
- .gdbinit
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
variables:
CI_DESCRIPTION: $CI_DESCRIPTION
- if: $CI_DESCRIPTION =~ /Weekly/
Expand All @@ -126,7 +127,7 @@ trigger docker:
matlab nightly:
stage: ci
rules:
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
variables:
ON_SCHEDULE: "true"
CI_DESCRIPTION: Nightly
Expand All @@ -138,21 +139,6 @@ matlab nightly:
project: softwareradiosystems/srsgnb_matlab
branch: master

plugin nightly:
stage: ci
rules:
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
variables:
ON_SCHEDULE: "true"
CI_DESCRIPTION: Nightly
SRSRAN_COMMIT: $CI_COMMIT_SHA
NOTIFY_SLACK: "true"
inherit:
variables: false
trigger:
project: ${PLUGIN_REPO}
branch: main

matlab weekly:
stage: ci
rules:
Expand Down Expand Up @@ -201,7 +187,7 @@ full-code-format:
- if: $ON_MR
changes:
- .clang-format
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/

.codechecker:
image: ${CR_REGISTRY_URI}/srsgnb/codechecker:${DOCKER_BUILDER_VERSION}
Expand Down Expand Up @@ -237,6 +223,11 @@ full-code-format:
-*lib/asn1
-*lib/phy/generic_functions/fftx/lib_fftx_dftbat_srcs
-*lib/phy/generic_functions/fftx/lib_fftx_idftbat_srcs" >/tmp/codechecker_skip
- |
if [[ $CI_MERGE_REQUEST_LABELS != *"ci-no-plugin"* && -n $PLUGIN_BRANCH ]]; then
git submodule add https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_SHELL_SSH_HOST}/${PLUGIN_REPO}.git ${PLUGIN_PATH}
git submodule set-branch --branch ${PLUGIN_BRANCH} ${PLUGIN_PATH}
fi
- |
export CC=/usr/bin/clang
export CXX=/usr/bin/clang++
Expand Down Expand Up @@ -279,6 +270,7 @@ clang-tidy:
when: manual
allow_failure: false
variables:
PLUGIN_BRANCH: $MR_PLUGIN_REF
ANALYZER: clang-tidy
ANALYZER_ARGS: --analyzer-config clang-tidy:take-config-from-directory=true --tidy-config .clang-tidy
ARTIFACT_EXTRA_PATH: "/index.html"
Expand Down Expand Up @@ -447,7 +439,7 @@ unit coverage:
unit coverage dev:
extends: unit coverage
rules:
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
variables:
coverage_report: full
when: always # Even if previous stages/required jobs fail
Expand All @@ -458,7 +450,7 @@ unit coverage dev:
pages:
stage: documentation
rules:
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
when: always # Even if previous stages/required jobs fail
allow_failure: true
image: ${GITLAB_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:1.9.8-1.2023.7
Expand Down Expand Up @@ -511,7 +503,7 @@ update agpl main dryrun:
extends: update private branch
stage: .post
rules:
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
when: always
variables:
PRIVATE_BRANCH: agpl_main
Expand All @@ -523,7 +515,7 @@ create-tags:
extends: .create-tag
stage: .post
rules:
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
when: delayed
start_in: 3 hours
script:
Expand Down
8 changes: 4 additions & 4 deletions .gitlab/ci-shared/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ variables:
CACHE_COMPRESSION_LEVEL: slowest
CACHE_REQUEST_TIMEOUT: 5 # minutes - 10 by default
# K8
KUBERNETES_CPU_REQUEST: 6
KUBERNETES_CPU_LIMIT: 6
KUBERNETES_MEMORY_REQUEST: 12Gi
KUBERNETES_MEMORY_LIMIT: 12Gi
KUBERNETES_CPU_REQUEST: ${SRS_CPU_LIMIT}
KUBERNETES_CPU_LIMIT: ${SRS_CPU_LIMIT}
KUBERNETES_MEMORY_REQUEST: ${SRS_MEMORY_LIMIT}
KUBERNETES_MEMORY_LIMIT: ${SRS_MEMORY_LIMIT}
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "40G"
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "40G"
tags:
Expand Down
10 changes: 5 additions & 5 deletions .gitlab/ci-shared/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ variables:
TRANSFER_METER_FREQUENCY: 5s
ARTIFACT_COMPRESSION_LEVEL: slowest
RUNNER_AFTER_SCRIPT_TIMEOUT: 1m
KUBERNETES_CPU_REQUEST: 2
KUBERNETES_CPU_LIMIT: 2
KUBERNETES_CPU_REQUEST: 1
KUBERNETES_CPU_LIMIT: 1
KUBERNETES_MEMORY_REQUEST: 2Gi
KUBERNETES_MEMORY_LIMIT: 2Gi
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "20G"
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "20G"
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "10G"
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "10G"
<<: *setup_kube_variables
GROUP: zmq
tags:
- "${RETINA_TAG}"
- retina-e2e-amd64
artifacts:
paths:
- ${SRSRANDIR}/tests/e2e/log
Expand Down
5 changes: 4 additions & 1 deletion .gitlab/ci-shared/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variables:
######
# CI #
######
is using latest:
.is using latest:
image: ubuntu:24.04
stage: ci
rules:
Expand All @@ -38,6 +38,9 @@ is using latest:
echo "Please update to latest srsRAN commit: $SRSRAN_LATEST_COMMIT"
exit 1
fi
is using latest:
extends: .is using latest
allow_failure: true

download srsran:
Expand Down
Loading

0 comments on commit e74f7f3

Please sign in to comment.