fix: update version number and threadpool.h to modern c++

seung-lab · Dec 19, 2023 · 585bb61 · 585bb61
1 parent 239f9c1
commit 585bb61
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -36,6 +36,7 @@ jobs:
         env:
           CIBW_ARCHS_LINUX: ${{matrix.arch}}
           CIBW_BEFORE_BUILD: pip install oldest-supported-numpy setuptools wheel
+          CIBW_ARCHS_MACOS: "x86_64 arm64"
 
       - uses: actions/upload-artifact@v2
         with:

diff --git a/python/ChangeLog b/python/ChangeLog
@@ -1,6 +1,30 @@
 CHANGES
 =======
 
+2.3.2
+-----
+
+* build: update for py312
+* docs: describe voxel\_graph parameter
+* fix: use cython.binding(True) on headline methods
+* fix: use cython.binding(True) on headline methods
+* build: add pyproject.toml
+* ci: add testing and update wheel builds for py312
+* build: str of NumpyImport
+* build: update cibuildwheel
+* update build
+* chore: update supported python versions
+* chore: remove appveyor
+
+2.3.1
+-----
+
+* release(2.3.1): update build system
+* fix: update build for py311
+* build: add py311 to tox
+* chore: update edt.cpp
+* install: delay numpy invocation
+
 2.3.0
 -----
 

diff --git a/python/edt.pyx b/python/edt.pyx
@@ -39,7 +39,7 @@ from cpython cimport array
 cimport numpy as np
 import numpy as np
 
-__VERSION__ = '2.3.1'
+__VERSION__ = '2.3.2'
 
 ctypedef fused UINT:
   uint8_t

diff --git a/python/threadpool.h b/python/threadpool.h
@@ -27,6 +27,7 @@ May 2019
 - The license file was moved from a seperate file to the top of this one.
 - Created public "join" member function from destructor code.
 - Created public "start" member function from constructor code.
+- Used std::invoke_result_t to update to modern C++
 */
 
 #ifndef THREAD_POOL_H
@@ -47,7 +48,7 @@ class ThreadPool {
     ThreadPool(size_t);
     template<class F, class... Args>
     auto enqueue(F&& f, Args&&... args) 
-        -> std::future<typename std::result_of<F(Args...)>::type>;
+        -> std::future<std::invoke_result_t<F, Args...>>;
     void start(size_t);
     void join();
     ~ThreadPool();
@@ -99,9 +100,9 @@ void ThreadPool::start(size_t threads) {
 // add new work item to the pool
 template<class F, class... Args>
 auto ThreadPool::enqueue(F&& f, Args&&... args) 
-    -> std::future<typename std::result_of<F(Args...)>::type>
+    -> std::future<std::invoke_result_t<F, Args...>>
 {
-    using return_type = typename std::result_of<F(Args...)>::type;
+    using return_type = std::invoke_result_t<F, Args...>;
 
     auto task = std::make_shared< std::packaged_task<return_type()> >(
             std::bind(std::forward<F>(f), std::forward<Args>(args)...)