Skip to content

Commit e74f7f3

Browse files
author
codebot
committed
Update main
# 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
2 parents e5d5b44 + 87a1ef1 commit e74f7f3

File tree

913 files changed

+29331
-64793
lines changed

Some content is hidden

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

913 files changed

+29331
-64793
lines changed

‎.clang-tidy‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Checks: '-*,
3636
-readability-identifier-length,
3737
-readability-implicit-bool-conversion,
3838
-readability-magic-numbers,
39+
-readability-math-missing-parentheses,
3940
-readability-static-accessed-through-instance,
4041
-readability-uppercase-literal-suffix'
4142
CheckOptions:

‎.gdbinit‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
python
2626

27+
import struct
28+
2729
###### static_vector<T, N> ########
2830

2931
class StaticVectorPrinter(object):
@@ -225,5 +227,44 @@ def make_slotted_vector(val):
225227

226228
gdb.pretty_printers.append(make_slotted_vector)
227229

230+
###### Brain Floating Point 16 (bf16_t) ######
231+
232+
class BFloat16(object):
233+
def __init__(self, val):
234+
self.__val = val
235+
236+
def to_string(self):
237+
value_uint16 = self.__val['val']
238+
value_uint32 = value_uint16.cast(gdb.lookup_type('uint32_t')) << 16
239+
value_float = struct.unpack('!f', struct.pack('!I', value_uint32))[0]
240+
return value_float
241+
242+
def display_hint(self):
243+
return None
244+
245+
def make_bf16_t(val):
246+
s = str(val.type.strip_typedefs())
247+
if 'srsran::strong_bf16_tag' in s:
248+
return BFloat16(val)
249+
250+
gdb.pretty_printers.append(make_bf16_t)
251+
252+
class BFloat16Complex(object):
253+
def __init__(self, val):
254+
self.__val = val
255+
256+
def to_string(self):
257+
return f'{self.__val["real"]} + {self.__val["imag"]}i'
258+
259+
def display_hint(self):
260+
return None
261+
262+
def make_cbf16_t(val):
263+
s = str(val.type.strip_typedefs())
264+
if s == 'srsran::cbf16_t':
265+
return BFloat16Complex(val)
266+
267+
gdb.pretty_printers.append(make_cbf16_t)
268+
228269
end
229270

‎.github/workflows/ccpp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [ubuntu-22.04, ubuntu-24.04]
19-
compiler: [gcc, clang]
18+
os: [ubuntu-24.04]
19+
compiler: [gcc]
2020
steps:
2121
- uses: actions/checkout@v3
2222
- name: Install Dependencies

‎.gitlab-ci.yml‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ variables:
6767
SLACK_CHANNEL_FAIL: "#ci_gnb"
6868
SLACK_CHANNEL_INFO_MSG: "#ci_gnb_verbose"
6969
AUTOREBASER_PRS_IN_QUEUE: 1
70+
MR_PLUGIN_REF: main
7071

7172
################################################################################
7273
## CI
@@ -75,14 +76,14 @@ job cleaner:
7576
extends: .job cleaner
7677
timeout: 4h
7778
rules:
78-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
79+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
7980

8081
pr reminder:
8182
extends: .pr reminder
8283
rules:
8384
- if: $NOTIFY_SLACK != "true"
8485
when: never
85-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
86+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
8687

8788
trigger builder:
8889
stage: ci
@@ -111,7 +112,7 @@ trigger docker:
111112
- docker/**/*.{yml,env,json,toml,py,sh,csv,py,toml}
112113
- docker/**/Dockerfile
113114
- .gdbinit
114-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
115+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
115116
variables:
116117
CI_DESCRIPTION: $CI_DESCRIPTION
117118
- if: $CI_DESCRIPTION =~ /Weekly/
@@ -126,7 +127,7 @@ trigger docker:
126127
matlab nightly:
127128
stage: ci
128129
rules:
129-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
130+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
130131
variables:
131132
ON_SCHEDULE: "true"
132133
CI_DESCRIPTION: Nightly
@@ -138,21 +139,6 @@ matlab nightly:
138139
project: softwareradiosystems/srsgnb_matlab
139140
branch: master
140141

141-
plugin nightly:
142-
stage: ci
143-
rules:
144-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
145-
variables:
146-
ON_SCHEDULE: "true"
147-
CI_DESCRIPTION: Nightly
148-
SRSRAN_COMMIT: $CI_COMMIT_SHA
149-
NOTIFY_SLACK: "true"
150-
inherit:
151-
variables: false
152-
trigger:
153-
project: ${PLUGIN_REPO}
154-
branch: main
155-
156142
matlab weekly:
157143
stage: ci
158144
rules:
@@ -201,7 +187,7 @@ full-code-format:
201187
- if: $ON_MR
202188
changes:
203189
- .clang-format
204-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
190+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
205191

