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

…o opencl
UO-OACISS · Oct 21, 2024 · a20dbe1 · a20dbe1
2 parents 3e5a910 + 2a108b7
commit a20dbe1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/apex/apex_opencl.cpp b/src/apex/apex_opencl.cpp
@@ -14,7 +14,24 @@
  * limitations under the License.
  ******************************************************************************/
 
+#ifdef __APPLE__
+#include <OpenCL/opencl.h>
+#ifndef CL_API_PREFIX__VERSION_1_1_DEPRECATED
+#define CL_API_PREFIX__VERSION_1_1_DEPRECATED
+#endif
+#ifndef CL_API_SUFFIX__VERSION_1_1_DEPRECATED
+#define CL_API_SUFFIX__VERSION_1_1_DEPRECATED
+#endif
+#ifndef CL_API_PREFIX__VERSION_1_2_DEPRECATED
+#define CL_API_PREFIX__VERSION_1_2_DEPRECATED
+#endif
+#ifndef CL_API_SUFFIX__VERSION_1_2_DEPRECATED
+#define CL_API_SUFFIX__VERSION_1_2_DEPRECATED
+#endif
+#else
 #include <CL/cl.h>
+#endif
+
 #include <type_traits>
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE

diff --git a/src/apex/apex_types.h b/src/apex/apex_types.h
@@ -189,7 +189,7 @@ typedef enum _profile_type {
  */
 typedef enum _argument_type {
     APEX_LONG_INTEGER_TYPE = 0,
-    APEX_UNSIGNED_LONG_INTEGER_TYPE = 0,
+    APEX_UNSIGNED_LONG_INTEGER_TYPE,
     APEX_DOUBLE_TYPE,
     APEX_STRING_TYPE,
     APEX_POINTER_TYPE,

diff --git a/src/apex/trace_event_listener.cpp b/src/apex/trace_event_listener.cpp
@@ -261,8 +261,12 @@ inline void trace_event_listener::_common_stop(std::shared_ptr<profiler> &p) {
             for (size_t a = 0 ; a < p->tt_ptr->arguments.size() ; a++) {
                 auto& arg = p->tt_ptr->arguments[a];
                 switch (p->tt_ptr->argument_types[a]) {
+                    case APEX_UNSIGNED_LONG_INTEGER_TYPE: {
+                        ss << ",\"" << p->tt_ptr->argument_names[a] << "\":\"" << std::get<uint64_t>(arg) << "\"";
+                        break;
+                    }
                     case APEX_LONG_INTEGER_TYPE: {
-                        ss << ",\"" << p->tt_ptr->argument_names[a] << "\":\"" << std::get<long>(arg) << "\"";
+                        ss << ",\"" << p->tt_ptr->argument_names[a] << "\":\"" << std::get<int64_t>(arg) << "\"";
                         break;
                     }
                     case APEX_DOUBLE_TYPE: {