Skip to content

Qemu ... #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
Expand All @@ -21,8 +21,13 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install package
run: pip install .
- name: Install dev-package
run: |
sudo apt-get install qemu tree
python -m pip install --upgrade pip
pip install -v -e .
qemu-x86_64 -R 20M python time_match_strings.py


- name: Run tests
run: python -m unittest
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.6.0?] - 2021-09-21

### Added

* matrix-blocking/splitting as a performance-enhancer (see [README.md](https://github.com/ParticularMiner/string_grouper/tree/block#performance) for details)
* new keyword arguments `force_symmetries` and `n_blocks` (see [README.md](https://github.com/ParticularMiner/string_grouper/tree/block#kwargs) for details)
* new dependency on packages `topn` and `sparse_dot_topn_for_blocks` to help with the matrix-blocking
* capability to reuse a previously initialized StringGrouper (that is, the corpus can now persist across high-level function calls like `match_strings()`. See [README.md](https://github.com/ParticularMiner/string_grouper/tree/block#corpus) for details.)


## [0.5.0] - 2021-06-11

### Added

* Added new keyword argument **`tfidf_matrix_dtype`** (the datatype for the tf-idf values of the matrix components). Allowed values are `numpy.float32` and `numpy.float64` (used by the required external package `sparse_dot_topn` version 0.3.1). Default is `numpy.float32`. (Note: `numpy.float32` often leads to faster processing and a smaller memory footprint albeit less numerical precision than `numpy.float64`.)

### Changed

* Changed dependency on `sparse_dot_topn` from version 0.2.9 to 0.3.1
* Changed the default datatype for cosine similarities from numpy.float64 to numpy.float32 to boost computational performance at the expense of numerical precision.
* Changed the default value of the keyword argument `max_n_matches` from 20 to the number of strings in `duplicates` (or `master`, if `duplicates` is not given).
* Changed warning issued when the condition \[`include_zeroes=True` and `min_similarity` ≤ 0 and `max_n_matches` is not sufficiently high to capture all nonzero-similarity-matches\] is met to an exception.

### Removed

* Removed the keyword argument `suppress_warning`

## [0.4.0] - 2021-04-11

### Added
Expand Down
125 changes: 113 additions & 12 deletions README.md

Large diffs are not rendered by default.

Binary file added images/BlockMatrix_1_1.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 added images/BlockMatrix_1_2.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 added images/BlockMatrix_2_2.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 added images/BlockNumberSpaceExploration1.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 added images/Fuzzy_vs_Exact.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 added images/ScaledRuntimeContourPlot.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 added images/ScaledTimePerComparison.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

setup(
name='string_grouper',
version='0.4.0',
packages=['string_grouper'],
version='0.6.0',
packages=['string_grouper', 'string_grouper_utils'],
license='MIT License',
description='String grouper contains functions to do string matching using TF-IDF and the cossine similarity. '
'Based on https://bergvca.github.io/2017/10/14/super-fast-string-matching.html',
Expand All @@ -25,6 +25,7 @@
, 'scipy'
, 'scikit-learn'
, 'numpy'
, 'sparse_dot_topn>=0.2.6'
, 'sparse_dot_topn_for_blocks>=0.3.1'
, 'topn>=0.0.7'
]
)
2 changes: 1 addition & 1 deletion string_grouper/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from .string_grouper import compute_pairwise_similarities, group_similar_strings, match_most_similar, match_strings, \
StringGrouperConfig, StringGrouper
StringGrouperConfig, StringGrouper
776 changes: 612 additions & 164 deletions string_grouper/string_grouper.py

Large diffs are not rendered by default.

Loading