From b89ab7b33f2c9172301eab1c851cda64832bb606 Mon Sep 17 00:00:00 2001 From: Jaroslav Fowkes Date: Thu, 5 Oct 2023 15:23:29 +0100 Subject: [PATCH] Fix licence on SSIDS kernel tests --- tests/ssids/kernels.cxx | 5 +---- tests/ssids/kernels/block_ldlt.cxx | 9 +++------ tests/ssids/kernels/block_ldlt.hxx | 5 +---- tests/ssids/kernels/cholesky.cxx | 7 ++----- tests/ssids/kernels/cholesky.hxx | 5 +---- tests/ssids/kernels/framework.cxx | 7 ++----- tests/ssids/kernels/framework.hxx | 5 +---- tests/ssids/kernels/ldlt_app.cxx | 9 +++------ tests/ssids/kernels/ldlt_app.hxx | 5 +---- tests/ssids/kernels/ldlt_nopiv.cxx | 7 ++----- tests/ssids/kernels/ldlt_nopiv.hxx | 5 +---- tests/ssids/kernels/ldlt_tpp.cxx | 9 +++------ tests/ssids/kernels/ldlt_tpp.hxx | 5 +---- 13 files changed, 22 insertions(+), 61 deletions(-) diff --git a/tests/ssids/kernels.cxx b/tests/ssids/kernels.cxx index 2a256a70..3b1f5b10 100644 --- a/tests/ssids/kernels.cxx +++ b/tests/ssids/kernels.cxx @@ -2,10 +2,7 @@ * * Authors: Jonathan Hogg (STFC) * - * IMPORTANT: This file is NOT licenced under the BSD licence. If you wish to - * licence this code, please contact STFC via hsl@stfc.ac.uk - * (We are currently deciding what licence to release this code under if it - * proves to be useful beyond our own academic experiments) + * Licence: BSD licence, see LICENCE file for details * */ diff --git a/tests/ssids/kernels/block_ldlt.cxx b/tests/ssids/kernels/block_ldlt.cxx index 0852f20e..aa3fb1a5 100644 --- a/tests/ssids/kernels/block_ldlt.cxx +++ b/tests/ssids/kernels/block_ldlt.cxx @@ -2,10 +2,7 @@ * * Authors: Jonathan Hogg (STFC) * - * IMPORTANT: This file is NOT licenced under the BSD licence. If you wish to - * licence this code, please contact STFC via hsl@stfc.ac.uk - * (We are currently deciding what licence to release this code under if it - * proves to be useful beyond our own academic experiments) + * Licence: BSD licence, see LICENCE file for details * */ #include "block_ldlt.hxx" @@ -132,7 +129,7 @@ void print_d(int n, T *d) { template void make_singular(int n, int col1, int col2, T *a, int lda) { T *col = new T[n]; - + T a11 = a[col1*(lda+1)]; T a21 = (col1 < col2) ? a[col1*lda + col2] : a[col2*lda + col1]; @@ -208,7 +205,7 @@ int test_maxloc(int from, bool zero=false) { } } - /* Call both simple and avx versions and check they get the same answer */ + /* Call both simple and avx versions and check they get the same answer */ T mv1, mv2; int rloc1, cloc1, rloc2, cloc2; diff --git a/tests/ssids/kernels/block_ldlt.hxx b/tests/ssids/kernels/block_ldlt.hxx index 58924f79..f0b39918 100644 --- a/tests/ssids/kernels/block_ldlt.hxx +++ b/tests/ssids/kernels/block_ldlt.hxx @@ -2,10 +2,7 @@ * * Authors: Jonathan Hogg (STFC) * - * IMPORTANT: This file is NOT licenced under the BSD licence. If you wish to - * licence this code, please contact STFC via hsl@stfc.ac.uk - * (We are currently deciding what licence to release this code under if it - * proves to be useful beyond our own academic experiments) + * Licence: BSD licence, see LICENCE file for details * */ #pragma once diff --git a/tests/ssids/kernels/cholesky.cxx b/tests/ssids/kernels/cholesky.cxx index f5ba9833..a3804471 100644 --- a/tests/ssids/kernels/cholesky.cxx +++ b/tests/ssids/kernels/cholesky.cxx @@ -2,10 +2,7 @@ * * Authors: Jonathan Hogg (STFC) * - * IMPORTANT: This file is NOT licenced under the BSD licence. If you wish to - * licence this code, please contact STFC via hsl@stfc.ac.uk - * (We are currently deciding what licence to release this code under if it - * proves to be useful beyond our own academic experiments) + * Licence: BSD licence, see LICENCE file for details * */ #include "cholesky.hxx" @@ -27,7 +24,7 @@ int test_cholesky(int m, int n, int blksz, bool debug=false) { /* Take a copy */ double *l = new double[m*lda]; memcpy(l, a, m*lda*sizeof(double)); - + /* Factor first m x n part with our code, generate contrib block */ if(debug) { printf("PRE:\n"); print_mat(" %e", m, l, lda); } int info; diff --git a/tests/ssids/kernels/cholesky.hxx b/tests/ssids/kernels/cholesky.hxx index 9348f354..718fcd1b 100644 --- a/tests/ssids/kernels/cholesky.hxx +++ b/tests/ssids/kernels/cholesky.hxx @@ -2,10 +2,7 @@ * * Authors: Jonathan Hogg (STFC) * - * IMPORTANT: This file is NOT licenced under the BSD licence. If you wish to - * licence this code, please contact STFC via hsl@stfc.ac.uk - * (We are currently deciding what licence to release this code under if it - * proves to be useful beyond our own academic experiments) + * Licence: BSD licence, see LICENCE file for details * */ #pragma once diff --git a/tests/ssids/kernels/framework.cxx b/tests/ssids/kernels/framework.cxx index f2c6e2c3..cbe64712 100644 --- a/tests/ssids/kernels/framework.cxx +++ b/tests/ssids/kernels/framework.cxx @@ -2,10 +2,7 @@ * * Authors: Jonathan Hogg (STFC) * - * IMPORTANT: This file is NOT licenced under the BSD licence. If you wish to - * licence this code, please contact STFC via hsl@stfc.ac.uk - * (We are currently deciding what licence to release this code under if it - * proves to be useful beyond our own academic experiments) + * Licence: BSD licence, see LICENCE file for details * */ #include "framework.hxx" @@ -103,7 +100,7 @@ double backward_error(int n, double const* a, int lda, double const* rhs, int nr for(int i=0; i void make_singular(int n, int col1, int col2, T *a, int lda) { T *col = new T[n]; - + T a11 = a[col1*(lda+1)]; T a21 = (col1 < col2) ? a[col1*lda + col2] : a[col2*lda + col1]; @@ -411,7 +408,7 @@ template void print_mat (int n, int *perm, T *a, int lda) { for(int i=0; i void make_singular(int n, int col1, int col2, T *a, int lda) { T *col = new T[n]; - + T a11 = a[col1*(lda+1)]; T a21 = (col1 < col2) ? a[col1*lda + col2] : a[col2*lda + col1]; @@ -337,7 +334,7 @@ template void print_mat (int n, int *perm, T *a, int lda) { for(int i=0; i