Merge branch 'develop' into multiple-parents

src/apex/apex_policies.cpp

@@ -962,8 +962,14 @@ int apex_exhaustive_policy(shared_ptr<apex_tuning_session> tuning_session,
         // the context data is a pointer to a boolean value
         force = *((bool*)(context.data));
     }
+
+    // get a measurement of our current setting - before we check for convergence!
+    double new_value = tuning_session->metric_of_interest();
+
     if (tuning_session->exhaustive_session.converged() && force) {
+        /* Report the performance we've just measured. */
         if (!tuning_session->converged_message) {
+            tuning_session->exhaustive_session.evaluate(new_value);
             tuning_session->converged_message = true;
             cout << "APEX: Tuning has converged for session " << tuning_session->id
             << "." << endl;
@@ -974,9 +980,6 @@ int apex_exhaustive_policy(shared_ptr<apex_tuning_session> tuning_session,
         return APEX_NOERROR;
     }
 
-    // get a measurement of our current setting
-    double new_value = tuning_session->metric_of_interest();
-
     /* Report the performance we've just measured. */
     tuning_session->exhaustive_session.evaluate(new_value);
 

src/scripts/apex_exec

@@ -640,13 +640,13 @@ if [ $mpi = yes ]; then
         export MPI_LIB2=${testme}
     fi
 fi
-if [ $cuda = yes ] || [ $monitor_gpu = yes ]; then
+if [ $cuda = yes ] && [ $monitor_gpu = yes ]; then
     testme=${BASEDIR}/${LIBDIR}/${APEX_LIBRARY_NAME}_cuda${SHLIBX}
     if [ -f ${testme} ]; then
         export CUDA_LIB=:${testme}
     fi
 fi
-if [ $hip = yes ] || [ $monitor_gpu = yes ]; then
+if [ $hip = yes ] && [ $monitor_gpu = yes ]; then
     testme=${BASEDIR}/${LIBDIR}/${APEX_LIBRARY_NAME}_hip${SHLIBX}
     if [ -f ${testme} ]; then
         export HIP_LIB=:${testme}