Major dependency upgrade - python 3.x and jupyter 7 compatibility

morganstanley · Jun 9, 2024 · 343e718 · 343e718
1 parent ce0811c
commit 343e718
Show file tree

Hide file tree

Showing 36 changed files with 733 additions and 297 deletions.
diff --git 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
@@ -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
@@ -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/demo/Demo.H b/demo/Demo.H
@@ -30,9 +30,6 @@ namespace xpedite { namespace demo {
   using Indices = std::array<uint64_t, indexSize>;
 
   inline void initialize(size_t core_ = 0) {
-    if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
-      std::cerr << "failed to mlock all pages" << std::endl;
-    }
     using namespace xpedite::framework;
     if(!xpedite::framework::initialize("xpedite-appinfo.txt", {AWAIT_PROFILE_BEGIN})) { 
       throw std::runtime_error {"failed to init xpedite"}; 

diff --git 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
@@ -8,6 +8,7 @@
 
 #pragma once
 #include <string>
+#include <cstdint>
 
 namespace xpedite { namespace probes {
 

diff --git 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
@@ -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
@@ -11,6 +11,7 @@
 
 #pragma once
 #include <string>
+#include <cstdint>
 
 namespace xpedite { namespace framework {