Skip to content

Commit

Permalink
Merge pull request #106 from reds-heig/speedup_ripser_cpp
Browse files Browse the repository at this point in the history
Update ripser backend, add robinhood hashmap optimization
  • Loading branch information
Nathaniel Saul authored Nov 2, 2020
2 parents fc90fb9 + 7e1107b commit f784e1f
Show file tree
Hide file tree
Showing 6 changed files with 1,107 additions and 933 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
git clone https://github.com/martinus/robin-hood-hashing ripser/robinhood
python -m pip install --upgrade pip
pip install flake8 pytest-cov Cython
pip install -e ".[testing]"
Expand Down Expand Up @@ -58,7 +59,8 @@ jobs:
- name: Set up conda
shell: bash -l {0}
run: |
conda install numpy pandas scipy matplotlib pytest cython
conda install git numpy pandas scipy matplotlib pytest cython
git clone https://github.com/martinus/robin-hood-hashing ripser/robinhood
python setup.py install
- name: Test with pytest
shell: bash -l {0}
Expand All @@ -82,7 +84,9 @@ jobs:
- name: Set up conda
shell: bash -l {0}
run: |
conda install numpy pandas scipy matplotlib pytest libpython cython
echo -e "[build]\ncompiler=msvc\n" >> setup.cfg
conda install git numpy pandas scipy matplotlib pytest libpython cython
git clone https://github.com/martinus/robin-hood-hashing ripser/robinhood
python setup.py install
- name: Test with pytest
shell: bash -l {0}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
git clone https://github.com/martinus/robin-hood-hashing ripser/robinhood
python -m pip install --upgrade pip
pip install setuptools wheel twine Cython numpy pytest
python setup.py install
Expand Down Expand Up @@ -55,6 +56,7 @@ jobs:
architecture: ${{ matrix.arch }}
- name: Install dependencies
run: |
git clone https://github.com/martinus/robin-hood-hashing ripser/robinhood
python -m pip install --upgrade pip
pip install setuptools wheel twine Cython numpy pytest
python setup.py install
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 0.6.0
- Update C++ backend to commit 286d369 of [ripser](https://github.com/Ripser/ripser) but keeping same functionalities
- Add support to robinhood hashmap into the C++ Backend
- Update CI in order to compile C++ with robinhood enable
- Enable Enclosing radius when threshold is set to infinity

# 0.5.5
- Updating CI/CD pipeline.

Expand Down
2 changes: 1 addition & 1 deletion ripser/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.5.5"
__version__ = "0.6.0"
Loading

0 comments on commit f784e1f

Please sign in to comment.