pyvpmr 240916__tar.gz → 240921__tar.gz

{pyvpmr-240916 → pyvpmr-240921}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyvpmr
-Version: 240916
+Version: 240921
 Summary: The VPMR Algorithm
 Author-email: Theodore Chang <tlcfem@gmail.com>
 Maintainer-email: Theodore Chang <tlcfem@gmail.com>
@@ -862,16 +862,16 @@ Usage: vpmr [options]
 
 Options:
 
-   -n <int>     number of terms (default: 10)
-   -d <int>     number of precision bits (default: 512)
-   -q <int>     quadrature order (default: 500)
-   -m <float>   precision multiplier (default, minimum: 1.5)
-   -nc <int>    controls the maximum exponent (default: 4)
-   -e <float>   tolerance (default: 1E-8)
-   -k <string>  file name of kernel function (default: exp(-t^2/4))
-   -s           print singular values
-   -w           print weights
-   -h           print this help message
+    -n, --max-terms             <int>     number of terms (default: 10)
+    -c, --max-exponent          <int>     maximum exponent (default: 4)
+    -d, --precision-bits        <int>     number of precision bits (default: 512)
+    -q, --quadrature-order      <int>     quadrature order (default: 500)
+    -m, --precision-multiplier  <float>   precision multiplier (default: 1.5)
+    -e, --tolerance             <float>   tolerance (default: 1E-8)
+    -k, --kernel                <string>  file name of kernel function (default uses: exp(-t^2/4))
+    -s, --singular-values                 print singular values
+    -w, --weights                         print weights
+    -h, --help                            print this help message
 ```
 
 The minimum required precision can be estimated by the parameter $n$.
@@ -891,12 +891,13 @@ The output is:
 
 ```text
 Using the following parameters:
-        nc = 4.
-         n = 30.
-     order = 500.
- precision = 336.
- tolerance = 1.0000e-08.
-    kernel = exp(-t*t/4).
+       terms = 30.
+    exponent = 4.
+   precision = 355.
+ quad. order = 500.
+  multiplier = 1.5000e+00.
+   tolerance = 1.0000e-08.
+      kernel = exp(-t*t/4).
 
 [1/6] Computing weights... [60/60]
 [2/6] Solving Lyapunov equation...
@@ -906,7 +907,7 @@ Using the following parameters:
 [6/6] Done.
 
 M = 
-+1.1745193571738943e+01-1.4261645574068720e-100j
++1.1745193571738943e+01+6.4089561283054790e-107j
 -5.5143304351134397e+00+5.7204056791636839e+00j
 -5.5143304351134397e+00-5.7204056791636839e+00j
 -1.6161617424833762e-02+2.3459542440459513e+00j
@@ -926,7 +927,7 @@ S =
 +1.7655956664692953e+00-2.7555720406099038e+00j
 +1.7655956664692953e+00+2.7555720406099038e+00j
 
-Running time: 3 s.
+Running time: 3112 ms.
 ```
 
 ![exp(-t^2/4)](https://raw.githubusercontent.com/TLCFEM/vpmr/master/resource/example.png)

{pyvpmr-240916 → pyvpmr-240921}/README.md

@@ -159,16 +159,16 @@ Usage: vpmr [options]
 
 Options:
 
-   -n <int>     number of terms (default: 10)
-   -d <int>     number of precision bits (default: 512)
-   -q <int>     quadrature order (default: 500)
-   -m <float>   precision multiplier (default, minimum: 1.5)
-   -nc <int>    controls the maximum exponent (default: 4)
-   -e <float>   tolerance (default: 1E-8)
-   -k <string>  file name of kernel function (default: exp(-t^2/4))
-   -s           print singular values
-   -w           print weights
-   -h           print this help message
+    -n, --max-terms             <int>     number of terms (default: 10)
+    -c, --max-exponent          <int>     maximum exponent (default: 4)
+    -d, --precision-bits        <int>     number of precision bits (default: 512)
+    -q, --quadrature-order      <int>     quadrature order (default: 500)
+    -m, --precision-multiplier  <float>   precision multiplier (default: 1.5)
+    -e, --tolerance             <float>   tolerance (default: 1E-8)
+    -k, --kernel                <string>  file name of kernel function (default uses: exp(-t^2/4))
+    -s, --singular-values                 print singular values
+    -w, --weights                         print weights
+    -h, --help                            print this help message
 ```
 
 The minimum required precision can be estimated by the parameter $n$.
