From b60af00ae9a620189c0a6b6b2285dd2d721501b6 Mon Sep 17 00:00:00 2001
From: Manikandan Dhamodharan <Mani-D@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:23:21 -0400
Subject: [PATCH] Make python 3 the default for builds

---
 .github/workflows/main.yml         | 2 +-
 CMakeLists.txt                     | 1 +
 build.sh                           | 2 +-
 include/xpedite/probes/CallSite.H  | 1 +
 include/xpedite/probes/ProbeKey.H  | 1 +
 install.sh                         | 2 +-
 jni/build.gradle                   | 4 ++--
 lib/xpedite/framework/StorageMgr.H | 1 +
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4dedda6f..d7adca11 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.8]
+        python-version: [3.8]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63c310a5..f459663f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,7 @@ install(TARGETS xpedite-pic DESTINATION "lib" COMPONENT libraries)
 
 ######################### Python bindings #############################
 
+set(PYBIND11_PYTHON_VERSION 3.8 CACHE STRING "")
 find_package(pybind11 REQUIRED)
 pybind11_add_module(xpediteBindings lib/xpedite/pybind/Bindings.cpp lib/xpedite/framework/SamplesLoader.C)
 install(TARGETS xpediteBindings DESTINATION "lib" COMPONENT libraries)
diff --git a/build.sh b/build.sh
index 2fb548f9..66d2c3a2 100755
--- a/build.sh
+++ b/build.sh
@@ -33,7 +33,7 @@ BUILD_TYPE=Release
 BUILD_VIVIFY=0
 BUILD_JAVA=0
 VERBOSE=0
-PYTHON_VERSION=2.7
+PYTHON_VERSION=3.8
 
 while true ; do
   case "$1" in
diff --git a/include/xpedite/probes/CallSite.H b/include/xpedite/probes/CallSite.H
index 89547310..1e18896e 100644
--- a/include/xpedite/probes/CallSite.H
+++ b/include/xpedite/probes/CallSite.H
@@ -12,6 +12,7 @@
 
 #pragma once
 #include <sstream>
+#include <cstdint>
 
 namespace xpedite { namespace probes {
 
diff --git a/include/xpedite/probes/ProbeKey.H b/include/xpedite/probes/ProbeKey.H
index ff24d58a..357d3062 100644
--- a/include/xpedite/probes/ProbeKey.H
+++ b/include/xpedite/probes/ProbeKey.H
@@ -8,6 +8,7 @@
 
 #pragma once
 #include <string>
+#include <cstdint>
 
 namespace xpedite { namespace probes {
 
diff --git a/install.sh b/install.sh
index 60485a52..25e6cd71 100755
--- a/install.sh
+++ b/install.sh
@@ -31,7 +31,7 @@ fi
 eval set -- "$ARGS"
 ENABLE_PMU=0
 VERBOSE=0
-PYTHON_VERSION=2
+PYTHON_VERSION=3
 
 while true ; do
   case "$1" in
diff --git a/jni/build.gradle b/jni/build.gradle
index 76de4d83..e23d8723 100644
--- a/jni/build.gradle
+++ b/jni/build.gradle
@@ -25,7 +25,7 @@ sourceSets {
 }
 
 task xpediteJar(type: Jar) {
-  baseName = 'xpedite'
+  archiveBaseName = 'xpedite'
   exclude(['**/demo/**'])
   manifest {
     attributes(
@@ -42,7 +42,7 @@ task xpediteJar(type: Jar) {
 task demoJar(type: Jar) {
   include(['**/demo/**'])
   exclude(['**/com/xpedite/probes'])
-  baseName = 'xpediteDemo'
+  archiveBaseName = 'xpediteDemo'
   manifest {
     attributes(
       'Implementation-Title': 'Xpedite Demo Jar',
diff --git a/lib/xpedite/framework/StorageMgr.H b/lib/xpedite/framework/StorageMgr.H
index e940d811..8288535c 100644
--- a/lib/xpedite/framework/StorageMgr.H
+++ b/lib/xpedite/framework/StorageMgr.H
@@ -11,6 +11,7 @@
 
 #pragma once
 #include <string>
+#include <cstdint>
 
 namespace xpedite { namespace framework {