remove cblas and lapack dependency, as the calling code can't be called in present master branch (likely never worked/fished code

CMakeLists.txt

@@ -926,7 +926,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss_gen.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c
-  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
+  #${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/uci_tools_ue.c
@@ -1072,16 +1072,8 @@ add_dependencies(PHY_COMMON dfts)
 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
-pkg_check_modules(blas REQUIRED blas)
-pkg_check_modules(lapacke REQUIRED lapacke)
-
 add_library(PHY_UE ${PHY_SRC_UE})
 target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
-# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` and
-# `cblas_INCLUDE_DIRS` will be empty for Ubuntu, a no-op
-pkg_check_modules(cblas cblas)
-target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
-target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${cblas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
 
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
@@ -1773,7 +1765,6 @@ target_link_libraries(lte-softmodem PRIVATE
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(lte-softmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})
 
 if(E2_AGENT)
   target_link_libraries(lte-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
@@ -1824,7 +1815,6 @@ target_link_libraries(lte-uesoftmodem PRIVATE
 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})
 
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-uesoftmodem PRIVATE

cmake_targets/tools/build_helper

@@ -496,9 +496,6 @@ check_install_oai_software() {
         ninja-build \
 	pkg-config \
 	git \
-	libblas-dev \
-	liblapack-dev \
-	liblapacke-dev \
 	libreadline-dev \
 	libconfig-dev \
 	libsctp-dev  \
@@ -536,10 +533,6 @@ check_install_oai_software() {
       openssl-devel \
       patch \
       readline-devel \
-      lapack \
-      lapack-devel \
-      blas \
-      blas-devel \
       vim-common \
       zlib-devel \
       yaml-cpp-devel

doc/cross-compile.md

@@ -42,10 +42,7 @@ sudo apt install -y gcc-aarch64-linux-gnu \
                     g++-aarch64-linux-gnu
 
 sudo apt-get install -y \
-    libblas-dev:arm64 \
     libc6-dev-i386 \
-    liblapack-dev:arm64 \
-    liblapacke-dev:arm64 \
     libreadline-dev:arm64 \
     libgnutls28-dev:arm64 \
     libconfig-dev:arm64 \

docker/Dockerfile.base.ubuntu.cross-arm64

@@ -57,9 +57,6 @@ RUN apt-get update && \
       tzdata \
       xxd \
       # ARM64 packages
-      libblas-dev:arm64 \
-      liblapack-dev:arm64 \
-      liblapacke-dev:arm64 \
       libreadline-dev:arm64 \
       libgnutls28-dev:arm64 \
       libconfig-dev:arm64 \

docker/Dockerfile.eNB.ubuntu

@@ -51,7 +51,6 @@ RUN apt-get update && \
         libboost-system1.83.0 \
         libboost-program-options1.83.0 \
         tzdata \
-        libblas3 \
         libconfig9 \
         openssl \
         net-tools \
@@ -74,8 +73,7 @@ RUN apt-get update && \
 # if the --sanitize option was used to build, additional packages are required
     /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libasan8 \ 
-        libubsan1 \
+        libubsan1 ; fi' && \
-        liblapacke; fi' && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile.gNB.aerial.ubuntu

@@ -70,7 +70,6 @@ RUN apt-get update && \
         procps \
         libsctp1 \
         tzdata \
-        libblas3 \
         libconfig9 \
         openssl \
         net-tools \

docker/Dockerfile.gNB.aerial.ubuntu.sanitize-address

@@ -69,7 +69,6 @@ RUN apt-get update && \
         procps \
         libsctp1 \
         tzdata \
-        libblas3 \
         libconfig9 \
         openssl \
         net-tools \

docker/Dockerfile.gNB.aw2s.ubuntu

@@ -48,7 +48,6 @@ RUN apt-get update && \
         procps \
         libsctp1 \
         tzdata \
-        libblas3 \
         libc6 \
         libconfig9 \
         gdb \

docker/Dockerfile.gNB.fhi72.rhel9

@@ -101,10 +101,6 @@ COPY --from=gnb-build /usr/local/lib64/flexric /usr/local/lib64/flexric
 COPY --from=gnb-base \
     /lib64/libconfig.so.11 \
     /lib64/libforms.so.2 \
-    /lib64/libblas.so.3 \
-    /lib64/libcblas.so.3 \
-    /lib64/liblapack.so.3 \
-    /lib64/liblapacke.so.3 \
     /lib64/libicudata.so.67 \
     /lib64/libicui18n.so.67 \
     /lib64/libicuuc.so.67 \

docker/Dockerfile.gNB.fhi72.rocky

@@ -90,10 +90,6 @@ COPY --from=gnb-build /usr/local/lib64/flexric /usr/local/lib64/flexric
 COPY --from=gnb-base \
     /lib64/libconfig.so.11 \
     /lib64/libforms.so.2 \
-    /lib64/libblas.so.3 \
-    /lib64/libcblas.so.3 \
-    /lib64/liblapack.so.3 \
-    /lib64/liblapacke.so.3 \
     /lib64/libicudata.so.67 \
     /lib64/libicui18n.so.67 \
     /lib64/libicuuc.so.67 \

docker/Dockerfile.gNB.fhi72.ubuntu

@@ -44,7 +44,6 @@ RUN apt-get update && \
         pkg-config \
         libsctp1 \
         tzdata \
-        libblas3 \
         libconfig9 \
         openssl \
         net-tools \
@@ -63,8 +62,7 @@ RUN apt-get update && \
 # if the --sanitize option was used to build, additional packages are required
     /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libasan8 \
-        libubsan1 \
+        libubsan1 ; fi' && \
-        liblapacke; fi' && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/oai-gnb/bin

docker/Dockerfile.gNB.ubuntu

@@ -51,7 +51,6 @@ RUN apt-get update && \
         libboost-system1.83.0 \
         libboost-program-options1.83.0 \
         tzdata \
-        libblas3 \
         libconfig9 \
         openssl \
         net-tools \
@@ -69,8 +68,7 @@ RUN apt-get update && \
 # if the --sanitize option was used to build, additional packages are required
     /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libasan8 \ 
-        libubsan1 \
+        libubsan1; fi' && \
-        liblapacke; fi' && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile.lteRU.ubuntu

@@ -49,7 +49,6 @@ RUN apt-get update && \
         libboost-thread1.83.0 \
         libboost-system1.83.0 \
         libboost-program-options1.83.0 \
-        libblas3 \
         libconfig9 \
         net-tools \
         gdb \

docker/Dockerfile.lteUE.rhel9

@@ -73,10 +73,6 @@ COPY --from=lte-ue-build \
 
 COPY --from=lte-ue-base \
     /lib64/libconfig.so.11 \
-    /lib64/libblas.so.3 \
-    /lib64/libcblas.so.3 \
-    /lib64/liblapack.so.3 \
-    /lib64/liblapacke.so.3 \
     /lib64/libboost_chrono.so.1.75.0 \
     /lib64/libboost_date_time.so.1.75.0 \
     /lib64/libboost_filesystem.so.1.75.0 \

docker/Dockerfile.lteUE.rocky

@@ -74,10 +74,6 @@ COPY --from=lte-ue-build \
 
 COPY --from=lte-ue-base \
     /lib64/libconfig.so.11 \
-    /lib64/libblas.so.3 \
-    /lib64/libcblas.so.3 \
-    /lib64/liblapack.so.3 \
-    /lib64/liblapacke.so.3 \
     /lib64/libboost_chrono.so.1.75.0 \
     /lib64/libboost_date_time.so.1.75.0 \
     /lib64/libboost_filesystem.so.1.75.0 \

docker/Dockerfile.lteUE.ubuntu

@@ -51,8 +51,6 @@ RUN apt-get update && \
         libboost-system1.83.0 \
         libboost-program-options1.83.0 \
         tzdata \
-        liblapacke \
-        libblas3 \
         libconfig9 \
         openssl \
         net-tools \
@@ -75,8 +73,7 @@ RUN apt-get update && \
 # if the --sanitize option was used to build, additional packages are required
     /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libasan8 \ 
-        libubsan1 \
+        libubsan1 ; fi' && \
-        liblapacke; fi' && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile.nr-cuup.ubuntu

@@ -47,8 +47,7 @@ RUN apt-get update && \
 # if the --sanitize option was used to build, additional packages are required
     /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libasan8 \ 
-        libubsan1 \
+        libubsan1; fi' && \
-        liblapacke; fi' && \
     rm -rf /var/lib/apt/lists/*
 
 ## Copy E2 SM models

docker/Dockerfile.nrORU.fhi72.ubuntu

@@ -36,7 +36,6 @@ RUN apt-get update && \
         pkg-config \
         libsctp1 \
         tzdata \
-        libblas3 \
         libconfig9 \
         openssl \
         net-tools \

docker/Dockerfile.nrUE.ubuntu

@@ -52,8 +52,6 @@ RUN apt-get update && \
         libboost-system1.83.0 \
         libboost-program-options1.83.0 \
         tzdata \
-        liblapacke \
-        libblas3 \
         libconfig9 \
         openssl \
         net-tools \

docker/Dockerfile.phySim.rhel9

@@ -69,10 +69,6 @@ COPY --from=phy-sim-build /opt/oai-physim/bin/ /opt/oai-physim/bin/
 
 COPY --from=phy-sim-build \
     /oai-ran/cmake_targets/ran_build/build/libcoding.so \
-    /lib64/liblapacke.so.3 \
-    /lib64/libblas.so.3 \
-    /lib64/libcblas.so.3 \
-    /lib64/liblapack.so.3 \
     /usr/lib64/libasan.so.6 \
     /usr/lib64/libubsan.so.1 \
     /oai-ran/cmake_targets/ran_build/build/libdfts.so \

openair1/PHY/CODING/TESTBENCH/Makefile

@@ -44,12 +44,12 @@ $(OBJ) : %.o : %.c
 	$(CC) -c $(CFLAGS) -Wall -I$(TOP_DIR) -I$(TOP_DIR)/PHY/CODING -I$(OPENAIR0_DIR)/express-mimo/simulator/baseband/C/channel_decoder -o $@ $<
 
 ltetest: $(OBJ) ltetest.c
-	$(CC) ltetest.c -O2 -I$(TOP_DIR) -I$(TOP_DIR)/PHY/CODING -I$(OPENAIR0_DIR)/express-mimo/simulator/baseband/C/channel_decoder -o ltetest $(CFLAGS) $(OBJ) -lm -DOPENAIR_LTE -lblas -lrt
+	$(CC) ltetest.c -O2 -I$(TOP_DIR) -I$(TOP_DIR)/PHY/CODING -I$(OPENAIR0_DIR)/express-mimo/simulator/baseband/C/channel_decoder -o ltetest $(CFLAGS) $(OBJ) -lm -DOPENAIR_LTE -lrt
 
 pdcch_test: $(OBJ) pdcch_test.c
-	$(CC) pdcch_test.c -I$(TOP_DIR) -o pdcch_test $(CFLAGS) $(PHY_OBJS) -lm -lblas
+	$(CC) pdcch_test.c -I$(TOP_DIR) -o pdcch_test $(CFLAGS) $(PHY_OBJS) -lm
 viterbi_test: $(OBJ) viterbi_test.c
-	$(CC) viterbi_test.c -I$(TOP_DIR) -o viterbi_test $(CFLAGS) $(PHY_OBJS) -lm -lblas
+	$(CC) viterbi_test.c -I$(TOP_DIR) -o viterbi_test $(CFLAGS) $(PHY_OBJS) -lm
 
 clean: 
 	rm $(OBJ)

openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c

@@ -44,7 +44,7 @@
 #include "linear_preprocessing_rec.h"
 
 //#define DEBUG_MMSE
-#define USE_MMSE
+//#define USE_MMSE
 
 /* dynamic shift for LLR computation for TM3/4
  * set as command line argument, see lte-softmodem.c

openair1/SIMULATION/TOOLS/random_channel.c

@@ -1849,27 +1849,6 @@ int random_channel(channel_desc_t *desc, uint8_t abstraction_flag) {
       }
     }
 
-    /*
-    FIXME: Function cblas_zgemv has an undefined output (for the same input) after a second call in RHEL8 (acorr = nan)
-    alpha.r = 1.0;
-    alpha.i = 0.0;
-    beta.r = 0.0;
-    beta.i = 0.0;
-    cblas_zgemv(CblasRowMajor, CblasNoTrans, desc->nb_tx*desc->nb_rx, desc->nb_tx*desc->nb_rx,
-                (void *) &alpha, (void *) desc->R_sqrt[i/3], desc->nb_rx*desc->nb_tx,
-                (void *) anew, 1, (void *) &beta, (void *) acorr, 1);
-    */
-
-    /*
-    for (aarx=0;aarx<desc->nb_rx;aarx++) {
-      for (aatx=0;aatx<desc->nb_tx;aatx++) {
-        desc->a[i][aarx+(aatx*desc->nb_rx)].x = acorr[aarx+(aatx*desc->nb_rx)].x;
-        desc->a[i][aarx+(aatx*desc->nb_rx)].y = acorr[aarx+(aatx*desc->nb_rx)].y;
-        printf("tap %d, acorr1(%d,%d) = %f+1j*%f\n",i,aatx,aarx,acorr[aarx+(aatx*desc->nb_rx)].x, acorr[aarx+(aatx*desc->nb_rx)].y);
-      }
-    }
-    */
-
     if (desc->first_run==1) {
       memcpy(desc->a[i], acorr, desc->nb_tx * desc->nb_rx * sizeof(*acorr));
     } else {

openair2/UTIL/OMG/makefile

@@ -100,7 +100,7 @@ $(OBJ) : %.o : %.c
 $(L2_OBJS) : %.o : %.c
 	$(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) -o $@ $<
 
-physim : $(OBJ) $(L2_OBJS) OMG.c common.c static.c job.c rwp.c rwalk.c hashtable.c mobility_parser.c trace.c -I$(TOP_DIR) $(L2_incl) -o physim $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(L2_OBJS) -lm -lforms -L/usr/local/lib -lforms -lX11 -L/usr/X11R6/lib -lXpm -lblas -lpthread
+physim : $(OBJ) $(L2_OBJS) OMG.c common.c static.c job.c rwp.c rwalk.c hashtable.c mobility_parser.c trace.c -I$(TOP_DIR) $(L2_incl) -o physim $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(L2_OBJS) -lm -lforms -L/usr/local/lib -lforms -lX11 -L/usr/X11R6/lib -lXpm -lpthread
 
 clean:
 	rm -f physim

tools/packages/packages.cmake

@@ -62,7 +62,7 @@ if(PACKAGING_LTE)
     set(CPACK_RPM_PACKAGE_OAI-LTE_SUMMARY "OpenAirInterface LTE package")
     set(CPACK_RPM_PACKAGE_OAI-LTE_DESCRIPTION "${LTE_PACKAGE_DESCRIPTION}")
   else()
-    set(CPACK_DEBIAN_OAI-LTE_PACKAGE_DEPENDS "liboai-common, libblas3, liblapacke")
+    set(CPACK_DEBIAN_OAI-LTE_PACKAGE_DEPENDS "liboai-common")
     set(CPACK_DEBIAN_OAI-LTE_SUMMARY "OpenAirInterface LTE package")
     set(CPACK_DEBIAN_OAI-LTE_DESCRIPTION "${LTE_PACKAGE_DESCRIPTION}")
   endif()