diff mbox series

[master,RFC,10/16] linalg: deprecate

Message ID 20240805043713.172555-10-denis@denix.org
State RFC
Delegated to: Ryan Eatmon
Headers show
Series [master,RFC,01/16] ti-analytics: remove | expand

Commit Message

Denys Dmytriyenko Aug. 5, 2024, 4:37 a.m. UTC
From: Denys Dmytriyenko <denys@konsulko.com>

Remove linalg component as deprecated and not maintained.

This component was offloading processing tasks to DSP using heavily
modified OpenCL/OpenCV forks of old versions of corresponding upstream
projects on legacy platforms.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 ...001-Makefile-fix-toolchain-variables.patch | 194 ------------------
 ...RALLEL_MAKE-variable-to-overwrite-j8.patch |  66 ------
 .../recipes-ti/linalg/linalg-examples_git.bb  |  34 ---
 .../recipes-ti/linalg/linalg.inc              |  56 -----
 .../recipes-ti/linalg/linalg_git.bb           |  25 ---
 5 files changed, 375 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch
 delete mode 100644 meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch
 delete mode 100644 meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb
 delete mode 100644 meta-arago-extras/recipes-ti/linalg/linalg.inc
 delete mode 100644 meta-arago-extras/recipes-ti/linalg/linalg_git.bb
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch b/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch
deleted file mode 100644
index df387977..00000000
--- a/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch
+++ /dev/null
@@ -1,194 +0,0 @@ 
-From a99f267c7dd799cd66f64fa41a3bd7b5c5d6f8a1 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Sun, 26 Mar 2017 18:17:06 -0400
-Subject: [PATCH] Makefile: fix toolchain variables
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- examples/arm+dsp/make.inc                         |  1 -
- src/ti/linalg/blis/config/cortex-a15/make_defs.mk |  1 -
- src/ti/linalg/cblas/Makefile.ARM                  |  4 +---
- src/ti/linalg/clapack/make.inc.ARM                |  8 +++-----
- src/ti/linalg/clapack/make.inc.ARMBLAS            | 10 ++++------
- src/ti/linalg/clapack/make.inc.ARMOpenCL          |  8 +++-----
- src/ti/linalg/make.inc                            |  6 +-----
- src/ti/linalg/tuning/make.inc                     |  1 -
- 8 files changed, 12 insertions(+), 27 deletions(-)
-
-diff --git a/examples/arm+dsp/make.inc b/examples/arm+dsp/make.inc
-index c3a042d..e916b97 100644
---- a/examples/arm+dsp/make.inc
-+++ b/examples/arm+dsp/make.inc
-@@ -11,7 +11,6 @@ ifneq (,$(findstring 86, $(UNAME_M)))
- 
-     # gcc ARM cross compiler will not, by default, search the host's
-     # /usr/include.  Explicitly specify here to find dependent vendor headers
--    CC = arm-linux-gnueabihf-gcc
- else
-     CC = gcc 
- endif
-diff --git a/src/ti/linalg/blis/config/cortex-a15/make_defs.mk b/src/ti/linalg/blis/config/cortex-a15/make_defs.mk
-index 58130a0..13e10be 100644
---- a/src/ti/linalg/blis/config/cortex-a15/make_defs.mk
-+++ b/src/ti/linalg/blis/config/cortex-a15/make_defs.mk
-@@ -74,7 +74,6 @@ GIT_LOG    := $(GIT) log --decorate
- #
- 
- # --- Determine the C compiler and related flags ---
--CC             := arm-linux-gnueabihf-gcc
- #CC             := gcc
- # Enable IEEE Standard 1003.1-2004 (POSIX.1d). 
- # NOTE: This is needed to enable posix_memalign().
-diff --git a/src/ti/linalg/cblas/Makefile.ARM b/src/ti/linalg/cblas/Makefile.ARM
-index 3702887..e065831 100644
---- a/src/ti/linalg/cblas/Makefile.ARM
-+++ b/src/ti/linalg/cblas/Makefile.ARM
-@@ -32,8 +32,6 @@ LN_S = ln -sf
- # Compilers
- #-----------------------------------------------------------------------------
- 
--CC = arm-linux-gnueabihf-gcc
--FC = arm-linux-gnueabihf-gfortran
- LOADER = $(FC)
- 
- #-----------------------------------------------------------------------------
-@@ -47,6 +45,6 @@ FFLAGS = -O2
- # Archive programs and flags
- #-----------------------------------------------------------------------------
- 
--ARCH = arm-linux-gnueabihf-ar
-+ARCH = $(AR)
- ARCHFLAGS = r
- RANLIB = echo
-diff --git a/src/ti/linalg/clapack/make.inc.ARM b/src/ti/linalg/clapack/make.inc.ARM
-index 0fdbe72..204904b 100644
---- a/src/ti/linalg/clapack/make.inc.ARM
-+++ b/src/ti/linalg/clapack/make.inc.ARM
-@@ -23,10 +23,9 @@ PLAT = _ARM
- # This is used to compile C libary
- #CC        = arm-linux-gnueabihf-gcc -DNO_BLAS_WRAP
- # if no wrapping of the blas library is needed, uncomment next line
--CC        = arm-linux-gnueabihf-gcc 
- CFLAGS    = -O2 -I$(TOPDIR)/INCLUDE 
--LINKER    = arm-linux-gnueabihf-ld
--LOADER    = arm-linux-gnueabihf-gcc
-+LINKER    = $(LD)
-+LOADER    = $(CC)
- LOADOPTS  = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib
- NOOPT     = -O0 -I$(TOPDIR)/INCLUDE
- DRVCFLAGS = $(CFLAGS)
-@@ -51,9 +50,8 @@ TIMER    = INT_CPU_TIME
- #  The archiver and the flag(s) to use when building archive (library)
- #  If you system has no ranlib, set RANLIB = echo.
- #
--ARCH     = arm-linux-gnueabihf-ar
-+ARCH     = $(AR)
- ARCHFLAGS= cr
--RANLIB   = arm-linux-gnueabihf-ranlib
- #
- #  The location of BLAS library for linking the testing programs.
- #  The target's machine-specific, optimized BLAS library should be
-diff --git a/src/ti/linalg/clapack/make.inc.ARMBLAS b/src/ti/linalg/clapack/make.inc.ARMBLAS
-index e3b1b04..d95763c 100644
---- a/src/ti/linalg/clapack/make.inc.ARMBLAS
-+++ b/src/ti/linalg/clapack/make.inc.ARMBLAS
-@@ -23,10 +23,9 @@ PLAT = _ARMBLAS
- # This is used to compile C libary
- #CC        = arm-linux-gnueabihf-gcc
- # if no wrapping of the blas library is needed, uncomment next line
--CC        = arm-linux-gnueabihf-gcc -DNO_BLAS_WRAP
--CFLAGS    = -O3 -I$(TOPDIR)/INCLUDE
--LINKER    = arm-linux-gnueabihf-ld
--LOADER    = arm-linux-gnueabihf-gcc
-+CFLAGS    = -O3 -I$(TOPDIR)/INCLUDE -DNO_BLAS_WRAP
-+LINKER    = $(LD)
-+LOADER    = $(CC)
- LOADOPTS  =
- NOOPT     = -O0 -I$(TOPDIR)/INCLUDE
- DRVCFLAGS = $(CFLAGS)
-@@ -51,9 +50,8 @@ TIMER    = INT_CPU_TIME
- #  The archiver and the flag(s) to use when building archive (library)
- #  If you system has no ranlib, set RANLIB = echo.
- #
--ARCH     = arm-linux-gnueabihf-ar
-+ARCH     = $(AR)
- ARCHFLAGS= cr
--RANLIB   = arm-linux-gnueabihf-ranlib
- #
- #  The location of BLAS library for linking the testing programs.
- #  The target's machine-specific, optimized BLAS library should be
-diff --git a/src/ti/linalg/clapack/make.inc.ARMOpenCL b/src/ti/linalg/clapack/make.inc.ARMOpenCL
-index 036b3d1..1acc421 100644
---- a/src/ti/linalg/clapack/make.inc.ARMOpenCL
-+++ b/src/ti/linalg/clapack/make.inc.ARMOpenCL
-@@ -21,12 +21,11 @@ PLAT = _ARM
- #
- #######################################################
- # This is used to compile C libary
--CC        = arm-linux-gnueabihf-gcc #-pg
- # if no wrapping of the blas library is needed, uncomment next line
- #CC        = arm-linux-gnueabihf-gcc -DNO_BLAS_WRAP
- CFLAGS    = -O2 -I$(TOPDIR)/INCLUDE #-g 
--LINKER    = arm-linux-gnueabihf-ld
--LOADER    = arm-linux-gnueabihf-gcc
-+LINKER    = $(LD)
-+LOADER    = $(CC)
- LOADOPTS  = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib
- NOOPT     = -O0 -I$(TOPDIR)/INCLUDE
- DRVCFLAGS = $(CFLAGS)
-@@ -51,9 +50,8 @@ TIMER    = INT_CPU_TIME
- #  The archiver and the flag(s) to use when building archive (library)
- #  If you system has no ranlib, set RANLIB = echo.
- #
--ARCH     = arm-linux-gnueabihf-ar
-+ARCH     = $(AR)
- ARCHFLAGS= cr
--RANLIB   = arm-linux-gnueabihf-ranlib
- #
- #  The location of BLAS library for linking the testing programs.
- #  The target's machine-specific, optimized BLAS library should be
-diff --git a/src/ti/linalg/make.inc b/src/ti/linalg/make.inc
-index b2e1afe..8588019 100644
---- a/src/ti/linalg/make.inc
-+++ b/src/ti/linalg/make.inc
-@@ -1,5 +1,4 @@
--
--CPP   = g++
-+CPP = $(CXX)
- CL6X  = cl6x -mv6600 --abi=eabi $(DSP_INCLUDE)
- CLOCL = clocl
- 
-@@ -7,8 +6,6 @@ LIBS  = -lOpenCL -locl_util #-lstdc++ -lrt
- 
- UNAME_M :=$(shell uname -m)
- 
--OBJCOPY = arm-linux-gnueabihf-objcopy
--
- ifneq (,$(findstring 86, $(UNAME_M)))
-     .DEFAULT_GOAL := cross
- 
-@@ -29,7 +26,6 @@ ifneq (,$(findstring 86, $(UNAME_M)))
- 
-     # gcc ARM cross compiler will not, by default, search the host's
-     # /usr/include.  Explicitly specify here to find dependent vendor headers
--    cross: override CPP = arm-linux-gnueabihf-g++
-     cross: CPP_FLAGS += -I$(TARGET_ROOTDIR)/usr/include -idirafter /usr/include
-     #cross: CL6X_FLAGS += -I$(OMP_DIR)/packages/ti/runtime/openmp
- 
-diff --git a/src/ti/linalg/tuning/make.inc b/src/ti/linalg/tuning/make.inc
-index cd3c653..ecce3d9 100644
---- a/src/ti/linalg/tuning/make.inc
-+++ b/src/ti/linalg/tuning/make.inc
-@@ -11,7 +11,6 @@ ifneq (,$(findstring 86, $(UNAME_M)))
- 
-     # gcc ARM cross compiler will not, by default, search the host's
-     # /usr/include.  Explicitly specify here to find dependent vendor headers
--    CC = arm-linux-gnueabihf-gcc
- else
-     CC = gcc 
- endif
--- 
-2.7.4
-
diff --git a/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch b/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch
deleted file mode 100644
index 7d2f1409..00000000
--- a/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch
+++ /dev/null
@@ -1,66 +0,0 @@ 
-From 54378094d58c79a9d5ff6c1cc17d7bfd9c497dab Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Wed, 29 Mar 2017 13:09:05 -0400
-Subject: [PATCH] Makefile: pass PARALLEL_MAKE variable to overwrite -j8
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- src/ti/linalg/Makefile | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/ti/linalg/Makefile b/src/ti/linalg/Makefile
-index 90b8ef4..8d8e338 100644
---- a/src/ti/linalg/Makefile
-+++ b/src/ti/linalg/Makefile
-@@ -13,6 +13,8 @@ CLAPACK_HEADERS =$(LINALG_CLAPACK_DIR)/INCLUDE/blaswrap.h
- CLAPACK_HEADERS+=$(LINALG_CLAPACK_DIR)/INCLUDE/clapack.h  
- CLAPACK_HEADERS+=$(LINALG_CLAPACK_DIR)/INCLUDE/f2c.h  
- 
-+PARALLEL_MAKE ?= "-j8"
-+
- ifneq (,$(findstring DSP,$(MAKECMDGOALS)))
- 
- ifeq ($(LIBOS),LIB_RTOS)
-@@ -52,7 +54,7 @@ endif
- DSPlibs:
- 	cd $(LINALG_CBLAS_DIR); make arch=C66 alllib  || exit 1; \
- 	cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; \
--	make -j8 MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES) || exit 1; make install; \
-+	make $(PARALLEL_MAKE) MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES) || exit 1; make install; \
- 	cd ../$(LINALG_TICBLAS_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES) || exit 1; cd ../lib; \
- 	echo "combining BLIS, CBLAS, and TICBLAS libraries into one: libcblas.ae66"; \
- 	rm -rf blas_objs blis_objs; mkdir blas_objs blis_objs; cd blis_objs; ar x ../../../blis/install/$(BLIS_CFG)/lib/libblis.ae66; chmod +rw *; \
-@@ -63,8 +65,8 @@ DSPlibs:
- # Build ARM code for ARM+DSP platforms
- ARMlibs:
- 	cd $(LINALG_CBLAS_DIR); make arch=ARM alllib || exit 1; \
--	cd ../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make -j8 NUM_ARM_CORES=$(NUM_ARM_CORES) || exit 1; make install; \
--	cd ../$(LINALG_CLAPACK_DIR); make f2clib || exit 1; make cblaswrap || exit 1; cd SRC; make -j8 || exit 1; cd ..
-+	cd ../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make $(PARALLEL_MAKE) NUM_ARM_CORES=$(NUM_ARM_CORES) || exit 1; make install; \
-+	cd ../$(LINALG_CLAPACK_DIR); make f2clib || exit 1; make cblaswrap || exit 1; cd SRC; make $(PARALLEL_MAKE) || exit 1; cd ..
- 
- # Build host-callable libraries for ARM+DSP platforms. 
- # BLAS has a single archive: libcblas_armplusdsp.a, which includes:
-@@ -91,7 +93,7 @@ ARMplusDSP: DSPlibs ARMlibs
- cleanDSPlibs:
- 	rm -f lib/*
- 	cd $(LINALG_CBLAS_DIR); make arch=C66 clean; \
--	cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; make -j8 clean; rm -r install/$(BLIS_CFG); \
-+	cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; make $(PARALLEL_MAKE) clean; rm -r install/$(BLIS_CFG); \
- 	cd ../$(LINALG_TICBLAS_DIR)/src; make clean; 
- 
- cleanARMlibs:
-@@ -103,7 +105,7 @@ cleanARMlibs:
- 
- BLIStest:
- 	cd $(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; \
--	cd testsuite; make lib=OpenCLCBLAS -j8 
-+	cd testsuite; make lib=OpenCLCBLAS $(PARALLEL_MAKE)
- 
- BLIStestDSP:
- 	cd $(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; \
--- 
-2.7.4
-
diff --git a/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb b/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb
deleted file mode 100644
index 0871193f..00000000
--- a/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@ 
-DESCRIPTION = "TI Linear Algebra Library examples"
-
-include linalg.inc
-PR = "${INC_PR}.0"
-
-DEPENDS += "linalg"
-RDEPENDS:${PN} += "opencl-runtime"
-
-export LINALG_DIR = "${LINALG_INSTALL_DIR}"
-
-EXAMPLES_ROOT = "${WORKDIR}/git/examples/arm+dsp"
-
-do_compile() {
-    cd examples/arm+dsp
-    make
-    # Remove object files before installing so that the binaries are not present
-    find . -name "*.obj" -type f -delete
-    find . -name "*.o" -type f -delete
-}
-
-do_install() {
-    install -d ${D}${datadir}/ti/examples/linalg
-    cp -r examples/arm+dsp/* ${D}${datadir}/ti/examples/linalg
-}
-
-FILES:${PN} += "\
-    ${datadir}/ti/examples/linalg/* \
-"
-
-FILES:${PN}-dbg += "\
-    ${datadir}/ti/examples/linalg/*/.debug \
-"
-
-INSANE_SKIP:${PN} = "arch ldflags textrel"
diff --git a/meta-arago-extras/recipes-ti/linalg/linalg.inc b/meta-arago-extras/recipes-ti/linalg/linalg.inc
deleted file mode 100644
index 32459847..00000000
--- a/meta-arago-extras/recipes-ti/linalg/linalg.inc
+++ /dev/null
@@ -1,56 +0,0 @@ 
-HOMEPAGE = "git://git.ti.com/git/dense-linear-algebra-libraries/linalg.git"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://src/ti/linalg/docs/LINALG_1.2.0_manifest.html;md5=f30895e41e5947c3439b1ad4cf4c8555"
-
-PV = "1_2_0_0"
-INC_PR = "r7"
-
-COMPATIBLE_MACHINE = "dra7xx"
-
-require recipes-ti/includes/arago-paths.inc
-require recipes-ti/includes/ti-staging.inc
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "dsp"
-REQUIRED_DISTRO_FEATURES = "opencl openmp"
-
-SRC_URI = " \
-	git://git.ti.com/git/dense-linear-algebra-libraries/linalg.git;protocol=https;branch=${BRANCH} \
-	file://0001-Makefile-fix-toolchain-variables.patch \
-	file://0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch \
-"
-
-BRANCH = "master"
-SRCREV = "01960b319783b29aacf12b2a72606b28d657b78e"
-
-DEPENDS = " \
-	common-csl-ip \
-	libarch \
-	ti-xdctools-native \
-	ti-ipc-rtos \
-	ti-sysbios \
-	ti-cgt6x-native \
-	ti-xdais \
-	ti-framework-components \
-	libulm \
-	openmp-rtos \
-	opencl \
-	clocl-native \
-	doxygen-native \
-	zip-native \
-"
-
-S = "${WORKDIR}/git"
-
-export TI_OCL_INSTALL_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/opencl"
-export CGTROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export XDC_DIR = "${XDC_INSTALL_DIR}"
-export BIOS_DIR= "${SYSBIOS_INSTALL_DIR}"
-export XDAIS_DIR = "${XDAIS_INSTALL_DIR}"
-export FC_DIR = "${FC_INSTALL_DIR}"
-export PDK_DIR = "${PDK_INSTALL_DIR}"
-export OMP_DIR ="${OMP_INSTALL_DIR}"
-export LIBARCH_DIR = "${LIBARCH_INSTALL_DIR}"
-export TARGET_ROOTDIR="${STAGING_DIR_TARGET}"
diff --git a/meta-arago-extras/recipes-ti/linalg/linalg_git.bb b/meta-arago-extras/recipes-ti/linalg/linalg_git.bb
deleted file mode 100644
index aa87f5f2..00000000
--- a/meta-arago-extras/recipes-ti/linalg/linalg_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@ 
-DESCRIPTION = "TI Linear Algebra Library"
-
-include linalg.inc
-PR = "${INC_PR}.0"
-
-TARGET:dra7xx        = "SOC_AM572x"
-MEM_MODEL:dra7xx     = "Small"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_compile() {
-	make -f build/Makefile MEM_MODEL=${MEM_MODEL} TARGET=${TARGET} LIBOS=LIB_OPENCL PARALLEL_MAKE="${PARALLEL_MAKE}"
-}
-
-do_install() {
-	install -d ${D}${LINALG_INSTALL_DIR_RECIPE}
-	cp -r exports/linalg_${PV}/* ${D}${LINALG_INSTALL_DIR_RECIPE}
-}
-
-# to create a package for LINALG
-FILES:${PN}-dev += "${LINALG_INSTALL_DIR_RECIPE}"
-
-INSANE_SKIP:${PN}-dev = "arch staticdev"
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN}-dev += "bash perl"