[ESI][Runtime] Revert to C++17 and enable Python 3.13 builds

llvm · May 13, 2024 · 0b6db7a · 0b6db7a
1 parent 474fc3f
commit 0b6db7a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/esiRuntimePublish.yml b/.github/workflows/esiRuntimePublish.yml
@@ -27,8 +27,8 @@ jobs:
             cibw_build: cp311-manylinux_x86_64
           - os: ubuntu-20.04
             cibw_build: cp312-manylinux_x86_64
-          #- os: ubuntu-20.04
-          #  cibw_build: cp313-manylinux_x86_64
+          - os: ubuntu-20.04
+            cibw_build: cp313-manylinux_x86_64
 
     steps:
       - name: Get CIRCT

diff --git a/lib/Dialect/ESI/runtime/CMakeLists.txt b/lib/Dialect/ESI/runtime/CMakeLists.txt
@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 3.20)
 project(ESIRuntime)
 include(FetchContent)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)

diff --git a/lib/Dialect/ESI/runtime/cpp/lib/backends/Cosim.cpp b/lib/Dialect/ESI/runtime/cpp/lib/backends/Cosim.cpp
@@ -38,11 +38,13 @@ CosimAccelerator::connect(Context &ctxt, string connectionString) {
   string portStr;
   string host = "localhost";
 
+  size_t strLen = connectionString.size();
   size_t colon;
   if ((colon = connectionString.find(':')) != string::npos) {
     portStr = connectionString.substr(colon + 1);
     host = connectionString.substr(0, colon);
-  } else if (connectionString.ends_with("cosim.cfg")) {
+  } else if (strLen >= 9 &&
+             connectionString.substr(strLen - 9) == "cosim.cfg") {
     ifstream cfg(connectionString);
     string line, key, value;