Skip to content

Commit 5d08ec7

Browse files
authored
Merge pull request #4782 from martin-frbg/azurewincl
Fix NAN handling in ARM/generic SCAL; have AzureCI Windows show errors on failure
2 parents dfc11ef + 2fefdfa commit 5d08ec7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
cmake -G "Ninja" -DCMAKE_C_COMPILER=cl -DCMAKE_Fortran_COMPILER=flang-new -DC_LAPACK=1 -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DMSVC_STATIC_CRT=ON ..
137137
cmake --build . --config Release
138138
ctest
139-
139+
ctest --rerun-failed --output-on-failure
140140
141141
142142
- job: OSX_OpenMP

kernel/arm/scal.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS
4848
{
4949

5050
if ( da == 0.0 )
51+
if (!isnan(x[i]) && !isinf(x[i])) {
5152
x[i]=0.0;
53+
} else {
54+
x[i]=NAN;
55+
}
5256
else
5357
x[i] = da * x[i] ;
5458

0 commit comments

Comments
 (0)