From ee41b6eb24b4a8c14a6952599082c7b76208e4f5 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 3 Jul 2022 17:56:49 +0200 Subject: [PATCH 1/4] Add DNRM2 regression test for issues 2998 and 3654 --- utest/CMakeLists.txt | 1 + utest/Makefile | 2 +- utest/test_dnrm2.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ utest/utest_main2.c | 1 + 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 utest/test_dnrm2.c diff --git a/utest/CMakeLists.txt b/utest/CMakeLists.txt index 0c99e0d12..5511015bb 100644 --- a/utest/CMakeLists.txt +++ b/utest/CMakeLists.txt @@ -13,6 +13,7 @@ else () test_rot.c test_axpy.c test_dsdot.c + test_dnrm2.c test_swap.c ) endif () diff --git a/utest/Makefile b/utest/Makefile index fad3607de..f99035440 100644 --- a/utest/Makefile +++ b/utest/Makefile @@ -11,7 +11,7 @@ UTESTBIN=openblas_utest include $(TOPDIR)/Makefile.system -OBJS=utest_main.o test_min.o test_amax.o test_ismin.o test_rotmg.o test_axpy.o test_dotu.o test_dsdot.o test_swap.o test_rot.o +OBJS=utest_main.o test_min.o test_amax.o test_ismin.o test_rotmg.o test_axpy.o test_dotu.o test_dsdot.o test_swap.o test_rot.o test_dnrm2.o #test_rot.o test_swap.o test_axpy.o test_dotu.o test_dsdot.o test_fork.o ifneq ($(NO_LAPACK), 1) diff --git a/utest/test_dnrm2.c b/utest/test_dnrm2.c new file mode 100644 index 000000000..f710431d0 --- /dev/null +++ b/utest/test_dnrm2.c @@ -0,0 +1,60 @@ +/***************************************************************************** +Copyright (c) 2011-2022, The OpenBLAS Project +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. Neither the name of the OpenBLAS project nor the names of + its contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +**********************************************************************************/ + +#include "openblas_utest.h" +#if defined(BUILD_DOUBLE) +CTEST(dnrm2,dnrm2_inf) +{ + double x[29]; + blasint incx=1; + blasint n=28; + double res1=0.0f, res2=INFINITY; + + for (int i=0;i Date: Sun, 3 Jul 2022 18:23:51 +0200 Subject: [PATCH 2/4] old systems may not have inf in math.h --- utest/test_dnrm2.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utest/test_dnrm2.c b/utest/test_dnrm2.c index f710431d0..6c76c47c2 100644 --- a/utest/test_dnrm2.c +++ b/utest/test_dnrm2.c @@ -33,6 +33,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "openblas_utest.h" #if defined(BUILD_DOUBLE) + +#ifndef INFINITY +#define INFINITY HUGE_VALF +#endif + CTEST(dnrm2,dnrm2_inf) { double x[29]; From 8e6f719ad38d080a366d4e0ccee695525fcd45d0 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 3 Jul 2022 20:19:24 +0200 Subject: [PATCH 3/4] use huge_val not huge_valf for portability --- utest/test_dnrm2.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/utest/test_dnrm2.c b/utest/test_dnrm2.c index 6c76c47c2..0035863df 100644 --- a/utest/test_dnrm2.c +++ b/utest/test_dnrm2.c @@ -35,17 +35,18 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if defined(BUILD_DOUBLE) #ifndef INFINITY -#define INFINITY HUGE_VALF +#define INFINITY HUGE_VAL #endif CTEST(dnrm2,dnrm2_inf) { + int i; double x[29]; blasint incx=1; blasint n=28; double res1=0.0f, res2=INFINITY; - for (int i=0;i Date: Sun, 3 Jul 2022 23:48:30 +0200 Subject: [PATCH 4/4] properly embed test_dnrm2 --- utest/utest_main2.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/utest/utest_main2.c b/utest/utest_main2.c index e38223718..4382bf159 100644 --- a/utest/utest_main2.c +++ b/utest/utest_main2.c @@ -369,6 +369,38 @@ CTEST(dsdot,dsdot_n_1) } +#if defined(BUILD_DOUBLE) +CTEST(dnrm2,dnrm2_inf) +{ +#ifndef INFINITY +#define INFINITY HUGE_VAL +#endif + int i; + double x[29]; + blasint incx=1; + blasint n=28; + double res1=0.0f, res2=INFINITY; + + for (i=0;i