From 4e692558a653bd1ccc36a2e19551dea8201e2ab3 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Tue, 2 Apr 2024 17:41:19 +0200
Subject: [PATCH 1/2] Changed total memory to resident memory in check

---
 src/utils/memory.irp.f | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/memory.irp.f b/src/utils/memory.irp.f
index ab85c21b..e69bf71e 100644
--- a/src/utils/memory.irp.f
+++ b/src/utils/memory.irp.f
@@ -107,7 +107,7 @@ subroutine check_mem(rss_in,routine)
   double precision, intent(in) :: rss_in
   character*(*) :: routine
   double precision :: mem
-  call total_memory(mem)
+  call resident_memory(mem)
   mem += rss_in
   if (mem > qp_max_mem) then
     call print_memory_usage()

From e4ce9ef2193529ff1887d7ec62abb2233869f50f Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Wed, 3 Apr 2024 15:32:56 +0200
Subject: [PATCH 2/2] Upgrade trexio version in configure

---
 configure | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index e211cfd7..41c0123d 100755
--- a/configure
+++ b/configure
@@ -9,7 +9,7 @@ echo "QP_ROOT="$QP_ROOT
 unset CC
 unset CCXX
 
-TREXIO_VERSION=2.3.2
+TREXIO_VERSION=2.4.2
 
 # Force GCC instead of ICC for dependencies
 export CC=gcc
@@ -219,7 +219,7 @@ EOF
               tar -zxf trexio-${VERSION}.tar.gz && rm trexio-${VERSION}.tar.gz
               cd trexio-${VERSION}
               ./configure --prefix=\${QP_ROOT} --without-hdf5 CFLAGS='-g'
-              make -j 8 && make -j 8 check && make -j 8 install
+              (make -j 8 || make) && make check && make -j 8 install
               tar -zxvf "\${QP_ROOT}"/external/qp2-dependencies/${ARCHITECTURE}/ninja.tar.gz 
               mv ninja "\${QP_ROOT}"/bin/
 EOF
@@ -233,7 +233,7 @@ EOF
               tar -zxf trexio-${VERSION}.tar.gz && rm trexio-${VERSION}.tar.gz
               cd trexio-${VERSION}
               ./configure --prefix=\${QP_ROOT} CFLAGS="-g"
-              make -j 8 && make -j 8 check && make -j 8 install
+              (make -j 8 || make) && make check && make -j 8 install
 EOF
     elif [[ ${PACKAGE} = qmckl ]] ; then
 
@@ -245,7 +245,7 @@ EOF
               tar -zxf qmckl-${VERSION}.tar.gz && rm qmckl-${VERSION}.tar.gz
               cd qmckl-${VERSION}
               ./configure --prefix=\${QP_ROOT} --enable-hpc --disable-doc CFLAGS='-g'
-              make && make -j 4 check && make install
+              (make -j 8 || make) && make check && make install
 EOF
     elif [[ ${PACKAGE} = qmckl-intel ]] ; then
 
@@ -257,7 +257,7 @@ EOF
               tar -zxf qmckl-${VERSION}.tar.gz && rm qmckl-${VERSION}.tar.gz
               cd qmckl-${VERSION}
               ./configure --prefix=\${QP_ROOT} --enable-hpc --disable-doc --with-icc --with-ifort CFLAGS='-g'
-              make && make -j 4 check && make install
+              (make -j 8 || make) && make check && make install
 EOF