Skip to content

Commit

Permalink
Merge pull request #46 from jrenaud90/testing-python-versions
Browse files Browse the repository at this point in the history
Testing-python-versions
  • Loading branch information
jrenaud90 authored Feb 13, 2024
2 parents c4035dd + 4356090 commit 338aeff
Show file tree
Hide file tree
Showing 23 changed files with 105 additions and 122 deletions.
44 changes: 18 additions & 26 deletions .github/workflows/build_wheels_main_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
name: Make SDist
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true # Optional, use if you have submodules

- name: Build SDist
run: pipx run build --sdist

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: dist/*.tar.gz

Expand All @@ -34,12 +34,13 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
steps:
- name: Checkout CyRK
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Anaconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: cyrk_test
auto-update-conda: true
Expand All @@ -50,30 +51,21 @@ jobs:
shell: bash -el {0}
run: conda info

- name: Install llvm and libomp
- name: install gcc-13 # openMP does not play nice with clang on MacOS; also some versions of macos use older gcc so there is a need to install latest.
shell: bash -el {0}
run: |
brew reinstall llvm libomp
- name: Install Dependencies
shell: bash -el {0}
run: |
conda install numpy scipy cython llvm-openmp pytest
python -m pip install --upgrade build
brew install gcc@13
- name: Install package
shell: bash -el {0}
run: |
export CC=/usr/bin/clang
export CXX=/usr/bin/clang++
export PATH="/usr/local/opt/llvm/bin:$PATH"
export CPPFLAGS="$CPPFLAGS -Xpreprocessor -fopenmp -I/usr/local/opt/llvm/include"
export CFLAGS="$CFLAGS -I/usr/local/opt/libomp/include"
export CXXFLAGS="$CXXFLAGS -I/usr/local/opt/libomp/include"
export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp -L/usr/local/opt/llvm/lib"
conda install pytest matplotlib numba numpy scipy cython
export CC='gcc-13'
export CPPFLAGS="$CPPFLAGS -Xpreprocessor -fopenmp"
python -m pip install -v .
python -m build --wheel --outdir ./wheelhouse/
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./wheelhouse/*.whl

Expand All @@ -89,14 +81,14 @@ jobs:
- ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Build wheels
uses: pypa/cibuildwheel@v2.14.1
uses: pypa/cibuildwheel@v2.16.5

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./wheelhouse/*.whl

Expand All @@ -105,7 +97,7 @@ jobs:
needs: [make_sdist, build_macos_wheel, build_other_wheels]
runs-on: ubuntu-22.04
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand All @@ -118,12 +110,12 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name == 'release' && github.event.action == 'published'
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist

- uses: pypa/[email protected].8
- uses: pypa/[email protected].11
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
14 changes: 7 additions & 7 deletions .github/workflows/build_wheels_test_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:
name: Make SDist
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true # Optional, use if you have submodules

- name: Build SDist
run: pipx run build --sdist

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: dist/*.tar.gz

Expand All @@ -31,14 +31,14 @@ jobs:
- ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Build wheels
uses: pypa/cibuildwheel@v2.11.4
uses: pypa/cibuildwheel@v2.16.5

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./wheelhouse/*.whl

Expand All @@ -47,7 +47,7 @@ jobs:
needs: [make_sdist, build_wheels]
runs-on: ubuntu-22.04
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand All @@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-latest
# if: github.event_name == 'release' && github.event.action == 'published'
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down
34 changes: 15 additions & 19 deletions .github/workflows/push_tests_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,47 +11,43 @@ jobs:
defaults:
run:
shell: bash -el {0}

name: Test CyRK on MacOS
runs-on: macos-11
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
fail-fast: false
- "3.12"
steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: cyrk_test
auto-update-conda: true
python-version: ${{ matrix.python-version }}
auto-activate-base: false

- name: Conda info
shell: bash -el {0}
run: conda info
- name: install libomp

- name: install gcc-13 # openMP does not play nice with clang on MacOS; also some versions of macos use older gcc so there is a need to install latest.
shell: bash -el {0}
run: |
brew reinstall llvm libomp
- name: Install Dependencies
shell: bash -el {0}
run: |
conda install numpy scipy cython llvm-openmp pytest
brew install gcc@13
- name: Install package
shell: bash -el {0}
run: |
export CC=/usr/bin/clang
export CXX=/usr/bin/clang++
export PATH="/usr/local/opt/llvm/bin:$PATH"
export CPPFLAGS="$CPPFLAGS -Xpreprocessor -fopenmp -I/usr/local/opt/llvm/include"
export CFLAGS="$CFLAGS -I/usr/local/opt/libomp/include"
export CXXFLAGS="$CXXFLAGS -I/usr/local/opt/libomp/include"
export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp -L/usr/local/opt/llvm/lib"
python -m pip install . -v
conda install pytest matplotlib numba numpy scipy cython
export CC='gcc-13'
export CPPFLAGS="$CPPFLAGS -Xpreprocessor -fopenmp"
python -m pip install -v .
- name: Run pytest
shell: bash -el {0}
run: pytest --capture=sys -v Tests/
11 changes: 6 additions & 5 deletions .github/workflows/push_tests_ubun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ jobs:
name: Test CyRK on Ubuntu
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
fail-fast: false
- "3.12"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
Expand All @@ -35,9 +36,9 @@ jobs:
name: Test Python 3.9 and Upload Coverage Report
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install Dependencies
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/push_tests_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,18 @@ jobs:
name: Test CyRK on Windows
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
fail-fast: false
- "3.12"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
Expand Down
75 changes: 34 additions & 41 deletions Benchmarks/CyRK - SciPy Comparison.ipynb

Large diffs are not rendered by default.

Binary file modified Benchmarks/CyRK_CySolver.pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Benchmarks/CyRK_SciPy_Compare_predprey_v0-8-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Benchmarks/CyRK_cyrk_ode.pdf
Binary file not shown.
Binary file modified Benchmarks/CyRK_numba.pdf
Binary file not shown.
Binary file modified Benchmarks/SciPy.pdf
Binary file not shown.
7 changes: 5 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@

## 2023

#### v0.8.6 (2024-01-??)
#### v0.8.6 (2024-02-13)

Changes:
Major Changes:
- Added support for Python 3.12.
- Converted `CySolver`'s `rk_step` method into a pure-c implementation to allow for further optimizations.
- Changed all files to compile with c rather than c++.
- Had to change cpp_bools to bints to make this change.

Bug Fixes:
- Fixed issue where CyRK was not installing on MacOS due to issue with LLVM and OpenMP.
- Have opted to go to gcc for macOS install due to issues with OpenMP and clang.
- Fixed incorrect type for rk method in CySolver (should eliminate some compile warnings).
- Fixed issue in benchmark where incorrect results were being displayed for CySolver.

Expand Down
3 changes: 1 addition & 2 deletions Performance/cyrk_performance-DOP853.csv
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ CyRK Version, Run-on Date, cython (avg), cython (std),CySolver (avg),CySolver (s
0.8.0, 06/09/2023 15:03:15, 0.9615, 0.0011, 0.0561, 0.0001, 0.1602, 0.0004, 9.8846, 0.1049, 0.4796, 0.0010, 1.4545, 0.0154, 0.4413, 0.0005, 0.0376, 0.0001, 0.0953, 0.0001, 4.3959, 0.0170, 0.2890, 0.0007, 0.7862, 0.0168, 1.4213, 0.0046, 0.0937, 0.0005, 0.2464, 0.0012, 19.5317, 0.0414, 1.1684, 0.0054, 3.1531, 0.0143, 1.6563, 0.0055, 0.0989, 0.0018, 0.4797, 0.0064, 22.9818, 0.1217, 1.2122, 0.0250, 6.4178, 0.0221
0.8.3, 07/10/2023 02:40:03, 0.9727, 0.0033, 0.0587, 0.0014, 0.1625, 0.0006, 9.9439, 0.0246, 0.4990, 0.0070, 2.6214, 0.0527, 0.4393, 0.0008, 0.0400, 0.0006, 0.1034, 0.0063, 4.4720, 0.1096, 0.3114, 0.0025, 1.1428, 0.0021, 1.4298, 0.0046, 0.0987, 0.0009, 0.2440, 0.0019, 21.2338, 0.3276, 1.7444, 0.0077, 4.3900, 0.0738, 1.6848, 0.0280, 0.1039, 0.0003, 0.4644, 0.0006, 25.3711, 0.1346, 2.2809, 0.0329, 7.3621, 0.0222
0.8.4, 18/10/2023 12:49:04, 0.9453, 0.0036, 0.0574, 0.0012, 0.1718, 0.0070, 9.9086, 0.1287, 0.4833, 0.0013, 1.4208, 0.0060, 0.4293, 0.0016, 0.0383, 0.0001, 0.0956, 0.0006, 4.2518, 0.0123, 0.2944, 0.0001, 0.7605, 0.0005, 1.3829, 0.0014, 0.0931, 0.0001, 0.2438, 0.0003, 19.2126, 0.0622, 1.1729, 0.0003, 3.1186, 0.0861, 1.6221, 0.0111, 0.0957, 0.0000, 0.4634, 0.0006, 22.3320, 0.0879, 1.2067, 0.0012, 6.1291, 0.0053
0.8.6.dev0, 19/01/2024 17:17:31, 0.9740, 0.0119, 0.0719, 0.0007, 0.1697, 0.0033, 10.2169, 0.2169, 0.6434, 0.0046, 1.4779, 0.0182, 0.4544, 0.0118, 0.0448, 0.0002, 0.0977, 0.0011, 4.3446, 0.0344, 0.3626, 0.0026, 0.7838, 0.0069, 1.4235, 0.0165, 0.1232, 0.0009, 0.2477, 0.0013, 19.7307, 0.1608, 1.5919, 0.0137, 3.1624, 0.0146, 1.6762, 0.0267, 0.1249, 0.0014, 0.5076, 0.0153, 23.4199, 0.2695, 1.6225, 0.0102, 6.4958, 0.1520
0.8.6.dev5, 20/01/2024 20:57:32, 0.9654, 0.0350, 0.0593, 0.0005, 0.1643, 0.0031, 10.1469, 0.2272, 0.5336, 0.0046, 1.5269, 0.0157, 0.4520, 0.0159, 0.0413, 0.0009, 0.1049, 0.0037, 4.4339, 0.0685, 0.3167, 0.0048, 0.8644, 0.0892, 1.4193, 0.0373, 0.0960, 0.0020, 0.2445, 0.0016, 19.1834, 0.4476, 1.1753, 0.0156, 3.1061, 0.0091, 1.6612, 0.0129, 0.0970, 0.0009, 0.4825, 0.0073, 23.6510, 0.5350, 1.2931, 0.0265, 6.9028, 0.1741
0.8.6, 13/02/2024 17:08:45, 0.9814, 0.0156, 0.0611, 0.0001, 0.1640, 0.0017, 10.2798, 0.4311, 0.5307, 0.0079, 1.4800, 0.0021, 0.4434, 0.0036, 0.0420, 0.0005, 0.0991, 0.0000, 4.4219, 0.0575, 0.3169, 0.0014, 0.7947, 0.0034, 1.4053, 0.0155, 0.0973, 0.0004, 0.2517, 0.0009, 19.6548, 0.3540, 1.2133, 0.0019, 3.1887, 0.0088, 1.6764, 0.0156, 0.1001, 0.0001, 0.5250, 0.0036, 23.9277, 0.3592, 1.2488, 0.0017, 7.2941, 0.1608
3 changes: 1 addition & 2 deletions Performance/cyrk_performance-RK23.csv
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ CyRK Version, Run-on Date, cython (avg), cython (std),CySolver (avg),CySolver (s
0.8.0, 06/09/2023 15:00:58, 4.4794, 0.0786, 0.2262, 0.0003, 0.8199, 0.0021, 43.1476, 0.0854, 2.1466, 0.0018, 10.1946, 0.1933, 2.7552, 0.0105, 0.1866, 0.0004, 0.5903, 0.0024, 26.9694, 0.1524, 1.7797, 0.0257, 5.9678, 0.0812, 4.7003, 0.0324, 0.2855, 0.0005, 0.9508, 0.0055, 80.1011, 0.3480, 4.8504, 0.0219, 20.8530, 0.2461, 5.5239, 0.0051, 0.3178, 0.0014, 1270.6912, 2197.9259, 95.6354, 0.1723, 5.4006, 0.0797, 35.0990, 0.8415
0.8.3, 07/10/2023 02:37:45, 4.5212, 0.1075, 0.2681, 0.0021, 0.7992, 0.0038, 43.9629, 0.3217, 2.5955, 0.0502, 9.2842, 0.4116, 2.7602, 0.0088, 0.2146, 0.0037, 0.5896, 0.0074, 27.1210, 0.1858, 2.0566, 0.0327, 5.7936, 0.0150, 4.8923, 0.0594, 0.3719, 0.0011, 0.9807, 0.0023, 82.6179, 0.6252, 6.0628, 0.0336, 20.2684, 0.2082, 5.6639, 0.0115, 0.9587, 0.2834, 1525.4251, 2635.4115, 105.9372, 0.3232, 14.0169, 0.0614, 45.0599, 0.8249
0.8.4, 18/10/2023 12:46:46, 4.4202, 0.0673, 0.2500, 0.0004, 0.8115, 0.0034, 43.1191, 0.0775, 2.4081, 0.0282, 10.0251, 0.7074, 2.7552, 0.0436, 0.2110, 0.0039, 0.5987, 0.0058, 26.5597, 0.2133, 1.9887, 0.0201, 5.8675, 0.1112, 4.7007, 0.0078, 0.3080, 0.0014, 0.9944, 0.0238, 81.1241, 0.3424, 5.5864, 0.7125, 19.9567, 0.1538, 5.4119, 0.0106, 0.3208, 0.0010, 1322.6941, 2287.9898, 96.8733, 2.3521, 5.5968, 0.1162, 36.6713, 0.3267
0.8.6.dev0, 19/01/2024 17:15:11, 4.4655, 0.0540, 0.2520, 0.0024, 0.8384, 0.0112, 48.8406, 7.7300, 2.9519, 0.3498, 11.7789, 0.7832, 2.8343, 0.0050, 0.2088, 0.0027, 0.6362, 0.0114, 28.1720, 0.2013, 1.9729, 0.0399, 6.2734, 0.1911, 4.6792, 0.0865, 0.3271, 0.0109, 0.9865, 0.0228, 81.1380, 0.5222, 5.4767, 0.1452, 21.0884, 0.5013, 5.5224, 0.0985, 0.3386, 0.0031, 1388.9789, 2402.5092, 97.8889, 0.2533, 5.6968, 0.0210, 37.7595, 0.3566
0.8.6.dev5, 20/01/2024 20:55:09, 4.5939, 0.1214, 0.2913, 0.0055, 0.9096, 0.0547, 45.4232, 1.1684, 2.7730, 0.0485, 10.7296, 0.5067, 2.8359, 0.0144, 0.2277, 0.0069, 0.6448, 0.0286, 28.3614, 0.7453, 2.1621, 0.0884, 6.0957, 0.1981, 4.7850, 0.2003, 0.3504, 0.0068, 1.0324, 0.0655, 81.3522, 1.8550, 6.0088, 0.1014, 21.9253, 0.6227, 5.5980, 0.1062, 0.3607, 0.0049, 1404.0776, 2428.5964, 98.8028, 1.6552, 6.3194, 0.1216, 40.8134, 2.7390
0.8.6, 13/02/2024 17:06:17, 4.5290, 0.0708, 0.2875, 0.0033, 0.9640, 0.1354, 43.6531, 0.0926, 2.8374, 0.0722, 8.9517, 0.2453, 2.7551, 0.0064, 0.2243, 0.0006, 0.6140, 0.0013, 27.0492, 0.2018, 2.1363, 0.0025, 5.9659, 0.0384, 4.6135, 0.0079, 0.3487, 0.0003, 0.9485, 0.0007, 79.4872, 0.4035, 5.9439, 0.1090, 19.9015, 0.1388, 5.6296, 0.0271, 0.3621, 0.0012, 1454.8195, 2516.6233, 96.8326, 0.5951, 6.1248, 0.0257, 38.7549, 0.4298
3 changes: 1 addition & 2 deletions Performance/cyrk_performance-RK45.csv
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ CyRK Version, Run-on Date, cython (avg), cython (std),CySolver (avg),CySolver (s
0.8.0, 06/09/2023 15:02:20, 1.2080, 0.0171, 0.0582, 0.0001, 0.2023, 0.0008, 11.8032, 0.0256, 0.4807, 0.0012, 1.8475, 0.0119, 0.8318, 0.0034, 0.0569, 0.0002, 0.1659, 0.0003, 8.1177, 0.0578, 0.4684, 0.0018, 1.4517, 0.0058, 1.6145, 0.0023, 0.0921, 0.0005, 0.2928, 0.0011, 23.6490, 0.0748, 1.2090, 0.0118, 4.0150, 0.0179, 1.8902, 0.0034, 0.0969, 0.0009, 0.5533, 0.0009, 27.6976, 0.0946, 1.2947, 0.0416, 7.9394, 0.0140
0.8.3, 07/10/2023 02:39:08, 1.2268, 0.0292, 0.0670, 0.0002, 0.2042, 0.0002, 13.0410, 0.0369, 1.0062, 0.0659, 2.6633, 0.0087, 0.8234, 0.0038, 0.0631, 0.0002, 0.1648, 0.0001, 8.8861, 0.0427, 0.7835, 0.0085, 2.1426, 0.0023, 1.6358, 0.0049, 0.1139, 0.0050, 0.6746, 0.0009, 26.8571, 0.1145, 3.0055, 0.0209, 6.6462, 0.1028, 1.9187, 0.0032, 0.1280, 0.0045, 0.9513, 0.0050, 32.9776, 0.3770, 4.3772, 0.1087, 10.9500, 0.0345
0.8.4, 18/10/2023 12:48:10, 1.1825, 0.0070, 0.0622, 0.0001, 0.2012, 0.0008, 11.7285, 0.0223, 0.5412, 0.0092, 1.8985, 0.0613, 0.8106, 0.0029, 0.0601, 0.0012, 0.1661, 0.0004, 7.9235, 0.0105, 0.4982, 0.0007, 1.4473, 0.0029, 1.6015, 0.0058, 0.0981, 0.0003, 0.2963, 0.0039, 23.5090, 0.0487, 1.3260, 0.0138, 4.0189, 0.0470, 1.8400, 0.0072, 0.1011, 0.0002, 0.5443, 0.0013, 27.1240, 0.0951, 1.3706, 0.0024, 7.7848, 0.0081
0.8.6.dev0, 19/01/2024 17:16:37, 1.2017, 0.0135, 0.0660, 0.0009, 0.2108, 0.0051, 12.3765, 0.3199, 0.5768, 0.0072, 1.9711, 0.0868, 0.8322, 0.0089, 0.0641, 0.0009, 0.1722, 0.0016, 8.2980, 0.1150, 0.5397, 0.0067, 1.4598, 0.0102, 1.5830, 0.0190, 0.1096, 0.0029, 0.2914, 0.0037, 23.4215, 0.4064, 1.4328, 0.0234, 4.1562, 0.1338, 1.9550, 0.0320, 0.1128, 0.0013, 0.6329, 0.0182, 28.7108, 1.0286, 1.5263, 0.0154, 8.2360, 0.0257
0.8.6.dev5, 20/01/2024 20:56:36, 1.1977, 0.0179, 0.0650, 0.0013, 0.2077, 0.0023, 11.6011, 0.0360, 0.5446, 0.0073, 1.8115, 0.0468, 0.8020, 0.0134, 0.0618, 0.0008, 0.1674, 0.0014, 8.2247, 0.0430, 0.5467, 0.0151, 1.5453, 0.0619, 1.5847, 0.0179, 0.0959, 0.0019, 0.2969, 0.0113, 23.0218, 0.5510, 1.2733, 0.0171, 3.9222, 0.0331, 1.8856, 0.0197, 0.1008, 0.0020, 0.5672, 0.0075, 28.2135, 0.7941, 1.3469, 0.0147, 8.1835, 0.1518
0.8.6, 13/02/2024 17:07:48, 1.1940, 0.0018, 0.0656, 0.0001, 0.2073, 0.0006, 12.0870, 0.1605, 0.5541, 0.0014, 1.8434, 0.0014, 0.8268, 0.0006, 0.0641, 0.0001, 0.1746, 0.0037, 8.1272, 0.0545, 0.5381, 0.0006, 1.4994, 0.0056, 1.5900, 0.0112, 0.0984, 0.0001, 0.2944, 0.0007, 23.5061, 0.1064, 1.2961, 0.0085, 3.9463, 0.0073, 1.8949, 0.0107, 0.1017, 0.0001, 0.6063, 0.0029, 28.0150, 0.1407, 1.3543, 0.0045, 8.5997, 0.0030
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# CyRK
<div style="text-align: center;">
<a href="https://doi.org/10.5281/zenodo.7093266"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.7093266.svg" alt="DOI"></a>
<a href="https://www.python.org/downloads/"><img src="https://img.shields.io/badge/Python-3.8|3.9|3.10|3.11-blue" alt="Python Version 3.8-3.11" /></a>
<a href="https://www.python.org/downloads/"><img src="https://img.shields.io/badge/Python-3.8|3.9|3.10|3.11|3.12-blue" alt="Python Version 3.8-3.12" /></a>
<a href="https://codecov.io/gh/jrenaud90/CyRK" ><img src="https://codecov.io/gh/jrenaud90/CyRK/branch/main/graph/badge.svg?token=MK2PqcNGET" alt="Code Coverage"/></a>
<br />
<a href="https://github.com/jrenaud90/CyRK/actions/workflows/push_tests_win.yml"><img src="https://github.com/jrenaud90/CyRK/actions/workflows/push_tests_win.yml/badge.svg?branch=main" alt="Windows Tests" /></a>
Expand All @@ -11,7 +11,7 @@

---

<a href="https://github.com/jrenaud90/CyRK/releases"><img src="https://img.shields.io/badge/CyRK-0.8.5 Alpha-orange" alt="CyRK Version 0.8.5 Alpha" /></a>
<a href="https://github.com/jrenaud90/CyRK/releases"><img src="https://img.shields.io/badge/CyRK-0.8.6 Alpha-orange" alt="CyRK Version 0.8.6 Alpha" /></a>


**Runge-Kutta ODE Integrator Implemented in Cython and Numba**
Expand All @@ -28,7 +28,7 @@ The [cython](https://cython.org/) `CySolver` class that works with cython-based
An additional benefit of the two cython implementations is that they are pre-compiled. This avoids most of the start-up performance hit experienced by just-in-time compilers like numba.


<img style="text-align: center" src="https://github.com/jrenaud90/CyRK/blob/main/Benchmarks/CyRK_SciPy_Compare_predprey_v0-8-4.png" alt="CyRK Performance Graphic" />
<img style="text-align: center" src="https://github.com/jrenaud90/CyRK/blob/main/Benchmarks/CyRK_SciPy_Compare_predprey_v0-8-6.png" alt="CyRK Performance Graphic" />

## Installation

Expand Down
6 changes: 3 additions & 3 deletions _build_cyrk.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
extra_link_args = []
elif install_platform.lower() == 'darwin':
# OpenMP is installed via llvm. See https://stackoverflow.com/questions/60005176/how-to-deal-with-clang-error-unsupported-option-fopenmp-on-travis
extra_compile_args = []
extra_compile_args = ['-O3']
extra_link_args = []
else:
extra_compile_args = ['-fopenmp']
extra_link_args = ['-fopenmp']
extra_compile_args = ['-fopenmp', '-O3']
extra_link_args = ['-fopenmp', '-O3']
macro_list = [("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")]

# Load TidalPy's cython extensions
Expand Down
Loading

0 comments on commit 338aeff

Please sign in to comment.