Merge branch 'develop' of git.nic.uoregon.edu:/gitroot/xpress-apex in…

…to develop
UO-OACISS · Dec 3, 2024 · 76cecfd · 76cecfd
2 parents cde877d + 18236ff
commit 76cecfd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/apex/apex_opencl.cpp b/src/apex/apex_opencl.cpp
@@ -36,6 +36,9 @@
 #include <deque>
 #include <mutex>
 #include <condition_variable>
+#ifdef APEX_HAVE_OTF2
+#include "otf2_listener.hpp"
+#endif
 
 namespace apex {
 namespace opencl {

diff --git a/src/scripts/apex_exec b/src/scripts/apex_exec
@@ -735,7 +735,7 @@ if [ $apple = 1 ]; then
         if [ $# -gt 1 ] ; then
             echo "settings set target.run-args ${*:2}" >> ${gdbcmds}
         fi
-        debugger="lldb -s ./.gdbcmds --"
+        debugger="lldb -s ${gdbcmds} --"
     else
         export DYLD_LIBRARY_PATH=${APEX_LD_LIBRARY_PATH}
         export DYLD_INSERT_LIBRARIES=${APEX_LD_PRELOAD}
@@ -882,6 +882,10 @@ if [[ "$long_metrics" == *"$delim"* ]]; then
 else
     #echo "${myrank} Executing with metrics: \"${APEX_PAPI_METRICS}\", writing to ${APEX_OUTPUT_FILE_PATH}"
     #echo "apex_exec executing: ${debugger} ${PARAMS}"
+    if [ "${verbose}" == "yes" ] ; then
+        echo "${gdbcmds}:"
+        cat ${gdbcmds}
+    fi
     ${debugger} ${PARAMS}
     retval=$?
     unset LD_PRELOAD