Merge branch 'v2.10'

.github/workflows/condaWF.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04 , macos-12 , macos-14 ]
+        os: [ubuntu-20.04 , macos-13 , macos-14 ]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4

.github/workflows/macWF.yml

@@ -21,7 +21,7 @@ jobs:
       matrix:
         variant: [ "" , "+allmodules" ]
         # this is to test both intel and arm64 macs
-        os: [ macos-12 , macos-14 ]
+        os: [ macos-13 , macos-14 ]
         exclude:
         # many tests on contributed modules are still failing for numerical reasons on arm64, see https://github.com/plumed/plumed2/pull/950
         # once fixed we could introduce this back:
@@ -68,7 +68,7 @@ jobs:
       fail-fast: false
       matrix:
         # this is to test both intel and arm64 macs
-        os: [ macos-12 , macos-14 ]
+        os: [ macos-13 , macos-14 ]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4

.github/workflows/nightly.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest , macos-12 , macos-14]
+        os: [ubuntu-latest , macos-13 , macos-14]
         branch: [v2.8, v2.9, master]
     runs-on: ${{ matrix.os }}
     steps:

configure

@@ -2341,7 +2341,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # PLUMED_CHECK_LDFLAGS(flag)
-# use it to check if a flag is available on this compiler
+# use it to check if a flag is available for linking
 
 
 # PLUMED_SEARCH_LIBS(function,search-libs[,action-if-found][,action-if-not-found][,other-libraries])
@@ -9664,26 +9664,13 @@ fi
 if test $libtorch = true ; then
   # disable as-needed in linking libraries (both static and shared)
 
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wl,--no-as-needed"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -Wl,--no-as-needed" >&5
-$as_echo_n "checking whether $CXX accepts -Wl,--no-as-needed... " >&6; }
+  save_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether LDFLAGS can contain -Wl,--no-as-needed" >&5
+$as_echo_n "checking whether LDFLAGS can contain -Wl,--no-as-needed... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
 int
 main ()
 {
@@ -9696,20 +9683,12 @@ if ac_fn_cxx_try_link "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not linking" >&5
-$as_echo "not linking" >&6; }; CXXFLAGS="$save_CXXFLAGS"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; LDFLAGS="$save_LDFLAGS"
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; CXXFLAGS="$save_CXXFLAGS"
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-  LDSHARED="$LDSHARED -Wl,--no-as-needed "
 
   # CUDA and CPU libtorch libs have different libraries
   # first test CUDA program

configure.ac

@@ -79,7 +79,7 @@ AC_DEFUN([PLUMED_CHECK_CFLAG], [
 ])
 
 # PLUMED_CHECK_LDFLAGS(flag)
-# use it to check if a flag is available on this compiler
+# use it to check if a flag is available for linking
 AC_DEFUN([PLUMED_CHECK_LDFLAGS], [
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $1"
@@ -935,8 +935,7 @@ fi
 #added by luigibonati
 if test $libtorch = true ; then 
   # disable as-needed in linking libraries (both static and shared)
-  PLUMED_CHECK_CXXFLAG([-Wl,--no-as-needed])
-  LDSHARED="$LDSHARED -Wl,--no-as-needed "
+  PLUMED_CHECK_LDFLAGS([-Wl,--no-as-needed])
 
   # CUDA and CPU libtorch libs have different libraries
   # first test CUDA program