Upgrade platform latest to C++23 and fix Pybind11 asserts

Signed-off-by: Rémi Achard <[email protected]>
AcademySoftwareFoundation · Feb 25, 2024 · 5499733 · 5499733
1 parent 5c52eb9
commit 5499733
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 39 deletions.
diff --git a/.github/workflows/platform_latest.yml b/.github/workflows/platform_latest.yml
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        build: [1, 2, 3, 4]
+        build: [1, 2]
         include:
           # -------------------------------------------------------------------
           # GCC
@@ -46,7 +46,7 @@ jobs:
             build-python: ON
             build-type: Release
             build-shared: ON
-            cxx-standard: 20
+            cxx-standard: 23
             cxx-compiler: g++
             cc-compiler: gcc
             compiler-desc: GCC
@@ -55,32 +55,34 @@ jobs:
             build-python: OFF
             build-type: Debug
             build-shared: ON
-            cxx-standard: 20
+            cxx-standard: 23
             cxx-compiler: g++
             cc-compiler: gcc
             compiler-desc: GCC
             enable-sanitizer: ON
           # -------------------------------------------------------------------
           # Clang
           # -------------------------------------------------------------------
-          - build: 3
-            build-python: ON
-            build-type: Release
-            build-shared: ON
-            cxx-standard: 20
-            cxx-compiler: clang++
-            cc-compiler: clang
-            compiler-desc: Clang
-            enable-sanitizer: OFF
-          - build: 4
-            build-python: OFF
-            build-type: Debug
-            build-shared: ON
-            cxx-standard: 20
-            cxx-compiler: clang++
-            cc-compiler: clang
-            compiler-desc: Clang
-            enable-sanitizer: ON
+          # TODO: Re-enable clang when the following issue get fixed:
+          # https://github.com/actions/runner-images/issues/8659
+          # - build: 3
+          #   build-python: ON
+          #   build-type: Release
+          #   build-shared: ON
+          #   cxx-standard: 23
+          #   cxx-compiler: clang++
+          #   cc-compiler: clang
+          #   compiler-desc: Clang
+          #   enable-sanitizer: OFF
+          # - build: 4
+          #   build-python: OFF
+          #   build-type: Debug
+          #   build-shared: ON
+          #   cxx-standard: 23
+          #   cxx-compiler: clang++
+          #   cc-compiler: clang
+          #   compiler-desc: Clang
+          #   enable-sanitizer: ON
     env:
       CXX: ${{ matrix.cxx-compiler }}
       CC: ${{ matrix.cc-compiler }}
@@ -185,14 +187,14 @@ jobs:
             build-python: ON
             build-type: Release
             build-shared: ON
-            cxx-standard: 20
+            cxx-standard: 23
             enable-sanitizer: OFF
             python-version: '3.11'
           - build: 2
             build-python: OFF
             build-type: Debug
             build-shared: ON
-            cxx-standard: 20
+            cxx-standard: 23
             enable-sanitizer: ON
             python-version: '3.11'
     steps:
@@ -298,13 +300,13 @@ jobs:
             build-python: ON
             build-type: Release
             build-shared: ON
-            cxx-standard: 20
+            cxx-standard: 23
             python-version: '3.11'
           - build: 2
             build-python: ON
             build-type: Debug
             build-shared: ON
-            cxx-standard: 20
+            cxx-standard: 23
             python-version: '3.11'
     steps:
       - name: Setup Python

diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
@@ -179,8 +179,7 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS)
         # pybind11 2.9 fixes issues with MS Visual Studio 2022 (Debug).
         ocio_handle_dependency(  pybind11 REQUIRED ALLOW_INSTALL
                                  MIN_VERSION 2.9.2
-                                 RECOMMENDED_VERSION 2.9.2
-                                 RECOMMENDED_VERSION_REASON "Pybind 2.10.0+ does not work with Python 2.7 anymore")
+                                 RECOMMENDED_VERSION 2.11.1)
     endif()
 endif()
 

diff --git a/src/bindings/python/PyPackedImageDesc.cpp b/src/bindings/python/PyPackedImageDesc.cpp
@@ -15,10 +15,7 @@ void bindPyPackedImageDesc(py::module & m)
         .def(py::init([](py::buffer & data, long width, long height, long numChannels) 
             { 
                 PyPackedImageDesc * p = new PyPackedImageDesc();
-
-                py::gil_scoped_release release;
                 p->m_data[0] = data;
-                py::gil_scoped_acquire acquire;
 
                 py::buffer_info info = p->m_data[0].request();
                 checkBufferType(info, py::dtype("float32"));
@@ -39,10 +36,7 @@ void bindPyPackedImageDesc(py::module & m)
                          ptrdiff_t yStrideBytes) 
             { 
                 PyPackedImageDesc * p = new PyPackedImageDesc();
-
-                py::gil_scoped_release release;
                 p->m_data[0] = data;
-                py::gil_scoped_acquire acquire;
 
                 py::buffer_info info = p->m_data[0].request();
                 checkBufferType(info, bitDepth);
@@ -65,10 +59,7 @@ void bindPyPackedImageDesc(py::module & m)
                          ChannelOrdering chanOrder) 
             { 
                 PyPackedImageDesc * p = new PyPackedImageDesc();
-
-                py::gil_scoped_release release;
                 p->m_data[0] = data;
-                py::gil_scoped_acquire acquire;
 
                 py::buffer_info info = p->m_data[0].request();
                 checkBufferType(info, py::dtype("float32"));
@@ -89,10 +80,7 @@ void bindPyPackedImageDesc(py::module & m)
                          ptrdiff_t yStrideBytes) 
             { 
                 PyPackedImageDesc * p = new PyPackedImageDesc();
-
-                py::gil_scoped_release release;
                 p->m_data[0] = data;
-                py::gil_scoped_acquire acquire;
 
                 py::buffer_info info = p->m_data[0].request();
                 checkBufferType(info, bitDepth);