turbopipe 1.2.0__tar.gz → 1.2.2__tar.gz

turbopipe-1.2.2/.github/funding.yml

@@ -0,0 +1,2 @@
+patreon: Tremeschin
+github: Tremeschin

{turbopipe-1.2.0 → turbopipe-1.2.2}/.github/workflows/release.yaml

@@ -22,9 +22,9 @@ jobs:
         run: python -m build --sdist -o package
 
       - name: upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: package
+          name: package-sdist
           path: package/*.tar.gz
 
   wheels:
@@ -35,9 +35,9 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-14]
 
     env:
-      CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* cp312-*
+      CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* cp312-* cp313-*
       CIBW_ARCHS_LINUX: auto
-      CIBW_ARCHS_MACOS: arm64
+      CIBW_ARCHS_MACOS: arm64 x86_64
       CIBW_ARCHS_WINDOWS: auto
       CIBW_SKIP: '*musllinux* *i686* *-win32'
 
@@ -50,15 +50,15 @@ jobs:
         uses: bus1/cabuild/action/msdevshell@v1
 
       - name: deps
-        run: python -m pip install cibuildwheel==2.19.2
+        run: python -m pip install cibuildwheel==2.21.3
 
       - name: wheels
         run: python -m cibuildwheel --output-dir package
 
       - name: upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: package
+          name: package-wheels-${{ matrix.os }}
           path: package/*.whl
 
   publish:
@@ -71,9 +71,10 @@ jobs:
       - uses: actions/setup-python@v5
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: package
+          pattern: 'package-*'
+          merge-multiple: true
           path: package
 
       - name: deps

{turbopipe-1.2.0 → turbopipe-1.2.2}/PKG-INFO

@@ -1,34 +1,34 @@
 Metadata-Version: 2.1
 Name: turbopipe
-Version: 1.2.0
-Summary: 🌀 Faster MemoryView inter-process data transfers for subprocesses
-Home-page: https://brokensrc.dev
+Version: 1.2.2
+Summary: 🌀 Faster ModernGL Buffers inter-process data transfers for subprocesses
 Author-Email: Tremeschin <29046864+Tremeschin@users.noreply.github.com>
 License: MIT License
-        
-        Copyright (c) 2024 Gabriel Tremeschin
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-Project-URL: Issues, https://github.com/BrokenSource/TurboPipe/issues
-Project-URL: Repository, https://github.com/BrokenSource/TurboPipe
-Project-URL: Documentation, https://github.com/BrokenSource/TurboPipe
-Project-URL: Homepage, https://brokensrc.dev
+         
+         Copyright (c) 2024 Gabriel Tremeschin
+         
+         Permission is hereby granted, free of charge, to any person obtaining a copy
+         of this software and associated documentation files (the "Software"), to deal
+         in the Software without restriction, including without limitation the rights
+         to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+         copies of the Software, and to permit persons to whom the Software is
+         furnished to do so, subject to the following conditions:
+         
+         The above copyright notice and this permission notice shall be included in all
+         copies or substantial portions of the Software.
+         
+         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+         SOFTWARE.
+         
+Project-URL: issues, https://github.com/BrokenSource/TurboPipe/issues
+Project-URL: repository, https://github.com/BrokenSource/TurboPipe
+Project-URL: documentation, https://github.com/BrokenSource/TurboPipe
+Project-URL: homepage, https://brokensrc.dev
 Requires-Python: >=3.7
 Requires-Dist: moderngl
 Description-Content-Type: text/markdown
@@ -100,7 +100,7 @@ import turbopipe
 
 # Create ModernGL objects
 ctx = moderngl.create_standalone_context()
-buffer = ctx.buffer(reserve=1920*1080*3)
+buffers = [ctx.buffer(reserve=1920*1080*3) for _ in range(2)]
 
 # Make sure resolution, pixel format matches!
 ffmpeg = subprocess.Popen(
@@ -109,12 +109,15 @@ ffmpeg = subprocess.Popen(
 )
 
 # Rendering loop of yours (eg. 1m footage)
-for _ in range(60 * 60):
+for frame in range(60 * 60):
+    buffer = buffers[frame % len(buffer)]
+    turbopipe.sync(buffer)
+    fbo.read_into(buffer)
     turbopipe.pipe(buffer, ffmpeg.stdin.fileno())
 
 # Finalize writing, encoding
-turbopipe.sync()
 ffmpeg.stdin.close()
+turbopipe.close()
 ffmpeg.wait()
 ```
 
@@ -369,4 +372,3 @@ On realistically loads, like [**ShaderFlow**](https://github.com/BrokenSource/Sh
 - Disable/investigate performance degradation on Windows iGPUs
 - Improve the thread synchronization and/or use a ThreadPool
 - Maybe use `mmap` instead of chunks writing on Linux
-- Test on macOS 🙈

{turbopipe-1.2.0 → turbopipe-1.2.2}/Readme.md

@@ -65,7 +65,7 @@ import turbopipe
 
 # Create ModernGL objects
 ctx = moderngl.create_standalone_context()
-buffer = ctx.buffer(reserve=1920*1080*3)
+buffers = [ctx.buffer(reserve=1920*1080*3) for _ in range(2)]
 
 # Make sure resolution, pixel format matches!
 ffmpeg = subprocess.Popen(
@@ -74,12 +74,15 @@ ffmpeg = subprocess.Popen(
 )
 
 # Rendering loop of yours (eg. 1m footage)
-for _ in range(60 * 60):
+for frame in range(60 * 60):
+    buffer = buffers[frame % len(buffer)]
+    turbopipe.sync(buffer)
+    fbo.read_into(buffer)
     turbopipe.pipe(buffer, ffmpeg.stdin.fileno())
 
 # Finalize writing, encoding
-turbopipe.sync()
 ffmpeg.stdin.close()
+turbopipe.close()
 ffmpeg.wait()
 ```
 
@@ -334,4 +337,3 @@ On realistically loads, like [**ShaderFlow**](https://github.com/BrokenSource/Sh
 - Disable/investigate performance degradation on Windows iGPUs
 - Improve the thread synchronization and/or use a ThreadPool
 - Maybe use `mmap` instead of chunks writing on Linux
-- Test on macOS 🙈

{turbopipe-1.2.0 → turbopipe-1.2.2}/pyproject.toml

@@ -7,7 +7,7 @@ homepage      = "https://brokensrc.dev"
 [project]
 name        = "turbopipe"
 dynamic     = ["version"]
-description = "🌀 Faster MemoryView inter-process data transfers for subprocesses"
+description = "🌀 Faster ModernGL Buffers inter-process data transfers for subprocesses"
 authors     = [{name="Tremeschin", email="29046864+Tremeschin@users.noreply.github.com"}]
 readme      = "Readme.md"
 license     = {file="License.md"}

{turbopipe-1.2.0 → turbopipe-1.2.2}/turbopipe/_turbopipe.cpp

@@ -23,7 +23,6 @@
 #include <unordered_map>
 #include <deque>
 
-#define dict std::unordered_map
 using namespace std;
 
 // ------------------------------------------------------------------------------------------------|
@@ -57,10 +56,16 @@ public:
         // each thread's writing loop is done, guaranteeing finish
         for (auto& values: queue) {
             while (true) {
-                if (data != nullptr && values.second.find(data) == values.second.end())
-                    break;
-                if (data == nullptr && values.second.empty())
-                    break;
+                {
+                    // Prevent segfault on iteration on changing data
+                    lock_guard<mutex> lock(mutexes[values.first]);
+
+                    // Either all empty or some memory not queued (None or specific)
+                    if (data != nullptr && values.second.find(data) == values.second.end())
+                        break;
+                    if (data == nullptr && values.second.empty())
+                        break;
+                }
                 this_thread::sleep_for(chrono::microseconds(200));
             }
         }
@@ -76,11 +81,11 @@ public:
     }
 
 private:
-    dict<int, dict<void*, condition_variable>> pending;
-    dict<int, unordered_set<void*>> queue;
-    dict<int, deque<Work>> stream;
-    dict<int, thread> threads;
-    dict<int, mutex> mutexes;
+    unordered_map<int, unordered_map<void*, condition_variable>> pending;
+    unordered_map<int, unordered_set<void*>> queue;
+    unordered_map<int, deque<Work>> stream;
+    unordered_map<int, thread> threads;
+    unordered_map<int, mutex> mutexes;
     condition_variable signal;
     bool running;
 
@@ -88,18 +93,20 @@ private:
         Work work = {data, file, size};
         unique_lock<mutex> lock(mutexes[file]);
 
-        // Notify this memory is queued, wait if pending
-        if (!queue[file].insert(data).second) {
-            pending[file][data].wait(lock, [this, file, data] {
-                return queue[file].find(data) == queue[file].end();
-            });
+        /* Notify this memory is queued, wait if pending */ {
+            if (!queue[file].insert(data).second) {
+                pending[file][data].wait(lock, [this, file, data] {
+                    return queue[file].find(data) == queue[file].end();
+                });
+            }
         }
 
-        // Add another job to the queue
-        stream[file].push_back(work);
-        queue[file].insert(data);
-        this->running = true;
-        lock.unlock();
+        /* Add another job to the queue */ {
+            stream[file].push_back(work);
+            queue[file].insert(data);
+            this->running = true;
+            lock.unlock();
+        }
 
         // Each file descriptor has its own thread
         if (threads.find(file) == threads.end())
@@ -139,11 +146,13 @@ private:
                 }
             #endif
 
-            // Signal work is done
             lock.lock();
-            pending[file][work.data].notify_all();
-            queue[file].erase(work.data);
-            signal.notify_all();
+
+            /* Signal work is done */ {
+                pending[file][work.data].notify_all();
+                queue[file].erase(work.data);
+                signal.notify_all();
+            }
         }
     }
 };

{turbopipe-1.2.0 → turbopipe-1.2.2}/turbopipe/version.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-__version__ = "1.2.0"
+__version__ = "1.2.2"
 
 if __name__ == "__main__":
     print(__version__)