From 7220a3bf48cbfc4a1d4d4b940849a7149d29af93 Mon Sep 17 00:00:00 2001 From: Alin Jerpelea Date: Fri, 20 Dec 2024 05:44:24 +0100 Subject: [PATCH] mlearning: migrate to SPDX identifier Most tools used for compliance and SBOM generation use SPDX identifiers This change brings us a step closer to an easy SBOM generation. Signed-off-by: Alin Jerpelea --- mlearning/CMakeLists.txt | 2 ++ mlearning/Make.defs | 2 ++ mlearning/Makefile | 2 ++ mlearning/cmsis-nn/CMakeLists.txt | 2 ++ mlearning/cmsis-nn/Make.defs | 2 ++ mlearning/cmsis-nn/Makefile | 2 ++ mlearning/cmsis/Make.defs | 2 ++ mlearning/cmsis/Makefile | 2 ++ mlearning/cmsis/cmsis-nn-support_nnabla.patch | 20 +++++++++---------- mlearning/cmsis/libcmsisdsp/Make.defs | 2 ++ mlearning/cmsis/libcmsisdsp/Makefile | 2 ++ mlearning/cmsis/libcmsisnn/Make.defs | 2 ++ mlearning/cmsis/libcmsisnn/Makefile | 2 ++ mlearning/darknet/Make.defs | 2 ++ mlearning/darknet/Makefile | 2 ++ mlearning/libnnablart/Make.defs | 2 ++ mlearning/libnnablart/Makefile | 2 ++ mlearning/tflite-micro/CMakeLists.txt | 2 ++ mlearning/tflite-micro/Make.defs | 2 ++ mlearning/tflite-micro/Makefile | 2 ++ .../operators/neon/arm_convolve_s8.c | 5 ++--- .../operators/neon/arm_elementwise_add_s8.c | 5 ++--- .../neon/arm_nn_mat_mult_kernel_s8_s16.c | 5 ++--- .../neon/arm_q7_to_q15_with_offset.c | 5 ++--- mlearning/tflite-micro/tflm_syslog.cc | 2 ++ mlearning/tflite-micro/tflm_tool.cc | 2 ++ 26 files changed, 60 insertions(+), 22 deletions(-) diff --git a/mlearning/CMakeLists.txt b/mlearning/CMakeLists.txt index c4b8742ba..78ba1da4a 100644 --- a/mlearning/CMakeLists.txt +++ b/mlearning/CMakeLists.txt @@ -1,6 +1,8 @@ # ############################################################################## # apps/mlearning/CMakeLists.txt # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more contributor # license agreements. See the NOTICE file distributed with this work for # additional information regarding copyright ownership. The ASF licenses this diff --git a/mlearning/Make.defs b/mlearning/Make.defs index 5ad683160..6b5d35fe8 100644 --- a/mlearning/Make.defs +++ b/mlearning/Make.defs @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/Make.defs # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/Makefile b/mlearning/Makefile index bf7d539bb..435024a11 100644 --- a/mlearning/Makefile +++ b/mlearning/Makefile @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/Makefile # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/cmsis-nn/CMakeLists.txt b/mlearning/cmsis-nn/CMakeLists.txt index 43cbcfe89..e5997cb35 100644 --- a/mlearning/cmsis-nn/CMakeLists.txt +++ b/mlearning/cmsis-nn/CMakeLists.txt @@ -1,6 +1,8 @@ # ############################################################################## # apps/mlearning/cmsis-nn/CMakeLists.txt # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more contributor # license agreements. See the NOTICE file distributed with this work for # additional information regarding copyright ownership. The ASF licenses this diff --git a/mlearning/cmsis-nn/Make.defs b/mlearning/cmsis-nn/Make.defs index 669ca73a2..760173037 100644 --- a/mlearning/cmsis-nn/Make.defs +++ b/mlearning/cmsis-nn/Make.defs @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/cmsis/Make.defs # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/cmsis-nn/Makefile b/mlearning/cmsis-nn/Makefile index 9254c8502..cd8117275 100644 --- a/mlearning/cmsis-nn/Makefile +++ b/mlearning/cmsis-nn/Makefile @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/cmsis-nn/Makefile # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/cmsis/Make.defs b/mlearning/cmsis/Make.defs index e36031b92..845fa6017 100644 --- a/mlearning/cmsis/Make.defs +++ b/mlearning/cmsis/Make.defs @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/cmsis/Make.defs # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/cmsis/Makefile b/mlearning/cmsis/Makefile index 8bed4380e..0ddb4b330 100644 --- a/mlearning/cmsis/Makefile +++ b/mlearning/cmsis/Makefile @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/cmsis/Makefile # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/cmsis/cmsis-nn-support_nnabla.patch b/mlearning/cmsis/cmsis-nn-support_nnabla.patch index 4de8d6872..58e3a3d8d 100644 --- a/mlearning/cmsis/cmsis-nn-support_nnabla.patch +++ b/mlearning/cmsis/cmsis-nn-support_nnabla.patch @@ -11,10 +11,10 @@ to add the following function prototypes: +++ CMSIS_5/CMSIS/NN/Include/arm_nnfunctions_nnabla.h @@ -0,0 +1,217 @@ +/* -+ * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved. -+ * Copyright 2018 Sony Corporation + * + * SPDX-License-Identifier: Apache-2.0 ++ * SPDX-FileCopyrightText: 2010-2018 Arm Limited or its affiliates. ++ * SPDX-FileCopyrightText: 2018 Sony Corporation + * + * Licensed under the Apache License, Version 2.0 (the License); you may + * not use this file except in compliance with the License. @@ -237,10 +237,10 @@ Sony Corporation added this file to 5.4.0 for these reasons: +++ CMSIS_5/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_CHW_f32_basic_nonsquare.c @@ -0,0 +1,207 @@ +/* -+ * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved. -+ * Copyright 2018 Sony Corporation + * + * SPDX-License-Identifier: Apache-2.0 ++ * SPDX-FileCopyrightText: 2010-2018 Arm Limited or its affiliates. ++ * SPDX-FileCopyrightText: 2018 Sony Corporation + * + * Licensed under the Apache License, Version 2.0 (the License); you may + * not use this file except in compliance with the License. @@ -451,10 +451,10 @@ Sony Corporation added this file to 5.4.0 to support the CHW tensor layout +++ CMSIS_5/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_CHW_q15_basic_nonsquare.c @@ -0,0 +1,231 @@ +/* -+ * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved. -+ * Copyright 2018 Sony Corporation + * + * SPDX-License-Identifier: Apache-2.0 ++ * SPDX-FileCopyrightText: 2010-2018 Arm Limited or its affiliates. ++ * SPDX-FileCopyrightText: 2018 Sony Corporation + * + * Licensed under the Apache License, Version 2.0 (the License); you may + * not use this file except in compliance with the License. @@ -689,10 +689,10 @@ Sony Corporation added this file to 5.4.0 to support the CHW tensor layout +++ CMSIS_5/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_CHW_q7_basic_nonsquare.c @@ -0,0 +1,214 @@ +/* -+ * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved. -+ * Copyright 2018 Sony Corporation + * + * SPDX-License-Identifier: Apache-2.0 ++ * SPDX-FileCopyrightText: 2010-2018 Arm Limited or its affiliates. ++ * SPDX-FileCopyrightText: 2018 Sony Corporation + * + * Licensed under the Apache License, Version 2.0 (the License); you may + * not use this file except in compliance with the License. @@ -910,10 +910,10 @@ Sony Corporation added this file to 5.4.0 to support the CHW tensor layout +++ CMSIS_5/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_CHW_mat_mult_kernel_q7_q15.c @@ -0,0 +1,196 @@ +/* -+ * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved. -+ * Copyright 2018 Sony Corporation + * + * SPDX-License-Identifier: Apache-2.0 ++ * SPDX-FileCopyrightText: 2010-2018 Arm Limited or its affiliates. ++ * SPDX-FileCopyrightText: 2018 Sony Corporation + * + * Licensed under the Apache License, Version 2.0 (the License); you may + * not use this file except in compliance with the License. diff --git a/mlearning/cmsis/libcmsisdsp/Make.defs b/mlearning/cmsis/libcmsisdsp/Make.defs index de9d8ea51..df93ea678 100644 --- a/mlearning/cmsis/libcmsisdsp/Make.defs +++ b/mlearning/cmsis/libcmsisdsp/Make.defs @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/cmsis/libcmsisdsp/Make.defs # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/cmsis/libcmsisdsp/Makefile b/mlearning/cmsis/libcmsisdsp/Makefile index 8fd731685..141b7cafa 100644 --- a/mlearning/cmsis/libcmsisdsp/Makefile +++ b/mlearning/cmsis/libcmsisdsp/Makefile @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/cmsis/libcmsisdsp/Makefile # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/cmsis/libcmsisnn/Make.defs b/mlearning/cmsis/libcmsisnn/Make.defs index 187ff5557..5119cdb3d 100644 --- a/mlearning/cmsis/libcmsisnn/Make.defs +++ b/mlearning/cmsis/libcmsisnn/Make.defs @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/cmsis/libcmsisnn/Make.defs # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/cmsis/libcmsisnn/Makefile b/mlearning/cmsis/libcmsisnn/Makefile index 759b05f4c..63cb79e7c 100644 --- a/mlearning/cmsis/libcmsisnn/Makefile +++ b/mlearning/cmsis/libcmsisnn/Makefile @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/cmsis/libcmsisnn/Makefile # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/darknet/Make.defs b/mlearning/darknet/Make.defs index b06d5b534..41c1569e8 100644 --- a/mlearning/darknet/Make.defs +++ b/mlearning/darknet/Make.defs @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/darknet/Make.defs # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/darknet/Makefile b/mlearning/darknet/Makefile index cfb379466..627245fbd 100644 --- a/mlearning/darknet/Makefile +++ b/mlearning/darknet/Makefile @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/darknet/Makefile # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/libnnablart/Make.defs b/mlearning/libnnablart/Make.defs index 8733fa2c9..2f57a0af6 100644 --- a/mlearning/libnnablart/Make.defs +++ b/mlearning/libnnablart/Make.defs @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/libnnablart/Make.defs # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/libnnablart/Makefile b/mlearning/libnnablart/Makefile index 32735670f..8d7c726c6 100644 --- a/mlearning/libnnablart/Makefile +++ b/mlearning/libnnablart/Makefile @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/libnnablart/Makefile # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/tflite-micro/CMakeLists.txt b/mlearning/tflite-micro/CMakeLists.txt index 0c072a88a..e3a2830d1 100644 --- a/mlearning/tflite-micro/CMakeLists.txt +++ b/mlearning/tflite-micro/CMakeLists.txt @@ -1,6 +1,8 @@ # ############################################################################## # apps/mlearning/tflite-micro/CMakeLists.txt # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more contributor # license agreements. See the NOTICE file distributed with this work for # additional information regarding copyright ownership. The ASF licenses this diff --git a/mlearning/tflite-micro/Make.defs b/mlearning/tflite-micro/Make.defs index bd3752539..2148d663b 100644 --- a/mlearning/tflite-micro/Make.defs +++ b/mlearning/tflite-micro/Make.defs @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/tflite-micro/Make.defs # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/tflite-micro/Makefile b/mlearning/tflite-micro/Makefile index dd0c1c6ad..aba043805 100644 --- a/mlearning/tflite-micro/Makefile +++ b/mlearning/tflite-micro/Makefile @@ -1,6 +1,8 @@ ############################################################################ # apps/mlearning/tflite-micro/Makefile # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. The diff --git a/mlearning/tflite-micro/operators/neon/arm_convolve_s8.c b/mlearning/tflite-micro/operators/neon/arm_convolve_s8.c index 3d8e5af5c..64a3150e1 100644 --- a/mlearning/tflite-micro/operators/neon/arm_convolve_s8.c +++ b/mlearning/tflite-micro/operators/neon/arm_convolve_s8.c @@ -1,10 +1,9 @@ /**************************************************************************** * apps/mlearning/tflite-micro/operators/neon/arm_convolve_s8.c * - * SPDX-FileCopyrightText: Copyright 2010-2023 Arm Limited and/or - * its affiliates - * * SPDX-License-Identifier: Apache-2.0 + * SPDX-FileCopyrightText: 2010-2023 Arm Limited and/or its affiliates + * * * Licensed under the Apache License, Version 2.0 (the License); you may * not use this file except in compliance with the License. diff --git a/mlearning/tflite-micro/operators/neon/arm_elementwise_add_s8.c b/mlearning/tflite-micro/operators/neon/arm_elementwise_add_s8.c index d7147fbce..82718f94b 100644 --- a/mlearning/tflite-micro/operators/neon/arm_elementwise_add_s8.c +++ b/mlearning/tflite-micro/operators/neon/arm_elementwise_add_s8.c @@ -1,10 +1,9 @@ /**************************************************************************** * apps/mlearning/tflite-micro/operators/neon/arm_elementwise_add_s8.c * - * SPDX-FileCopyrightText: Copyright 2010-2023 Arm Limited and/or - * its affiliates - * * SPDX-License-Identifier: Apache-2.0 + * SPDX-FileCopyrightText: 2010-2023 Arm Limited and/or its affiliates + * * * Licensed under the Apache License, Version 2.0 (the License); you may * not use this file except in compliance with the License. diff --git a/mlearning/tflite-micro/operators/neon/arm_nn_mat_mult_kernel_s8_s16.c b/mlearning/tflite-micro/operators/neon/arm_nn_mat_mult_kernel_s8_s16.c index 190edb74c..9d39cd37d 100644 --- a/mlearning/tflite-micro/operators/neon/arm_nn_mat_mult_kernel_s8_s16.c +++ b/mlearning/tflite-micro/operators/neon/arm_nn_mat_mult_kernel_s8_s16.c @@ -1,10 +1,9 @@ /**************************************************************************** * apps/mlearning/tflite-micro/operators/neon/arm_nn_mat_mult_kernel_s8_s16.c * - * SPDX-FileCopyrightText: Copyright 2010-2023 Arm Limited and/or - * its affiliates - * * SPDX-License-Identifier: Apache-2.0 + * SPDX-FileCopyrightText: 2010-2023 Arm Limited and/or its affiliates + * * * Licensed under the Apache License, Version 2.0 (the License); you may * not use this file except in compliance with the License. diff --git a/mlearning/tflite-micro/operators/neon/arm_q7_to_q15_with_offset.c b/mlearning/tflite-micro/operators/neon/arm_q7_to_q15_with_offset.c index 770e1a88c..27349c231 100644 --- a/mlearning/tflite-micro/operators/neon/arm_q7_to_q15_with_offset.c +++ b/mlearning/tflite-micro/operators/neon/arm_q7_to_q15_with_offset.c @@ -1,10 +1,9 @@ /**************************************************************************** * apps/mlearning/tflite-micro/operators/neon/arm_q7_to_q15_with_offset.c * - * SPDX-FileCopyrightText: Copyright 2010-2023 Arm Limited and/or - * its affiliates - * * SPDX-License-Identifier: Apache-2.0 + * SPDX-FileCopyrightText: 2010-2023 Arm Limited and/or its affiliates + * * * Licensed under the Apache License, Version 2.0 (the License); you may * not use this file except in compliance with the License. diff --git a/mlearning/tflite-micro/tflm_syslog.cc b/mlearning/tflite-micro/tflm_syslog.cc index f306a9153..9a795eeba 100644 --- a/mlearning/tflite-micro/tflm_syslog.cc +++ b/mlearning/tflite-micro/tflm_syslog.cc @@ -1,6 +1,8 @@ /**************************************************************************** * apps/mlearning/tflite-micro/tflm_syslog.cc * + * SPDX-License-Identifier: Apache-2.0 + * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. The diff --git a/mlearning/tflite-micro/tflm_tool.cc b/mlearning/tflite-micro/tflm_tool.cc index df71500b2..8edcf45a4 100644 --- a/mlearning/tflite-micro/tflm_tool.cc +++ b/mlearning/tflite-micro/tflm_tool.cc @@ -1,6 +1,8 @@ /**************************************************************************** * apps/mlearning/tflite-micro/tflm_tool.cc * + * SPDX-License-Identifier: Apache-2.0 + * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. The