TidalPy 0.5.1__tar.gz → 0.5.3__tar.gz

{TidalPy-0.5.1 → tidalpy-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TidalPy
-Version: 0.5.1
+Version: 0.5.3
 Summary: Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python
 Author-email: "Joe P. Renaud" <TidalPy@gmail.com>
 License: # License
@@ -181,6 +181,7 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Cython
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -207,7 +208,7 @@ Requires-Dist: toml>=0.10.2
 Requires-Dist: dill>=0.3.2
 Requires-Dist: psutil>=5.8.0
 Requires-Dist: pathos>=0.2.0
-Requires-Dist: cyrk>=0.8.6
+Requires-Dist: cyrk>=0.8.7
 Requires-Dist: astropy
 Requires-Dist: astroquery
 Provides-Extra: dev
@@ -247,7 +248,7 @@ Requires-Dist: diffeqpy>=1.2.0; extra == "julia"
 
 ---
 
-<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.5.1 Alpha-orange" alt="TidalPy Version 0.5.1 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.5.3 Alpha-orange" alt="TidalPy Version 0.5.3 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 

{TidalPy-0.5.1 → tidalpy-0.5.3}/README.md

@@ -11,7 +11,7 @@
 
 ---
 
-<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.5.1 Alpha-orange" alt="TidalPy Version 0.5.1 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.5.3 Alpha-orange" alt="TidalPy Version 0.5.3 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 

{TidalPy-0.5.1 → tidalpy-0.5.3}/Tests/Test_RadialSolver/test_a_interfaces.py

@@ -10,52 +10,72 @@ from TidalPy.RadialSolver.interfaces.interfaces import solve_upper_y_at_interfac
 
 tpy_0p4_results = {
     (True, True, True, True): np.asarray(
-        [(0.1+0.1j), (0.2+0.2j), (0.3+0.3j), (0.4+0.4j), (0.5+0.5j), (0.6+0.6j), (-0.1-0.1j), (-0.2-0.2j), (-0.3-0.3j), (-0.4-0.4j), (-0.5-0.5j), (-0.6-0.6j), (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (0.54+0.54j), (0.76+0.76j), (1+1j), (12.06+12.06j)],
+        [(0.1+0.1j), (0.2+0.2j), (0.3+0.3j), (0.4+0.4j), (0.5+0.5j), (0.6+0.6j),
+         (-0.1-0.1j), (-0.2-0.2j), (-0.3-0.3j), (-0.4-0.4j), (-0.5-0.5j), (-0.6-0.6j),
+         (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (0.54+0.54j), (0.76+0.76j), (1+1j), (12.06+12.06j)],
         dtype=np.complex128, order="C"),
     (True, True, True, False): np.asarray(
-        [(0.1+0.1j), (0.2+0.2j), (0.3+0.3j), (0.4+0.4j), (0.5+0.5j), (0.6+0.6j), (-0.1-0.1j), (-0.2-0.2j), (-0.3-0.3j), (-0.4-0.4j), (-0.5-0.5j), (-0.6-0.6j), (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (0.54+0.54j), (0.76+0.76j), (1+1j), (12.06+12.06j)],
+        [(0.1+0.1j), (0.2+0.2j), (0.3+0.3j), (0.4+0.4j), (0.5+0.5j), (0.6+0.6j),
+         (-0.1-0.1j), (-0.2-0.2j), (-0.3-0.3j), (-0.4-0.4j), (-0.5-0.5j), (-0.6-0.6j),
+         (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (0.54+0.54j), (0.76+0.76j), (1+1j), (12.06+12.06j)],
         dtype=np.complex128, order="C"),
     (True, True, False, True): np.asarray(
-        [0j, 0j],
+        [0j, 0j, np.nan, np.nan, np.nan, np.nan],
         dtype=np.complex128, order="C"),
     (True, True, False, False): np.asarray(
-        [(0.01578947368421052+0.01578947368421052j), (0.02105263157894738+0.02105263157894738j), (-0.02631578947368418-0.02631578947368418j), (-5.747368421052632-5.747368421052632j), (-0.01578947368421052-0.01578947368421052j), (-0.02105263157894738-0.02105263157894738j), (0.02631578947368418+0.02631578947368418j), (5.747368421052632+5.747368421052632j)],
+        [(0.01578947368421052+0.01578947368421052j), (0.02105263157894738+0.02105263157894738j), (-0.02631578947368418-0.02631578947368418j), (-5.747368421052632-5.747368421052632j), np.nan, np.nan,
+         (-0.01578947368421052-0.01578947368421052j), (-0.02105263157894738-0.02105263157894738j), (0.02631578947368418+0.02631578947368418j), (5.747368421052632+5.747368421052632j), np.nan, np.nan],
         dtype=np.complex128, order="C"),
     (True, False, True, True): np.asarray(
-        [(0.1+0.1j), (0.2+0.2j), (0.3+0.3j), (0.4+0.4j), (0.5+0.5j), (0.6+0.6j), (-0.1-0.1j), (-0.2-0.2j), (-0.3-0.3j), (-0.4-0.4j), (-0.5-0.5j), (-0.6-0.6j), (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (0.54+0.54j), (0.76+0.76j), (1+1j), (12.06+12.06j)],
+        [(0.1+0.1j), (0.2+0.2j), (0.3+0.3j), (0.4+0.4j), (0.5+0.5j), (0.6+0.6j),
+         (-0.1-0.1j), (-0.2-0.2j), (-0.3-0.3j), (-0.4-0.4j), (-0.5-0.5j), (-0.6-0.6j),
+         (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (0.54+0.54j), (0.76+0.76j), (1+1j), (12.06+12.06j)],
         dtype=np.complex128, order="C"),
     (True, False, True, False): np.asarray(
-        [(0.1+0.1j), (0.2+0.2j), (0.3+0.3j), (0.4+0.4j), (0.5+0.5j), (0.6+0.6j), (-0.1-0.1j), (-0.2-0.2j), (-0.3-0.3j), (-0.4-0.4j), (-0.5-0.5j), (-0.6-0.6j), (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (0.54+0.54j), (0.76+0.76j), (1+1j), (12.06+12.06j)],
+        [(0.1+0.1j), (0.2+0.2j), (0.3+0.3j), (0.4+0.4j), (0.5+0.5j), (0.6+0.6j),
+         (-0.1-0.1j), (-0.2-0.2j), (-0.3-0.3j), (-0.4-0.4j), (-0.5-0.5j), (-0.6-0.6j),
+         (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (0.54+0.54j), (0.76+0.76j), (1+1j), (12.06+12.06j)],
         dtype=np.complex128, order="C"),
     (True, False, False, True): np.asarray(
-        [0j, 0j],
+        [0j, 0j, np.nan, np.nan, np.nan, np.nan],
         dtype=np.complex128, order="C"),
     (True, False, False, False): np.asarray(
-        [(0.01578947368421052+0.01578947368421052j), (0.02105263157894738+0.02105263157894738j), (-0.02631578947368418-0.02631578947368418j), (-5.747368421052632-5.747368421052632j), (-0.01578947368421052-0.01578947368421052j), (-0.02105263157894738-0.02105263157894738j), (0.02631578947368418+0.02631578947368418j), (5.747368421052632+5.747368421052632j)],
+        [(0.01578947368421052+0.01578947368421052j), (0.02105263157894738+0.02105263157894738j), (-0.02631578947368418-0.02631578947368418j), (-5.747368421052632-5.747368421052632j), np.nan, np.nan,
+         (-0.01578947368421052-0.01578947368421052j), (-0.02105263157894738-0.02105263157894738j), (0.02631578947368418+0.02631578947368418j), (5.747368421052632+5.747368421052632j), np.nan, np.nan],
         dtype=np.complex128, order="C"),
     (False, True, True, True): np.asarray(
-        [0j, (-3800-3800j), 0j, 0j, (0.5+0.5j), (0.600001180416904-9.599998819583096j), (1+0j), (20520+0j), 0j, 0j, 0j, (-6.374251281747724e-06+0j), 0j, 0j, (1+0j), 0j, 0j, 0j],
+        [0j, (-3800-3800j), 0j, 0j, (0.5+0.5j), (0.600001180416904-9.599998819583096j),
+         (1+0j), (20520+0j), 0j, 0j, 0j, (-6.374251281747724e-06+0j),
+         0j, 0j, (1+0j), 0j, 0j, 0j],
         dtype=np.complex128, order="C"),
     (False, True, True, False): np.asarray(
-        [0j, (-3800-3800j), 0j, 0j, (0.5+0.5j), (0.600001180416904-9.599998819583096j), (1+0j), (20520+0j), 0j, 0j, 0j, (-6.374251281747724e-06+0j), 0j, 0j, (1+0j), 0j, 0j, 0j],
+        [0j, (-3800-3800j), 0j, 0j, (0.5+0.5j), (0.600001180416904-9.599998819583096j),
+         (1+0j), (20520+0j), 0j, 0j, 0j, (-6.374251281747724e-06+0j),
+         0j, 0j, (1+0j), 0j, 0j, 0j],
         dtype=np.complex128, order="C"),
     (False, True, False, True): np.asarray(
-        [(0.5+0.5j), (0.6-9.6j)],
+        [(0.5+0.5j), (0.6-9.6j), np.nan, np.nan, np.nan, np.nan],
         dtype=np.complex128, order="C"),
     (False, True, False, False): np.asarray(
-        [0j, (-3800-3800j), (0.5+0.5j), (0.600001180416904-9.599998819583096j), (1+0j), (20520+0j), 0j, (-6.374251281747724e-06+0j)],
+        [0j, (-3800-3800j), (0.5+0.5j), (0.600001180416904-9.599998819583096j), np.nan, np.nan,
+         (1+0j), (20520+0j), 0j, (-6.374251281747724e-06+0j), np.nan, np.nan],
         dtype=np.complex128, order="C"),
     (False, False, True, True): np.asarray(
-        [(0.1+0.1j), (0.2+0.2j), 0j, 0j, (0.5+0.5j), (0.6+0.6j), (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), 0j, 0j, (1+1j), (12.06+12.06j), 0j, 0j, (1+0j), 0j, 0j, 0j],
+        [(0.1+0.1j), (0.2+0.2j), 0j, 0j, (0.5+0.5j), (0.6+0.6j),
+         (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), 0j, 0j, (1+1j), (12.06+12.06j),
+         0j, 0j, (1+0j), 0j, 0j, 0j],
         dtype=np.complex128, order="C"),
     (False, False, True, False): np.asarray(
-        [(0.1+0.1j), (0.2+0.2j), 0j, 0j, (0.5+0.5j), (0.6+0.6j), (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), 0j, 0j, (1+1j), (12.06+12.06j), 0j, 0j, (1+0j), 0j, 0j, 0j],
+        [(0.1+0.1j), (0.2+0.2j), 0j, 0j, (0.5+0.5j), (0.6+0.6j),
+         (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), 0j, 0j, (1+1j), (12.06+12.06j),
+         0j, 0j, (1+0j), 0j, 0j, 0j],
         dtype=np.complex128, order="C"),
     (False, False, False, True): np.asarray(
-        [(0.09505598613897154+0.09505598613897154j), (-4.283624807144646-4.283624807144646j)],
+        [(0.09505598613897154+0.09505598613897154j), (-4.283624807144646-4.283624807144646j), np.nan, np.nan, np.nan, np.nan],
         dtype=np.complex128, order="C"),
     (False, False, False, False): np.asarray(
-        [(0.1+0.1j), (0.2+0.2j), (0.5+0.5j), (0.6+0.6j), (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (1+1j), (12.06+12.06j)],
+        [(0.1+0.1j), (0.2+0.2j), (0.5+0.5j), (0.6+0.6j), np.nan, np.nan,
+         (0.16000000000000003+0.16000000000000003j), (0.34+0.34j), (1+1j), (12.06+12.06j), np.nan, np.nan],
         dtype=np.complex128, order="C")
 }
 
@@ -69,13 +89,15 @@ y_lower_solid = np.asarray(
     (1.6*(0.1+0.1j), 1.7*(0.2+0.2j), 1.8*(0.3+0.3j), 1.9*(0.4+0.4j), 2.0*(0.5+0.5j), 20.1*(0.6+0.6j))), dtype=np.complex128
 )
 y_lower_liquid = np.asarray(
-    ((0.1+0.1j, 0.2+0.2j, 0.5+0.5j, 0.6+0.6j),
-    (1.6*(0.1+0.1j), 1.7*(0.2+0.2j), 2.0*(0.5+0.5j), 20.1*(0.6+0.6j))), dtype=np.complex128
+    ((0.1+0.1j, 0.2+0.2j, 0.5+0.5j, 0.6+0.6j, np.nan, np.nan),
+    (1.6*(0.1+0.1j), 1.7*(0.2+0.2j), 2.0*(0.5+0.5j), 20.1*(0.6+0.6j), np.nan, np.nan)), dtype=np.complex128
 )
 y_lower_staticliq = np.asarray(
-    ((0.5+0.5j, 0.6-9.6j),), dtype=np.complex128
+    ((0.5+0.5j, 0.6-9.6j, np.nan, np.nan, np.nan, np.nan),), dtype=np.complex128
 )
 
+MAX_NUM_Ys = 6
+
 @pytest.mark.parametrize('lower_layer_type', (0, 1))
 @pytest.mark.parametrize('lower_is_static', (True, False))
 @pytest.mark.parametrize('upper_layer_type', (0, 1))
@@ -103,7 +125,7 @@ def test_interface_driver(lower_layer_type, lower_is_static, upper_layer_type, u
         lower_y = y_lower_liquid
     
     # Create array full of nans for the "output" array. If things worked okay then they should no longer be nan.
-    upper_y = np.nan * np.ones((num_sols_upper, num_ys_upper), dtype=np.complex128, order='C')
+    upper_y = np.nan * np.ones((3, 6), dtype=np.complex128, order='C')
 
     solve_upper_y_at_interface(
         lower_y, upper_y,
@@ -112,8 +134,8 @@ def test_interface_driver(lower_layer_type, lower_is_static, upper_layer_type, u
         interface_gravity, static_liquid_density, G_to_use
         )
 
-    # Make sure all of the array elements were set.
-    assert np.all(np.isnan(upper_y) == False)
+    # Make sure the correct number of array elements were set.
+    assert np.sum(~np.isnan(upper_y)) == (num_sols_upper * num_ys_upper)
 
 
 @pytest.mark.parametrize('lower_layer_type', (0, 1))
@@ -150,7 +172,7 @@ def test_interface_accuracy(lower_layer_type, lower_is_static, upper_layer_type,
             lower_y = y_lower_liquid
         
         # Create array full of nans for the "output" array. If things worked okay then they should no longer be nan.
-        upper_y = np.nan * np.ones((num_sols_upper, num_ys_upper), dtype=np.complex128, order='C')
+        upper_y = np.nan * np.ones((3, 6), dtype=np.complex128, order='C')
         
         solve_upper_y_at_interface(
             lower_y, upper_y,
@@ -159,9 +181,8 @@ def test_interface_accuracy(lower_layer_type, lower_is_static, upper_layer_type,
             interface_gravity, static_liquid_density, G_to_use
             )
 
-        # Make sure all of the array elements were set.
-        assert np.all(np.isnan(upper_y) == False)
-
         # Compare results to TidalPy 0.4.0 pre-calculated interface solution.
         comparison_results = tpy_0p4_results[(lower_layer_is_solid, lower_is_static, upper_layer_is_solid, upper_is_static)]
-        np.allclose(upper_y.flatten(), comparison_results)
+        comparison_results_no_nan = comparison_results[~np.isnan(comparison_results)]
+        upper_y_no_nan = upper_y[~np.isnan(upper_y)]
+        np.allclose(upper_y_no_nan.flatten(), comparison_results_no_nan)

{TidalPy-0.5.1 → tidalpy-0.5.3}/Tests/Test_RadialSolver/test_e_radial_solver_3layer.py

@@ -123,4 +123,4 @@ def test_radial_solver_3layer_solve_for_both(solid_is_static, liquid_is_static,
         assert type(out.result) is np.ndarray
         assert out.result.shape == (len(solve_for) * 6, radius_array.size)
     except NotImplementedError as e:
-        warnings.warn(f'function does not currently support requested inputs. Skipping Test. Details: {e}')
+         pytest.skip(f'function does not currently support requested inputs. Skipping Test. Details: {e}')

{TidalPy-0.5.1 → tidalpy-0.5.3}/Tests/Test_Utilities/Test_Dimensions/test_nondimensional.py

@@ -54,7 +54,7 @@ def test_non_dimensionalize_physicals():
     # Check that the redimensionalize function works too.
     # Use the output from the non-dim as inputs to the redim.
     output_freq_redim, G_redim = redimensionalize_physicals(
-        output_freq_nondim, mean_radius, bulk_density,
+        frequency, mean_radius, bulk_density,
         radius_array_out, density_array_out, gravity_array_out, bulk_array_out, shear_array_out)
 
     # These should all match the original again.

{TidalPy-0.5.1 → tidalpy-0.5.3}/TidalPy/RadialSolver/boundaries/boundaries.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 3.0.8 */
+/* Generated by Cython 3.0.10 */
 
 /* BEGIN: Cython Metadata
 {
@@ -20,7 +20,7 @@
         ],
         "include_dirs": [
             "TidalPy/RadialSolver/boundaries",
-            "/tmp/build-env-3gcos8ox/lib/python3.10/site-packages/numpy/core/include"
+            "/tmp/build-env-a4pe7e8f/lib/python3.10/site-packages/numpy/core/include"
         ],
         "language": "c",
         "name": "TidalPy.RadialSolver.boundaries.boundaries",
@@ -56,10 +56,10 @@ END: Cython Metadata */
 #else
 #define __PYX_EXTRA_ABI_MODULE_NAME ""
 #endif
-#define CYTHON_ABI "3_0_8" __PYX_EXTRA_ABI_MODULE_NAME
+#define CYTHON_ABI "3_0_10" __PYX_EXTRA_ABI_MODULE_NAME
 #define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
 #define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
-#define CYTHON_HEX_VERSION 0x030008F0
+#define CYTHON_HEX_VERSION 0x03000AF0
 #define CYTHON_FUTURE_DIVISION 1
 #include <stddef.h>
 #ifndef offsetof
@@ -151,6 +151,8 @@ END: Cython Metadata */
   #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
     #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
   #endif
+  #undef CYTHON_USE_FREELISTS
+  #define CYTHON_USE_FREELISTS 0
 #elif defined(PYPY_VERSION)
   #define CYTHON_COMPILING_IN_PYPY 1
   #define CYTHON_COMPILING_IN_CPYTHON 0
@@ -212,6 +214,8 @@ END: Cython Metadata */
   #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
     #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
   #endif
+  #undef CYTHON_USE_FREELISTS
+  #define CYTHON_USE_FREELISTS 0
 #elif defined(CYTHON_LIMITED_API)
   #ifdef Py_LIMITED_API
     #undef __PYX_LIMITED_VERSION_HEX
@@ -273,6 +277,8 @@ END: Cython Metadata */
   #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
     #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
   #endif
+  #undef CYTHON_USE_FREELISTS
+  #define CYTHON_USE_FREELISTS 0
 #elif defined(Py_GIL_DISABLED) || defined(Py_NOGIL)
   #define CYTHON_COMPILING_IN_PYPY 0
   #define CYTHON_COMPILING_IN_CPYTHON 0
@@ -282,11 +288,17 @@ END: Cython Metadata */
   #ifndef CYTHON_USE_TYPE_SLOTS
     #define CYTHON_USE_TYPE_SLOTS 1
   #endif
+  #ifndef CYTHON_USE_TYPE_SPECS
+    #define CYTHON_USE_TYPE_SPECS 0
+  #endif
   #undef CYTHON_USE_PYTYPE_LOOKUP
   #define CYTHON_USE_PYTYPE_LOOKUP 0
   #ifndef CYTHON_USE_ASYNC_SLOTS
     #define CYTHON_USE_ASYNC_SLOTS 1
   #endif
+  #ifndef CYTHON_USE_PYLONG_INTERNALS
+    #define CYTHON_USE_PYLONG_INTERNALS 0
+  #endif
   #undef CYTHON_USE_PYLIST_INTERNALS
   #define CYTHON_USE_PYLIST_INTERNALS 0
   #ifndef CYTHON_USE_UNICODE_INTERNALS
@@ -294,8 +306,6 @@ END: Cython Metadata */
   #endif
   #undef CYTHON_USE_UNICODE_WRITER
   #define CYTHON_USE_UNICODE_WRITER 0
-  #undef CYTHON_USE_PYLONG_INTERNALS
-  #define CYTHON_USE_PYLONG_INTERNALS 0
   #ifndef CYTHON_AVOID_BORROWED_REFS
     #define CYTHON_AVOID_BORROWED_REFS 0
   #endif
@@ -307,11 +317,22 @@ END: Cython Metadata */
   #endif
   #undef CYTHON_FAST_THREAD_STATE
   #define CYTHON_FAST_THREAD_STATE 0
+  #undef CYTHON_FAST_GIL
+  #define CYTHON_FAST_GIL 0
+  #ifndef CYTHON_METH_FASTCALL
+    #define CYTHON_METH_FASTCALL 1
+  #endif
   #undef CYTHON_FAST_PYCALL
   #define CYTHON_FAST_PYCALL 0
+  #ifndef CYTHON_PEP487_INIT_SUBCLASS
+    #define CYTHON_PEP487_INIT_SUBCLASS 1
+  #endif
   #ifndef CYTHON_PEP489_MULTI_PHASE_INIT
     #define CYTHON_PEP489_MULTI_PHASE_INIT 1
   #endif
+  #ifndef CYTHON_USE_MODULE_STATE
+    #define CYTHON_USE_MODULE_STATE 0
+  #endif
   #ifndef CYTHON_USE_TP_FINALIZE
     #define CYTHON_USE_TP_FINALIZE 1
   #endif
@@ -319,6 +340,12 @@ END: Cython Metadata */
   #define CYTHON_USE_DICT_VERSIONS 0
   #undef CYTHON_USE_EXC_INFO_STACK
   #define CYTHON_USE_EXC_INFO_STACK 0
+  #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
+    #define CYTHON_UPDATE_DESCRIPTOR_DOC 1
+  #endif
+  #ifndef CYTHON_USE_FREELISTS
+    #define CYTHON_USE_FREELISTS 0
+  #endif
 #else
   #define CYTHON_COMPILING_IN_PYPY 0
   #define CYTHON_COMPILING_IN_CPYTHON 1
@@ -409,6 +436,9 @@ END: Cython Metadata */
   #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
     #define CYTHON_UPDATE_DESCRIPTOR_DOC 1
   #endif
+  #ifndef CYTHON_USE_FREELISTS
+    #define CYTHON_USE_FREELISTS 1
+  #endif
 #endif
 #if !defined(CYTHON_FAST_PYCCALL)
 #define CYTHON_FAST_PYCCALL  (CYTHON_FAST_PYCALL && PY_VERSION_HEX >= 0x030600B1)
@@ -752,8 +782,13 @@ END: Cython Metadata */
   typedef PyObject *(*__Pyx_PyCFunctionFastWithKeywords) (PyObject *self, PyObject *const *args,
                                                           Py_ssize_t nargs, PyObject *kwnames);
 #else
-  #define __Pyx_PyCFunctionFast _PyCFunctionFast
-  #define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords
+  #if PY_VERSION_HEX >= 0x030d00A4
+  #  define __Pyx_PyCFunctionFast PyCFunctionFast
+  #  define __Pyx_PyCFunctionFastWithKeywords PyCFunctionFastWithKeywords
+  #else
+  #  define __Pyx_PyCFunctionFast _PyCFunctionFast
+  #  define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords
+  #endif
 #endif
 #if CYTHON_METH_FASTCALL
   #define __Pyx_METH_FASTCALL METH_FASTCALL
@@ -1105,7 +1140,7 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict,
   #define __Pyx_PyBytes_GET_SIZE(o) PyBytes_Size(o)
   #define __Pyx_PyByteArray_GET_SIZE(o) PyByteArray_Size(o)
 #endif
-#if PY_VERSION_HEX >= 0x030d00A1
+#if __PYX_LIMITED_VERSION_HEX >= 0x030d00A1
   #define __Pyx_PyImport_AddModuleRef(name) PyImport_AddModuleRef(name)
 #else
   static CYTHON_INLINE PyObject *__Pyx_PyImport_AddModuleRef(const char *name) {
@@ -1192,7 +1227,7 @@ static CYTHON_INLINE float __PYX_NAN() {
 #endif
 
 #define __PYX_MARK_ERR_POS(f_index, lineno) \
-    { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__; (void)__pyx_clineno; }
+    { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__;  (void)__pyx_clineno; }
 #define __PYX_ERR(f_index, lineno, Ln_error) \
     { __PYX_MARK_ERR_POS(f_index, lineno) goto Ln_error; }
 
@@ -1296,24 +1331,7 @@ static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(const char*);
 #define __Pyx_PyByteArray_FromCString(s)   __Pyx_PyByteArray_FromString((const char*)s)
 #define __Pyx_PyStr_FromCString(s)     __Pyx_PyStr_FromString((const char*)s)
 #define __Pyx_PyUnicode_FromCString(s) __Pyx_PyUnicode_FromString((const char*)s)
-#if CYTHON_COMPILING_IN_LIMITED_API
-static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const wchar_t *u)
-{
-    const wchar_t *u_end = u;
-    while (*u_end++) ;
-    return (size_t)(u_end - u - 1);
-}
-#else
-static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const Py_UNICODE *u)
-{
-    const Py_UNICODE *u_end = u;
-    while (*u_end++) ;
-    return (size_t)(u_end - u - 1);
-}
-#endif
 #define __Pyx_PyUnicode_FromOrdinal(o)       PyUnicode_FromOrdinal((int)o)
-#define __Pyx_PyUnicode_FromUnicode(u)       PyUnicode_FromUnicode(u, __Pyx_Py_UNICODE_strlen(u))
-#define __Pyx_PyUnicode_FromUnicodeAndLength PyUnicode_FromUnicode
 #define __Pyx_PyUnicode_AsUnicode            PyUnicode_AsUnicode
 #define __Pyx_NewRef(obj) (Py_INCREF(obj), obj)
 #define __Pyx_Owned_Py_None(b) __Pyx_NewRef(Py_None)
@@ -1509,7 +1527,7 @@ static const char *__pyx_f[] = {
 /* #### Code section: utility_code_proto_before_types ### */
 /* #### Code section: numeric_typedefs ### */
 
-/* "scipy/linalg/cython_lapack.pxd":15
+/* "scipy/linalg/cython_lapack.pxd":17
  * # The original libraries should be linked directly.
  * 
  * ctypedef float s             # <<<<<<<<<<<<<<
@@ -1518,7 +1536,7 @@ static const char *__pyx_f[] = {
  */
 typedef float __pyx_t_5scipy_6linalg_13cython_lapack_s;
 
-/* "scipy/linalg/cython_lapack.pxd":16
+/* "scipy/linalg/cython_lapack.pxd":18
  * 
  * ctypedef float s
  * ctypedef double d             # <<<<<<<<<<<<<<
@@ -1555,7 +1573,7 @@ static CYTHON_INLINE __pyx_t_float_complex __pyx_t_float_complex_from_parts(floa
 
 /*--- Type declarations ---*/
 
-/* "scipy/linalg/cython_lapack.pxd":22
+/* "scipy/linalg/cython_lapack.pxd":24
  * # Function pointer type declarations for
  * # gees and gges families of functions.
  * ctypedef bint cselect1(c*)             # <<<<<<<<<<<<<<
@@ -1564,7 +1582,7 @@ static CYTHON_INLINE __pyx_t_float_complex __pyx_t_float_complex_from_parts(floa
  */
 typedef int __pyx_t_5scipy_6linalg_13cython_lapack_cselect1(__pyx_t_float_complex *);
 
-/* "scipy/linalg/cython_lapack.pxd":23
+/* "scipy/linalg/cython_lapack.pxd":25
  * # gees and gges families of functions.
  * ctypedef bint cselect1(c*)
  * ctypedef bint cselect2(c*, c*)             # <<<<<<<<<<<<<<
@@ -1573,7 +1591,7 @@ typedef int __pyx_t_5scipy_6linalg_13cython_lapack_cselect1(__pyx_t_float_comple
  */
 typedef int __pyx_t_5scipy_6linalg_13cython_lapack_cselect2(__pyx_t_float_complex *, __pyx_t_float_complex *);
 
-/* "scipy/linalg/cython_lapack.pxd":24
+/* "scipy/linalg/cython_lapack.pxd":26
  * ctypedef bint cselect1(c*)
  * ctypedef bint cselect2(c*, c*)
  * ctypedef bint dselect2(d*, d*)             # <<<<<<<<<<<<<<
@@ -1582,7 +1600,7 @@ typedef int __pyx_t_5scipy_6linalg_13cython_lapack_cselect2(__pyx_t_float_comple
  */
 typedef int __pyx_t_5scipy_6linalg_13cython_lapack_dselect2(__pyx_t_5scipy_6linalg_13cython_lapack_d *, __pyx_t_5scipy_6linalg_13cython_lapack_d *);
 
-/* "scipy/linalg/cython_lapack.pxd":25
+/* "scipy/linalg/cython_lapack.pxd":27
  * ctypedef bint cselect2(c*, c*)
  * ctypedef bint dselect2(d*, d*)
  * ctypedef bint dselect3(d*, d*, d*)             # <<<<<<<<<<<<<<
@@ -1591,7 +1609,7 @@ typedef int __pyx_t_5scipy_6linalg_13cython_lapack_dselect2(__pyx_t_5scipy_6lina
  */
 typedef int __pyx_t_5scipy_6linalg_13cython_lapack_dselect3(__pyx_t_5scipy_6linalg_13cython_lapack_d *, __pyx_t_5scipy_6linalg_13cython_lapack_d *, __pyx_t_5scipy_6linalg_13cython_lapack_d *);
 
-/* "scipy/linalg/cython_lapack.pxd":26
+/* "scipy/linalg/cython_lapack.pxd":28
  * ctypedef bint dselect2(d*, d*)
  * ctypedef bint dselect3(d*, d*, d*)
  * ctypedef bint sselect2(s*, s*)             # <<<<<<<<<<<<<<
@@ -1600,7 +1618,7 @@ typedef int __pyx_t_5scipy_6linalg_13cython_lapack_dselect3(__pyx_t_5scipy_6lina
  */
 typedef int __pyx_t_5scipy_6linalg_13cython_lapack_sselect2(__pyx_t_5scipy_6linalg_13cython_lapack_s *, __pyx_t_5scipy_6linalg_13cython_lapack_s *);
 
-/* "scipy/linalg/cython_lapack.pxd":27
+/* "scipy/linalg/cython_lapack.pxd":29
  * ctypedef bint dselect3(d*, d*, d*)
  * ctypedef bint sselect2(s*, s*)
  * ctypedef bint sselect3(s*, s*, s*)             # <<<<<<<<<<<<<<
@@ -1609,7 +1627,7 @@ typedef int __pyx_t_5scipy_6linalg_13cython_lapack_sselect2(__pyx_t_5scipy_6lina
  */
 typedef int __pyx_t_5scipy_6linalg_13cython_lapack_sselect3(__pyx_t_5scipy_6linalg_13cython_lapack_s *, __pyx_t_5scipy_6linalg_13cython_lapack_s *, __pyx_t_5scipy_6linalg_13cython_lapack_s *);
 
-/* "scipy/linalg/cython_lapack.pxd":28
+/* "scipy/linalg/cython_lapack.pxd":30
  * ctypedef bint sselect2(s*, s*)
  * ctypedef bint sselect3(s*, s*, s*)
  * ctypedef bint zselect1(z*)             # <<<<<<<<<<<<<<
@@ -1618,7 +1636,7 @@ typedef int __pyx_t_5scipy_6linalg_13cython_lapack_sselect3(__pyx_t_5scipy_6lina
  */
 typedef int __pyx_t_5scipy_6linalg_13cython_lapack_zselect1(__pyx_t_double_complex *);
 
-/* "scipy/linalg/cython_lapack.pxd":29
+/* "scipy/linalg/cython_lapack.pxd":31
  * ctypedef bint sselect3(s*, s*, s*)
  * ctypedef bint zselect1(z*)
  * ctypedef bint zselect2(z*, z*)             # <<<<<<<<<<<<<<
@@ -1973,7 +1991,7 @@ static int __Pyx_check_binary_version(unsigned long ct_version, unsigned long rt
 static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *sig);
 
 /* FunctionImport.proto */
-static int __Pyx_ImportFunction_3_0_8(PyObject *module, const char *funcname, void (**f)(void), const char *sig);
+static int __Pyx_ImportFunction_3_0_10(PyObject *module, const char *funcname, void (**f)(void), const char *sig);
 
 /* InitStrings.proto */
 static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
@@ -2642,7 +2660,7 @@ static int __Pyx_modinit_function_import_code(void) {
   /*--- Function import code ---*/
   __pyx_t_1 = PyImport_ImportModule("scipy.linalg.cython_lapack"); if (!__pyx_t_1) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  if (__Pyx_ImportFunction_3_0_8(__pyx_t_1, "zgesv", (void (**)(void))&__pyx_f_5scipy_6linalg_13cython_lapack_zgesv, "void (int *, int *, __pyx_t_double_complex *, int *, int *, __pyx_t_double_complex *, int *, int *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
+  if (__Pyx_ImportFunction_3_0_10(__pyx_t_1, "zgesv", (void (**)(void))&__pyx_f_5scipy_6linalg_13cython_lapack_zgesv, "void (int *, int *, __pyx_t_double_complex *, int *, int *, __pyx_t_double_complex *, int *, int *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
@@ -4649,9 +4667,9 @@ bad:
 }
 
 /* FunctionImport */
-#ifndef __PYX_HAVE_RT_ImportFunction_3_0_8
-#define __PYX_HAVE_RT_ImportFunction_3_0_8
-static int __Pyx_ImportFunction_3_0_8(PyObject *module, const char *funcname, void (**f)(void), const char *sig) {
+#ifndef __PYX_HAVE_RT_ImportFunction_3_0_10
+#define __PYX_HAVE_RT_ImportFunction_3_0_10
+static int __Pyx_ImportFunction_3_0_10(PyObject *module, const char *funcname, void (**f)(void), const char *sig) {
     PyObject *d = 0;
     PyObject *cobj = 0;
     union {