@@ -1700,11 +1700,21 @@ options(op) # return to sanity + warn=2
1700
1700
si <- sessionInfo()
1701
1701
str( osi <- capture.output(si )); hasLA <- nzchar(si $ LAPACK ); si $ LAPACK <- " "
1702
1702
osi.noLA <- capture.output(si )
1703
- iLA <- which(osi != osi.noLA )
1704
- cbind(osi , osi.noLA )[iLA ,] # was empty ..
1703
+ if (any(gBL <- grepl(" ^BLAS/LAPACK:" , osi ))) {
1704
+ # # *.noLA will have _2_ lines instead, as LAPACK != BLAS now
1705
+ print(osi [[iLA <- which(gBL )]])
1706
+ v.iLA <- sub(" .*; " , " " , osi [iLA ])
1707
+ v.noLA <- osi.noLA [iLA + 1L ]
1708
+ } else {
1709
+ stopifnot(length(osi ) == length(osi.noLA ))
1710
+ iLA <- which(osi != osi.noLA )
1711
+ print(cbind(osi , osi.noLA )[iLA ,]) # was empty ..
1712
+ v.iLA <- osi [iLA ]
1713
+ v.noLA <- osi.noLA [iLA ]
1714
+ }
1705
1715
if (length(iLA ) && nzchar(La_version())) { cat(" sessionInfo - La_* checking: " )
1706
- stopifnot(nzchar(v.noLA <- osi.noLA [ iLA ] ),
1707
- grepl(paste0(v.noLA ," $" ), osi [ iLA ] ))
1716
+ stopifnot(nzchar(v.noLA ),
1717
+ grepl(paste0(v.noLA ," $" ), v. iLA ))
1708
1718
cat(" ok\n " )
1709
1719
}
1710
1720
# # the "LAPACK: .." was entirely empty when si$LAPACK was ""
0 commit comments