# HG changeset patch # User Markus Mützel # Date 1702216675 -3600 # Node ID 065ae9845ce8ac84b61e7ade6252f242c5909471 # Parent 58c1f4c52e8377cad3de6612dc37a47b4dd45baa# Parent db354efec5ce8c8bda7344bfa41f84ce88156b46 maint: Merge default to bytecode-interpreter. diff -r 58c1f4c52e83 -r 065ae9845ce8 .github/workflows/make.yaml --- a/.github/workflows/make.yaml Sun Dec 10 07:33:26 2023 -0500 +++ b/.github/workflows/make.yaml Sun Dec 10 14:57:55 2023 +0100 @@ -200,6 +200,9 @@ # Use emulated shell as default shell: alpine.sh {0} + env: + LIBGL_ALWAYS_SOFTWARE: "1" + steps: - name: get CPU information shell: bash diff -r 58c1f4c52e83 -r 065ae9845ce8 m4/ax_blas.m4 --- a/m4/ax_blas.m4 Sun Dec 10 07:33:26 2023 -0500 +++ b/m4/ax_blas.m4 Sun Dec 10 14:57:55 2023 +0100 @@ -64,7 +64,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 17 +#serial 21 AU_ALIAS([ACX_BLAS], [AX_BLAS]) AC_DEFUN([AX_BLAS], [ @@ -111,6 +111,13 @@ LIBS="$save_LIBS" fi +# BLAS linked to by flexiblas? (Default on FC33+ and RHEL9+) + +if test $ax_blas_ok = no; then + AC_CHECK_LIB(flexiblas, $sgemm, [ax_blas_ok=yes + BLAS_LIBS="-lflexiblas"]) +fi + # BLAS in OpenBLAS library? (http://xianyi.github.com/OpenBLAS/) if test $ax_blas_ok = no; then AC_CHECK_LIB(openblas, $sgemm, [ax_blas_ok=yes @@ -175,9 +182,9 @@ # BLAS in Apple vecLib library? if test $ax_blas_ok = no; then - save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS" - AC_MSG_CHECKING([for $sgemm in -framework vecLib]) - AC_LINK_IFELSE([AC_LANG_CALL([], [$sgemm])], [ax_blas_ok=yes;BLAS_LIBS="-framework vecLib"]) + save_LIBS="$LIBS"; LIBS="-framework Accelerate $LIBS" + AC_MSG_CHECKING([for $sgemm in -framework Accelerate]) + AC_LINK_IFELSE([AC_LANG_CALL([], [$sgemm])], [ax_blas_ok=yes;BLAS_LIBS="-framework Accelerate"]) AC_MSG_RESULT($ax_blas_ok) LIBS="$save_LIBS" fi diff -r 58c1f4c52e83 -r 065ae9845ce8 m4/ax_compare_version.m4 --- a/m4/ax_compare_version.m4 Sun Dec 10 07:33:26 2023 -0500 +++ b/m4/ax_compare_version.m4 Sun Dec 10 14:57:55 2023 +0100 @@ -79,7 +79,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 11 +#serial 13 dnl ######################################################################### AC_DEFUN([AX_COMPARE_VERSION], [ @@ -146,7 +146,7 @@ ], [.+],[ AC_WARNING( - [illegal OP numeric parameter: $2]) + [invalid OP numeric parameter: $2]) ],[]) # Pad zeros at end of numbers to make same length. @@ -162,7 +162,7 @@ [ne],[ test "x$A" != "x$B" && ax_compare_version=true ],[ - AC_WARNING([illegal OP parameter: $2]) + AC_WARNING([invalid OP parameter: $2]) ]) ]) diff -r 58c1f4c52e83 -r 065ae9845ce8 m4/ax_cxx_compile_stdcxx.m4 --- a/m4/ax_cxx_compile_stdcxx.m4 Sun Dec 10 07:33:26 2023 -0500 +++ b/m4/ax_cxx_compile_stdcxx.m4 Sun Dec 10 14:57:55 2023 +0100 @@ -43,7 +43,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 14 +#serial 18 dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro dnl (serial version number 13). @@ -104,9 +104,18 @@ dnl HP's aCC needs +std=c++11 according to: dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf dnl Cray's crayCC needs "-h std=c++11" + dnl MSVC needs -std:c++NN for C++17 and later (default is C++14) for alternative in ${ax_cxx_compile_alternatives}; do - for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}" MSVC; do + if test x"$switch" = xMSVC; then + dnl AS_TR_SH maps both `:` and `=` to `_` so -std:c++17 would collide + dnl with -std=c++17. We suffix the cache variable name with _MSVC to + dnl avoid this. + switch=-std:c++${alternative} + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_${switch}_MSVC]) + else + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + fi AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, $cachevar, [ac_save_CXX="$CXX" @@ -189,7 +198,11 @@ #error "This is not a C++ compiler" -#elif __cplusplus < 201103L +// MSVC always sets __cplusplus to 199711L in older versions; newer versions +// only set it correctly if /Zc:__cplusplus is specified as well as a +// /std:c++NN switch: +// https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ +#elif __cplusplus < 201103L && !defined _MSC_VER #error "This is not a C++11 compiler" @@ -480,7 +493,7 @@ #error "This is not a C++ compiler" -#elif __cplusplus < 201402L +#elif __cplusplus < 201402L && !defined _MSC_VER #error "This is not a C++14 compiler" @@ -604,7 +617,7 @@ #error "This is not a C++ compiler" -#elif __cplusplus < 201703L +#elif __cplusplus < 201703L && !defined _MSC_VER #error "This is not a C++17 compiler" @@ -970,7 +983,7 @@ } // namespace cxx17 -#endif // __cplusplus < 201703L +#endif // __cplusplus < 201703L && !defined _MSC_VER ]]) @@ -983,7 +996,7 @@ #error "This is not a C++ compiler" -#elif __cplusplus < 202002L +#elif __cplusplus < 202002L && !defined _MSC_VER #error "This is not a C++20 compiler" @@ -1000,6 +1013,6 @@ } // namespace cxx20 -#endif // __cplusplus < 202002L +#endif // __cplusplus < 202002L && !defined _MSC_VER ]]) diff -r 58c1f4c52e83 -r 065ae9845ce8 m4/ax_openmp.m4 --- a/m4/ax_openmp.m4 Sun Dec 10 07:33:26 2023 -0500 +++ b/m4/ax_openmp.m4 Sun Dec 10 14:57:55 2023 +0100 @@ -67,10 +67,10 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 13 +#serial 14 AC_DEFUN([AX_OPENMP], [ -AC_PREREQ([2.59]) dnl for _AC_LANG_PREFIX +AC_PREREQ([2.69]) dnl for _AC_LANG_PREFIX AC_CACHE_CHECK([for OpenMP flag of _AC_LANG compiler], ax_cv_[]_AC_LANG_ABBREV[]_openmp, [save[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS ax_cv_[]_AC_LANG_ABBREV[]_openmp=unknown @@ -101,7 +101,7 @@ } int -main() +main(void) { int arr[100000]; omp_set_num_threads(2);