206192
.codechecker:
207193
image: ${CR_REGISTRY_URI}/srsgnb/codechecker:${DOCKER_BUILDER_VERSION}
@@ -237,6 +223,11 @@ full-code-format:
237223
-*lib/asn1
238224
-*lib/phy/generic_functions/fftx/lib_fftx_dftbat_srcs
239225
-*lib/phy/generic_functions/fftx/lib_fftx_idftbat_srcs" >/tmp/codechecker_skip
226+
- |
227+
if [[ $CI_MERGE_REQUEST_LABELS != *"ci-no-plugin"* && -n $PLUGIN_BRANCH ]]; then
228+
git submodule add https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_SHELL_SSH_HOST}/${PLUGIN_REPO}.git ${PLUGIN_PATH}
229+
git submodule set-branch --branch ${PLUGIN_BRANCH} ${PLUGIN_PATH}
230+
fi
240231
- |
241232
export CC=/usr/bin/clang
242233
export CXX=/usr/bin/clang++
@@ -279,6 +270,7 @@ clang-tidy:
279270
when: manual
280271
allow_failure: false
281272
variables:
273+
PLUGIN_BRANCH: $MR_PLUGIN_REF
282274
ANALYZER: clang-tidy
283275
ANALYZER_ARGS: --analyzer-config clang-tidy:take-config-from-directory=true --tidy-config .clang-tidy
284276
ARTIFACT_EXTRA_PATH: "/index.html"
@@ -447,7 +439,7 @@ unit coverage:
447439
unit coverage dev:
448440
extends: unit coverage
449441
rules:
450-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
442+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
451443
variables:
452444
coverage_report: full
453445
when: always # Even if previous stages/required jobs fail
@@ -458,7 +450,7 @@ unit coverage dev:
458450
pages:
459451
stage: documentation
460452
rules:
461-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
453+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
462454
when: always # Even if previous stages/required jobs fail
463455
allow_failure: true
464456
image: ${GITLAB_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:1.9.8-1.2023.7
@@ -511,7 +503,7 @@ update agpl main dryrun:
511503
extends: update private branch
512504
stage: .post
513505
rules:
514-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
506+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
515507
when: always
516508
variables:
517509
PRIVATE_BRANCH: agpl_main
@@ -523,7 +515,7 @@ create-tags:
523515
extends: .create-tag
524516
stage: .post
525517
rules:
526-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
518+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
527519
when: delayed
528520
start_in: 3 hours
529521
script:

‎.gitlab/ci-shared/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ variables:
7070
CACHE_COMPRESSION_LEVEL: slowest
7171
CACHE_REQUEST_TIMEOUT: 5 # minutes - 10 by default
7272
# K8
73-
KUBERNETES_CPU_REQUEST: 6
74-
KUBERNETES_CPU_LIMIT: 6
75-
KUBERNETES_MEMORY_REQUEST: 12Gi
76-
KUBERNETES_MEMORY_LIMIT: 12Gi
73+
KUBERNETES_CPU_REQUEST: ${SRS_CPU_LIMIT}
74+
KUBERNETES_CPU_LIMIT: ${SRS_CPU_LIMIT}
75+
KUBERNETES_MEMORY_REQUEST: ${SRS_MEMORY_LIMIT}
76+
KUBERNETES_MEMORY_LIMIT: ${SRS_MEMORY_LIMIT}
7777
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "40G"
7878
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "40G"
7979
tags:

‎.gitlab/ci-shared/e2e.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ variables:
6969
TRANSFER_METER_FREQUENCY: 5s
7070
ARTIFACT_COMPRESSION_LEVEL: slowest
7171
RUNNER_AFTER_SCRIPT_TIMEOUT: 1m
72-
KUBERNETES_CPU_REQUEST: 2
73-
KUBERNETES_CPU_LIMIT: 2
72+
KUBERNETES_CPU_REQUEST: 1
73+
KUBERNETES_CPU_LIMIT: 1
7474
KUBERNETES_MEMORY_REQUEST: 2Gi
7575
KUBERNETES_MEMORY_LIMIT: 2Gi
76-
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "20G"
77-
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "20G"
76+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "10G"
77+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "10G"
7878
<<: *setup_kube_variables
7979
GROUP: zmq
8080
tags:
81-
- "${RETINA_TAG}"
81+
- retina-e2e-amd64
8282
artifacts:
8383
paths:
8484
- ${SRSRANDIR}/tests/e2e/log

‎.gitlab/ci-shared/plugin.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ variables:
2121
######
2222
# CI #
2323
######
24-
is using latest:
24+
.is using latest:
2525
image: ubuntu:24.04
2626
stage: ci
2727
rules:
@@ -38,6 +38,9 @@ is using latest:
3838
echo "Please update to latest srsRAN commit: $SRSRAN_LATEST_COMMIT"
3939
exit 1
4040
fi
41+
42+
is using latest:
43+
extends: .is using latest
4144
allow_failure: true
4245

4346
download srsran:

0 commit comments

Comments
 (0)