Skip to content

No longer infer insufficient LAPACK from libRlapack use #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2025
Merged

No longer infer insufficient LAPACK from libRlapack use #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,6 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
OPENMP_FLAG
ARMA_HAVE_OPENMP
ARMA_LAPACK
CXXCPP
OBJEXT
EXEEXT
Expand Down Expand Up @@ -3394,14 +3393,13 @@ if test x"${hasRlapack}" = x""; then
## We are using a full Lapack and can use zgbsv -- so #undef remains
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: system LAPACK found" >&5
printf "%s\n" "system LAPACK found" >&6; }
arma_lapack="#undef ARMA_CRIPPLED_LAPACK"
## arma_lapack="#undef ARMA_CRIPPLED_LAPACK"
else
## We are using R's subset of Lapack and CANNOT use zgbsv etc, so we mark it
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: R-supplied partial LAPACK found" >&5
printf "%s\n" "R-supplied partial LAPACK found" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Some complex-valued LAPACK functions may not be available" >&5
printf "%s\n" "$as_me: WARNING: Some complex-valued LAPACK functions may not be available" >&2;}
arma_lapack="#define ARMA_CRIPPLED_LAPACK 1"
## AC_MSG_WARN([Some complex-valued LAPACK functions may not be available])
## arma_lapack="#define ARMA_CRIPPLED_LAPACK 1"
fi

## Default the OpenMP flag to the empty string.
Expand Down Expand Up @@ -3436,8 +3434,7 @@ fi


## now use all these
ARMA_LAPACK="${arma_lapack}"

## AC_SUBST([ARMA_LAPACK],["${arma_lapack}"])
ARMA_HAVE_OPENMP="${arma_have_openmp}"

OPENMP_FLAG="${openmp_flag}"
Expand Down
8 changes: 4 additions & 4 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ hasRlapack=$(echo ${lapack} | grep lRlapack)
if test x"${hasRlapack}" = x""; then
## We are using a full Lapack and can use zgbsv -- so #undef remains
AC_MSG_RESULT([system LAPACK found])
arma_lapack="#undef ARMA_CRIPPLED_LAPACK"
## arma_lapack="#undef ARMA_CRIPPLED_LAPACK"
else
## We are using R's subset of Lapack and CANNOT use zgbsv etc, so we mark it
AC_MSG_RESULT([R-supplied partial LAPACK found])
AC_MSG_WARN([Some complex-valued LAPACK functions may not be available])
arma_lapack="#define ARMA_CRIPPLED_LAPACK 1"
## AC_MSG_WARN([Some complex-valued LAPACK functions may not be available])
## arma_lapack="#define ARMA_CRIPPLED_LAPACK 1"
fi

## Default the OpenMP flag to the empty string.
Expand Down Expand Up @@ -204,7 +204,7 @@ fi


## now use all these
AC_SUBST([ARMA_LAPACK],["${arma_lapack}"])
## AC_SUBST([ARMA_LAPACK],["${arma_lapack}"])
AC_SUBST([ARMA_HAVE_OPENMP], ["${arma_have_openmp}"])
AC_SUBST([OPENMP_FLAG], ["${openmp_flag}"])
AC_CONFIG_FILES([inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h src/Makevars])
Expand Down
5 changes: 0 additions & 5 deletions inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@
#ifndef RcppArmadillo__RcppArmadilloConfigGenerated__h
#define RcppArmadillo__RcppArmadilloConfigGenerated__h

#ifndef ARMA_CRIPPLED_LAPACK
// value on next line may be changed between #undef and #define by the configure script
@ARMA_LAPACK@
#endif

#ifndef ARMA_USE_OPENMP
// from configure test for OpenMP based on how R is configured, and whether g++ new enough
@ARMA_HAVE_OPENMP@
Expand Down