@@ -188,12 +188,13 @@ The output is:
 
 ```text
 Using the following parameters:
-        nc = 4.
-         n = 30.
-     order = 500.
- precision = 336.
- tolerance = 1.0000e-08.
-    kernel = exp(-t*t/4).
+       terms = 30.
+    exponent = 4.
+   precision = 355.
+ quad. order = 500.
+  multiplier = 1.5000e+00.
+   tolerance = 1.0000e-08.
+      kernel = exp(-t*t/4).
 
 [1/6] Computing weights... [60/60]
 [2/6] Solving Lyapunov equation...
@@ -203,7 +204,7 @@ Using the following parameters:
 [6/6] Done.
 
 M = 
-+1.1745193571738943e+01-1.4261645574068720e-100j
++1.1745193571738943e+01+6.4089561283054790e-107j
 -5.5143304351134397e+00+5.7204056791636839e+00j
 -5.5143304351134397e+00-5.7204056791636839e+00j
 -1.6161617424833762e-02+2.3459542440459513e+00j
@@ -223,7 +224,7 @@ S =
 +1.7655956664692953e+00-2.7555720406099038e+00j
 +1.7655956664692953e+00+2.7555720406099038e+00j
 
-Running time: 3 s.
+Running time: 3112 ms.
 ```
 
 ![exp(-t^2/4)](resource/example.png)

{pyvpmr-240916 → pyvpmr-240921}/eigen/Eigen/src/Core/Array.h

@@ -126,9 +126,7 @@ class Array : public PlainObjectBase<Array<Scalar_, Rows_, Cols_, Options_, MaxR
       : Base(internal::constructor_without_unaligned_array_assert()){EIGEN_INITIALIZE_COEFFS_IF_THAT_OPTION_IS_ENABLED}
 #endif
 
-        EIGEN_DEVICE_FUNC Array(Array && other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_constructible<Scalar>::value)
-      : Base(std::move(other)) {
-  }
+        EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE constexpr Array(Array && other) = default;
   EIGEN_DEVICE_FUNC Array& operator=(Array&& other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_assignable<Scalar>::value) {
     Base::operator=(std::move(other));
     return *this;
@@ -232,7 +230,7 @@ class Array : public PlainObjectBase<Array<Scalar_, Rows_, Cols_, Options_, MaxR
   }
 
   /** Copy constructor */
-  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Array(const Array& other) : Base(other) {}
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE constexpr Array(const Array& other) = default;
 
  private:
   struct PrivateType {};

{pyvpmr-240916 → pyvpmr-240921}/eigen/Eigen/src/Core/Matrix.h

@@ -258,9 +258,7 @@ class Matrix : public PlainObjectBase<Matrix<Scalar_, Rows_, Cols_, Options_, Ma
             internal::constructor_without_unaligned_array_assert)
       : Base(internal::constructor_without_unaligned_array_assert()){EIGEN_INITIALIZE_COEFFS_IF_THAT_OPTION_IS_ENABLED}
 
-        EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE constexpr Matrix(Matrix && other)
-            EIGEN_NOEXCEPT_IF(std::is_nothrow_move_constructible<Scalar>::value)
-      : Base(std::move(other)) {}
+        EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE constexpr Matrix(Matrix && other) = default;
   EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE constexpr Matrix& operator=(Matrix&& other)
       EIGEN_NOEXCEPT_IF(std::is_nothrow_move_assignable<Scalar>::value) {
     Base::operator=(std::move(other));
@@ -379,7 +377,7 @@ class Matrix : public PlainObjectBase<Matrix<Scalar_, Rows_, Cols_, Options_, Ma
   }
 
   /** \brief Copy constructor */
-  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Matrix(const Matrix& other) : Base(other) {}
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE constexpr Matrix(const Matrix& other) = default;
 
   /** \brief Copy constructor for generic expressions.
    * \sa MatrixBase::operator=(const EigenBase<OtherDerived>&)

{pyvpmr-240916 → pyvpmr-240921}/eigen/Eigen/src/Core/PlainObjectBase.h

@@ -485,8 +485,7 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
   }
 #endif
 
-  EIGEN_DEVICE_FUNC constexpr PlainObjectBase(PlainObjectBase&& other) EIGEN_NOEXCEPT
-      : m_storage(std::move(other.m_storage)) {}
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE constexpr PlainObjectBase(PlainObjectBase&& other) = default;
 
   EIGEN_DEVICE_FUNC constexpr PlainObjectBase& operator=(PlainObjectBase&& other) EIGEN_NOEXCEPT {
     m_storage = std::move(other.m_storage);
@@ -494,8 +493,7 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
   }
 
   /** Copy constructor */
-  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE constexpr PlainObjectBase(const PlainObjectBase& other)
-      : Base(), m_storage(other.m_storage) {}
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE constexpr PlainObjectBase(const PlainObjectBase& other) = default;
   EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE PlainObjectBase(Index size, Index rows, Index cols)
       : m_storage(size, rows, cols) {
     //       EIGEN_INITIALIZE_COEFFS_IF_THAT_OPTION_IS_ENABLED

{pyvpmr-240916 → pyvpmr-240921}/pybind11/include/pybind11/detail/exception_translation.h

@@ -50,17 +50,17 @@ inline void try_translate_exceptions() {
         - delegate translation to the next translator by throwing a new type of exception.
         */
 
-    bool handled = with_internals([&](internals &internals) {
-        auto &local_exception_translators = get_local_internals().registered_exception_translators;
-        if (detail::apply_exception_translators(local_exception_translators)) {
-            return true;
-        }
-        auto &exception_translators = internals.registered_exception_translators;
-        if (detail::apply_exception_translators(exception_translators)) {
-            return true;
-        }
-        return false;
-    });
+    bool handled = with_exception_translators(
+        [&](std::forward_list<ExceptionTranslator> &exception_translators,
+            std::forward_list<ExceptionTranslator> &local_exception_translators) {
+            if (detail::apply_exception_translators(local_exception_translators)) {
+                return true;
+            }
+            if (detail::apply_exception_translators(exception_translators)) {
+                return true;
+            }
+            return false;
+        });
 
     if (!handled) {
         set_error(PyExc_SystemError, "Exception escaped from default exception translator!");

{pyvpmr-240916 → pyvpmr-240921}/pybind11/include/pybind11/detail/internals.h

@@ -39,7 +39,11 @@
 #    if PY_VERSION_HEX >= 0x030C0000 || defined(_MSC_VER)
 // Version bump for Python 3.12+, before first 3.12 beta release.
 // Version bump for MSVC piggy-backed on PR #4779. See comments there.
-#        define PYBIND11_INTERNALS_VERSION 5
+#        ifdef Py_GIL_DISABLED
+#            define PYBIND11_INTERNALS_VERSION 6
+#        else
+#            define PYBIND11_INTERNALS_VERSION 5
+#        endif
 #    else
 #        define PYBIND11_INTERNALS_VERSION 4
 #    endif
@@ -177,6 +181,7 @@ static_assert(sizeof(instance_map_shard) % 64 == 0,
 struct internals {
 #ifdef Py_GIL_DISABLED
     pymutex mutex;
+    pymutex exception_translator_mutex;
 #endif
     // std::type_index -> pybind11's type information
     type_map<type_info *> registered_types_cpp;
@@ -643,6 +648,19 @@ inline auto with_internals(const F &cb) -> decltype(cb(get_internals())) {
     return cb(internals);
 }
 
+template <typename F>
+inline auto with_exception_translators(const F &cb)
+    -> decltype(cb(get_internals().registered_exception_translators,
+                   get_local_internals().registered_exception_translators)) {
+    auto &internals = get_internals();
+#ifdef Py_GIL_DISABLED
+    std::unique_lock<pymutex> lock((internals).exception_translator_mutex);
+#endif
+    auto &local_internals = get_local_internals();
+    return cb(internals.registered_exception_translators,
+              local_internals.registered_exception_translators);
+}
+
 inline std::uint64_t mix64(std::uint64_t z) {
     // David Stafford's variant 13 of the MurmurHash3 finalizer popularized
     // by the SplitMix PRNG.

{pyvpmr-240916 → pyvpmr-240921}/pybind11/include/pybind11/pybind11.h

@@ -2586,10 +2586,12 @@ void implicitly_convertible() {
 }
 
 inline void register_exception_translator(ExceptionTranslator &&translator) {
-    detail::with_internals([&](detail::internals &internals) {
-        internals.registered_exception_translators.push_front(
-            std::forward<ExceptionTranslator>(translator));
-    });
+    detail::with_exception_translators(
+        [&](std::forward_list<ExceptionTranslator> &exception_translators,
+            std::forward_list<ExceptionTranslator> &local_exception_translators) {
+            (void) local_exception_translators;
+            exception_translators.push_front(std::forward<ExceptionTranslator>(translator));
+        });
 }
 
 /**
@@ -2599,11 +2601,12 @@ inline void register_exception_translator(ExceptionTranslator &&translator) {
  * the exception.
  */
 inline void register_local_exception_translator(ExceptionTranslator &&translator) {
-    detail::with_internals([&](detail::internals &internals) {
-        (void) internals;
-        detail::get_local_internals().registered_exception_translators.push_front(
-            std::forward<ExceptionTranslator>(translator));
-    });
+    detail::with_exception_translators(
+        [&](std::forward_list<ExceptionTranslator> &exception_translators,
+            std::forward_list<ExceptionTranslator> &local_exception_translators) {
+            (void) exception_translators;
+            local_exception_translators.push_front(std::forward<ExceptionTranslator>(translator));
+        });
 }
 
 /**

{pyvpmr-240916 → pyvpmr-240921}/pyvpmr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyvpmr
-Version: 240916
+Version: 240921
 Summary: The VPMR Algorithm
 Author-email: Theodore Chang <tlcfem@gmail.com>
 Maintainer-email: Theodore Chang <tlcfem@gmail.com>
@@ -862,16 +862,16 @@ Usage: vpmr [options]
 
 Options:
 
-   -n <int>     number of terms (default: 10)
-   -d <int>     number of precision bits (default: 512)
-   -q <int>     quadrature order (default: 500)
-   -m <float>   precision multiplier (default, minimum: 1.5)
-   -nc <int>    controls the maximum exponent (default: 4)
-   -e <float>   tolerance (default: 1E-8)
-   -k <string>  file name of kernel function (default: exp(-t^2/4))
-   -s           print singular values
-   -w           print weights
-   -h           print this help message
+    -n, --max-terms             <int>     number of terms (default: 10)
+    -c, --max-exponent          <int>     maximum exponent (default: 4)
+    -d, --precision-bits        <int>     number of precision bits (default: 512)
+    -q, --quadrature-order      <int>     quadrature order (default: 500)
+    -m, --precision-multiplier  <float>   precision multiplier (default: 1.5)
+    -e, --tolerance             <float>   tolerance (default: 1E-8)
+    -k, --kernel                <string>  file name of kernel function (default uses: exp(-t^2/4))
+    -s, --singular-values                 print singular values
+    -w, --weights                         print weights
+    -h, --help                            print this help message
 ```
 
 The minimum required precision can be estimated by the parameter $n$.
@@ -891,12 +891,13 @@ The output is:
 
 ```text
 Using the following parameters:
-        nc = 4.
-         n = 30.
-     order = 500.
- precision = 336.
- tolerance = 1.0000e-08.
-    kernel = exp(-t*t/4).
+       terms = 30.
+    exponent = 4.
+   precision = 355.
+ quad. order = 500.
+  multiplier = 1.5000e+00.
+   tolerance = 1.0000e-08.
+      kernel = exp(-t*t/4).
 
 [1/6] Computing weights... [60/60]
 [2/6] Solving Lyapunov equation...
@@ -906,7 +907,7 @@ Using the following parameters:
 [6/6] Done.
 
 M = 
-+1.1745193571738943e+01-1.4261645574068720e-100j
++1.1745193571738943e+01+6.4089561283054790e-107j
 -5.5143304351134397e+00+5.7204056791636839e+00j
 -5.5143304351134397e+00-5.7204056791636839e+00j
 -1.6161617424833762e-02+2.3459542440459513e+00j
@@ -926,7 +927,7 @@ S =
 +1.7655956664692953e+00-2.7555720406099038e+00j
 +1.7655956664692953e+00+2.7555720406099038e+00j
 
-Running time: 3 s.
+Running time: 3112 ms.
 ```
 
 ![exp(-t^2/4)](https://raw.githubusercontent.com/TLCFEM/vpmr/master/resource/example.png)