From 09b18d040c922ed1b405e3a44a2faa95d2df3ef6 Mon Sep 17 00:00:00 2001 From: Fabien Benetou Date: Mon, 1 Aug 2022 22:18:34 +0200 Subject: [PATCH 01/24] dynamic number of features for tf-idf avoid core dump on larger user dataset --- docs/src/auto_examples/core/run_core_concepts.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/auto_examples/core/run_core_concepts.ipynb b/docs/src/auto_examples/core/run_core_concepts.ipynb index a1fb7857da..d12965ff7d 100644 --- a/docs/src/auto_examples/core/run_core_concepts.ipynb +++ b/docs/src/auto_examples/core/run_core_concepts.ipynb @@ -195,7 +195,7 @@ }, "outputs": [], "source": [ - "from gensim import similarities\n\nindex = similarities.SparseMatrixSimilarity(tfidf[bow_corpus], num_features=12)" + "from gensim import similarities\n\nindex = similarities.SparseMatrixSimilarity(tfidf[bow_corpus], num_features=max(tfidf.dfs) + 1)" ] }, { @@ -274,4 +274,4 @@ }, "nbformat": 4, "nbformat_minor": 0 -} \ No newline at end of file +} From 35a3a941e11c5af1bc899eab20455290a5d73dd3 Mon Sep 17 00:00:00 2001 From: hammad7 Date: Mon, 27 May 2024 19:01:31 +0530 Subject: [PATCH 02/24] Issue-3528: Corrected file argument name in KeyedVectors.save --- gensim/models/keyedvectors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gensim/models/keyedvectors.py b/gensim/models/keyedvectors.py index 821e977d4d..ffb808f6cc 100644 --- a/gensim/models/keyedvectors.py +++ b/gensim/models/keyedvectors.py @@ -762,7 +762,7 @@ def save(self, *args, **kwargs): Parameters ---------- - fname : str + fname_or_handle : str Path to the output file. See Also From 26a4a8d7e71a35d3a0f5b56b29ef9a8186c4daf2 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Tue, 11 Jun 2024 13:47:35 +0200 Subject: [PATCH 03/24] use newer unittest.mock everwhere (#3529) --- gensim/corpora/sharded_corpus.py | 2 -- gensim/test/test_parsing.py | 2 +- gensim/test/test_poincare.py | 5 +---- gensim/utils.py | 1 - setup.py | 1 - 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/gensim/corpora/sharded_corpus.py b/gensim/corpora/sharded_corpus.py index c82d711137..377b0bdb6a 100644 --- a/gensim/corpora/sharded_corpus.py +++ b/gensim/corpora/sharded_corpus.py @@ -17,8 +17,6 @@ """ -from __future__ import print_function - import logging import os import math diff --git a/gensim/test/test_parsing.py b/gensim/test/test_parsing.py index f96ad332d2..bdf82ab27e 100644 --- a/gensim/test/test_parsing.py +++ b/gensim/test/test_parsing.py @@ -7,8 +7,8 @@ import logging import unittest +from unittest import mock -import mock import numpy as np from gensim.parsing.preprocessing import ( diff --git a/gensim/test/test_poincare.py b/gensim/test/test_poincare.py index ae99335b69..915f07ea21 100644 --- a/gensim/test/test_poincare.py +++ b/gensim/test/test_poincare.py @@ -13,10 +13,7 @@ import os import tempfile import unittest -try: - from mock import Mock -except ImportError: - from unittest.mock import Mock +from unittest.mock import Mock import numpy as np try: diff --git a/gensim/utils.py b/gensim/utils.py index 755b6c7f0c..2abd5179e0 100644 --- a/gensim/utils.py +++ b/gensim/utils.py @@ -6,7 +6,6 @@ """Various general utility functions.""" -from __future__ import with_statement from contextlib import contextmanager import collections.abc import logging diff --git a/setup.py b/setup.py index 350869a236..91faeb6e1e 100644 --- a/setup.py +++ b/setup.py @@ -272,7 +272,6 @@ def run(self): core_testenv = [ 'pytest', 'pytest-cov', - 'mock', 'testfixtures', ] From c95bdb48493ff35e4781b313454dfdabbe9f6ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Fouqu=C3=A9?= Date: Tue, 11 Jun 2024 16:25:20 +0200 Subject: [PATCH 04/24] Handle optional parameters without implicit bool cast (#3502) * Handle optional parameters without implicit bool cast * dummy commit to trigger CI --------- Co-authored-by: Michael Penkov --- README.md | 1 + gensim/models/tfidfmodel.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bfd587d594..a69c3a187b 100644 --- a/README.md +++ b/README.md @@ -177,3 +177,4 @@ BibTeX entry: [OpenBLAS]: https://xianyi.github.io/OpenBLAS/ [source tar.gz]: https://pypi.org/project/gensim/ [documentation]: https://radimrehurek.com/gensim/#install + diff --git a/gensim/models/tfidfmodel.py b/gensim/models/tfidfmodel.py index 336023bc1e..a56d7d31b1 100644 --- a/gensim/models/tfidfmodel.py +++ b/gensim/models/tfidfmodel.py @@ -360,16 +360,16 @@ def __init__(self, corpus=None, id2word=None, dictionary=None, wlocal=utils.iden self.pivot = pivot self.eps = 1e-12 - if smartirs: + if smartirs is not None: n_tf, n_df, n_n = self.smartirs self.wlocal = partial(smartirs_wlocal, local_scheme=n_tf) self.wglobal = partial(smartirs_wglobal, global_scheme=n_df) - if dictionary: + if dictionary is not None: # user supplied a Dictionary object, which already contains all the # statistics we need to construct the IDF mapping. we can skip the # step that goes through the corpus (= an optimization). - if corpus: + if corpus is not None: logger.warning( "constructor received both corpus and explicit inverse document frequencies; ignoring the corpus" ) @@ -378,9 +378,9 @@ def __init__(self, corpus=None, id2word=None, dictionary=None, wlocal=utils.iden self.dfs = dictionary.dfs.copy() self.term_lens = {termid: len(term) for termid, term in dictionary.items()} self.idfs = precompute_idfs(self.wglobal, self.dfs, self.num_docs) - if not id2word: + if id2word is None: self.id2word = dictionary - elif corpus: + elif corpus is not None: self.initialize(corpus) else: # NOTE: everything is left uninitialized; presumably the model will @@ -388,7 +388,7 @@ def __init__(self, corpus=None, id2word=None, dictionary=None, wlocal=utils.iden pass # If smartirs is not None, override pivot and normalize - if not smartirs: + if smartirs is None: return if self.pivot is not None: if n_n in 'ub': From bea670a5d807b8b0c6201e184dc048999f276f7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 00:40:03 +0900 Subject: [PATCH 05/24] Bump codecov/codecov-action from 3 to 4 (#3514) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 64505894b7..2d342f2c11 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -161,7 +161,7 @@ jobs: - name: Upload coverage to Codecov if: matrix.coverage == true - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: fail_ci_if_error: true files: ./coverage.xml From dc5b5c48e7454fe22cf98ddac60ff85107226f6a Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Wed, 12 Jun 2024 11:09:06 +0900 Subject: [PATCH 06/24] pin numpy < 2.0 --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 91faeb6e1e..be7f58330b 100644 --- a/setup.py +++ b/setup.py @@ -324,7 +324,10 @@ def run(self): 'pandas', ] -NUMPY_STR = 'numpy >= 1.18.5' +# +# see https://github.com/piskvorky/gensim/pull/3535 +# +NUMPY_STR = 'numpy >= 1.18.5, < 2.0' install_requires = [ NUMPY_STR, From afbb82ea3446b5462a6ae1f5b02d338ff0170e5a Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Thu, 18 Jul 2024 11:46:07 +0900 Subject: [PATCH 07/24] pin scipy, need deprecated sparsetools --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5abdf82efb..3d807b3574 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,10 @@ requires = [ # is 1.18.5, remove the line when they increase oldest supported Numpy for this platform "numpy==1.18.5; python_version=='3.8' and platform_machine not in 'arm64|aarch64'", "oldest-supported-numpy; python_version>'3.8' or platform_machine in 'arm64|aarch64'", - "scipy", + # + # SciPy 1.14.0 onwards removed the deprecated sparsetools submodule needed by gensim.models.lsimodel + # + "scipy<=1.13.1", "setuptools", "wheel", ] From 79f982b25be815310bc4410758ac6ee83a095e9e Mon Sep 17 00:00:00 2001 From: Filip <39336739+filip-komarzyniec@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:03:07 +0200 Subject: [PATCH 08/24] removed scipy from build-only dependencies (#3538) * removed scipy from build-only dependencies; updated README accordingly * fixed conditions regarding oldest numpy installation on arm64 Windows machines * README rephrased regarding NumPy installation * Revert "fixed conditions regarding oldest numpy installation on arm64 Windows machines" This reverts commit 68197fb9beb65cf3abdb03f71d7c7a4b8ae36473. * pin scipy, need old sparsetools for wheel testing * make scipy pin more strict * use macos-latest instead of deprecated macos-11 * pin scipy in setup.py * remove redundant scipy pin from build-wheels.yml * get rid of remaining macos-11 traces in CI workflow * use macos-12 instead of macos-latest --------- Co-authored-by: Michael Penkov --- .github/workflows/build-wheels.yml | 12 ++++++------ README.md | 20 +++++++++++--------- pyproject.toml | 4 ---- setup.py | 5 ++++- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 856efcbd00..c4c3444499 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019, macos-11] + os: [ubuntu-20.04, windows-2019, macos-12] steps: - name: Checkout @@ -61,11 +61,11 @@ jobs: fail-fast: false matrix: include: - - {python: '3.8', os: macos-11} - - {python: '3.9', os: macos-11} - - {python: '3.10', os: macos-11} - - {python: '3.11', os: macos-11} - - {python: '3.12', os: macos-11} + - {python: '3.8', os: macos-12} + - {python: '3.9', os: macos-12} + - {python: '3.10', os: macos-12} + - {python: '3.11', os: macos-12} + - {python: '3.12', os: macos-12} - {python: '3.8', os: ubuntu-20.04} - {python: '3.9', os: ubuntu-20.04} diff --git a/README.md b/README.md index a69c3a187b..b876aaf8b2 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,12 @@ on Wikipedia. Installation ------------ -This software depends on [NumPy and Scipy], two Python packages for -scientific computing. You must have them installed prior to installing -gensim. - -It is also recommended you install a fast BLAS library before installing -NumPy. This is optional, but using an optimized BLAS such as MKL, [ATLAS] or -[OpenBLAS] is known to improve performance by as much as an order of +This software depends on [NumPy], a Python package for +scientific computing. Please bear in mind that building NumPy from source +(e.g. by installing gensim on a platform which lacks NumPy .whl distribution) +is a non-trivial task involving [linking NumPy to a BLAS library]. +It is recommended to provide a fast one (such as MKL, [ATLAS] or +[OpenBLAS]) which can improve performance by as much as an order of magnitude. On OSX, NumPy picks up its vecLib BLAS automatically, so you don’t need to do anything special. @@ -69,7 +68,9 @@ Or, if you have instead downloaded and unzipped the [source tar.gz] package: ```bash - python setup.py install + tar -xvzf gensim-X.X.X.tar.gz + cd gensim-X.X.X/ + pip install . ``` For alternative modes of installation, see the [documentation]. @@ -172,7 +173,8 @@ BibTeX entry: [documentation and Jupyter Notebook tutorials]: https://github.com/RaRe-Technologies/gensim/#documentation [Vector Space Model]: https://en.wikipedia.org/wiki/Vector_space_model [unsupervised document analysis]: https://en.wikipedia.org/wiki/Latent_semantic_indexing - [NumPy and Scipy]: https://scipy.org/install/ + [NumPy]: https://numpy.org/install/ + [linking NumPy to a BLAS library]: https://numpy.org/devdocs/building/blas_lapack.html [ATLAS]: https://math-atlas.sourceforge.net/ [OpenBLAS]: https://xianyi.github.io/OpenBLAS/ [source tar.gz]: https://pypi.org/project/gensim/ diff --git a/pyproject.toml b/pyproject.toml index 3d807b3574..dba0603d0f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,10 +9,6 @@ requires = [ # is 1.18.5, remove the line when they increase oldest supported Numpy for this platform "numpy==1.18.5; python_version=='3.8' and platform_machine not in 'arm64|aarch64'", "oldest-supported-numpy; python_version>'3.8' or platform_machine in 'arm64|aarch64'", - # - # SciPy 1.14.0 onwards removed the deprecated sparsetools submodule needed by gensim.models.lsimodel - # - "scipy<=1.13.1", "setuptools", "wheel", ] diff --git a/setup.py b/setup.py index be7f58330b..335426dcf3 100644 --- a/setup.py +++ b/setup.py @@ -331,7 +331,10 @@ def run(self): install_requires = [ NUMPY_STR, - 'scipy >= 1.7.0', + # + # scipy 1.14.0 and onwards removes deprecated sparsetools submodule + # + 'scipy >= 1.7.0, <1.14.0', 'smart_open >= 1.8.1', ] From 7321346a7043b51dfa3883e2a224cd78c07703ab Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Fri, 19 Jul 2024 22:28:30 +0900 Subject: [PATCH 09/24] bumped version to 4.3.3 --- docs/src/conf.py | 4 ++-- gensim/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/src/conf.py b/docs/src/conf.py index 0fbb479b65..41a63d67ef 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -61,9 +61,9 @@ # built documents. # # The short X.Y version. -version = '4.3' +version = '4.3.3' # The full version, including alpha/beta/rc tags. -release = '4.3.2.dev0' +release = '4.3.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/gensim/__init__.py b/gensim/__init__.py index f2a576eed1..442a4bef6b 100644 --- a/gensim/__init__.py +++ b/gensim/__init__.py @@ -4,7 +4,7 @@ """ -__version__ = '4.3.2.dev0' +__version__ = '4.3.3' import logging diff --git a/setup.py b/setup.py index 335426dcf3..01cda61aba 100644 --- a/setup.py +++ b/setup.py @@ -340,7 +340,7 @@ def run(self): setup( name='gensim', - version='4.3.2.dev0', + version='4.3.3', description='Python framework for fast Vector Space Modelling', long_description=LONG_DESCRIPTION, From ea7b162e3c2d93b02f2793cfc6ff5b558ef5dfee Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Fri, 19 Jul 2024 22:31:49 +0900 Subject: [PATCH 10/24] updated CHANGELOG.md for version 4.3.3 --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91984fded2..62636aef13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ Changes ======= + +## 4.3.3, 2024-07-19 + +### :star2: New Features + +### :red_circle: Bug fixes + +* Correct file argument name in KeyedVectors.save docstring (__[hammad7](https://github.com/hammad7)__, [#3532](https://github.com/piskvorky/gensim/pull/3532)) +* Import deprecated scipy.linalg.triu from numpy.triu instead (__[Luffy610](https://github.com/Luffy610)__, [#3524](https://github.com/piskvorky/gensim/pull/3524)) + +### :books: Tutorial and doc improvements + +* Updated the broken Documentation Link on the README.md (__[wittyicon29](https://github.com/wittyicon29)__, [#3505](https://github.com/piskvorky/gensim/pull/3505)) + +### :+1: Improvements + +* Add support for python3.12 wheels (__[YoungMind1](https://github.com/YoungMind1)__, [#3531](https://github.com/piskvorky/gensim/pull/3531)) +* Removed scipy from build-only dependencies (__[filip-komarzyniec](https://github.com/filip-komarzyniec)__, [#3538](https://github.com/piskvorky/gensim/pull/3538)) +* Use newer unittest.mock everwhere (__[a-detiste](https://github.com/a-detiste)__, [#3529](https://github.com/piskvorky/gensim/pull/3529)) +* Handle optional parameters without implicit bool cast (__[nk-fouque](https://github.com/nk-fouque)__, [#3502](https://github.com/piskvorky/gensim/pull/3502)) + ## 4.3.2, 2023-08-23 ### :red_circle: Bug fixes From bff9abc529825883fc7112b10569a8642244ec60 Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Sat, 10 Aug 2024 07:29:06 +0900 Subject: [PATCH 11/24] adjust update_index.py --- .github/workflows/update_index.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update_index.py b/.github/workflows/update_index.py index b685d2b01a..a64ced7227 100644 --- a/.github/workflows/update_index.py +++ b/.github/workflows/update_index.py @@ -21,7 +21,13 @@ def main(): for page in paginator.paginate(Bucket=bucket, Delimiter='/', Prefix=prefix): for content in page.get('Contents', []): key = content['Key'] - print(f"
  • {key}
    • ") + # + # NB. use double quotes in href because that's that + # wheelhouse_uploader expects. + # + # https://github.com/ogrisel/wheelhouse-uploader/blob/eb32a7bb410769bb4212a9aa7fb3bfa3cef1aaec/wheelhouse_uploader/fetch.py#L15 + # + print(f"""
  • {key}
    • """) print("") From 24684175a8b49a55ced4a6bb24ef096c3d2fdc3e Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Sat, 10 Aug 2024 20:58:54 +0900 Subject: [PATCH 12/24] add route4me.com as bronze sponsor (#3558) * add route4me.com as bronze sponsor * git add docs/src/_static/images/route4me-logo.png --- docs/src/_static/images/route4me-logo.png | Bin 0 -> 20714 bytes docs/src/people.rst | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 docs/src/_static/images/route4me-logo.png diff --git a/docs/src/_static/images/route4me-logo.png b/docs/src/_static/images/route4me-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..46df6d2f8443faae63737bf6a8ed69641bcbba78 GIT binary patch literal 20714 zcmbsRc{tSV8$XQCVwZj2Gi4Xq8llK8S+Xx#GRRVvWXm>FWG5-gE@Y2E*_p}`LdZ}W z#u8=hiLpOd_vdqee$V%Ke*ZkjGsk@&_wDUH*K(fMxxLQUCEnCnkAaSt4g!HN80c%8 zK_C=`5C~M7h6+648!31M{zDOw4aG z3--P19dKI9{KC(+x+DnXG{ivribY7y3L!Y>tmXL0=J4YH-8$FmRvdlsK>YL;GbIHJ#o6B68KFkq47Xcv zOIw$xE7sNz{$z2rs5&fduiOhBFAp2$;S~_j(f;qJ_*y`hvBtkY?dK<$BL4d^Q{gE5 z_j&O>NzM4U|9td+Swyq4{O6N4T23SK?-xqUS+4&3g{!5Ar~iFF?y0ek_nnSXIxVtfBJ)49e);tI=T8r;9>1U+ zn=<2M%Llz{a7I_xZQpKD#AxjH{(m-*mL>U?MoDekmZMfVo_LOCf}7^yNgndW}Pe*~#NBkrO)?av;JxfWS9Pp6irpZn|2 ze`Og_*!ave^4g&j{lMZMJU%3p$K!ur6Z#b>^5u1mE6edDBCz1!{ca~aCYqYl_aP3k zI?EdWuKgEZJ7*#O+}Xs9Ue0oOd&hs4RqVTM7j0MdSo*z?eKF(zWYKZG>z>-bdP<}H zV;6nD?*H-5h&RhJUbBuS>UNsS|8JkVH9BRLbpQV*ACmlkPHq*=%hN9K-0GTSjlwzg zw;ze4{}Y%#%h)C(g`+f48RhsXRRZz9UFZL7r%{sMM>?NOoA1>e{YE9k{i}gdu>>1h z$}>eX)G5+LeZ9qA)-<{QeNTuR9QJc-9v`&wDUB%>a~IAyb=7?SOj-9a*(&X-B}yOAefTBax%XDUD5vYSjtp;lYIxye{`RQF`Ym>{WR@~Ll)`yHZW4B#B)0R zcLGTrowDP5yc?ms)gxuLigt_~FaP@+3Xa14>q>N{D2up%U4upRGICr}Bl)`Uf1QFW zv7BaHy}}mFTcr74-|$hxoTWnDq7|Z~8}nZmk%lQjSR9QP{U48t5f<&^mH)@1B7{Z6 zc>VwJ=q1A9()j;5Rv{Q`TMz1$M0fqaUJ8Cir|kZ(8rT=^|1Ew$FTwQBNIqqmoTT=D zo!qt(N8xf|C;k6zL%-}LH7#eH*$aBgnEz|0qnQ@b6>s1D-#1yj{)s~s$}{22SpoLAR>9#>~kd0T=RJKhsMD2TwH7me=ym(i@ zew^a6_{e4}7R9FPak(0&dRn+JVdz$Lc5g?WVzZc+3lM;OUJVSJz-y?Tpjuy2KGK|x zU30L_Ius5P#H?J2IKIP~n2WZEO)wn~I9EH2<0^0rIDMWn#0ea*`--x)R>yA!Cxv)P zd9ZI9^i8Zy!iMSAMXustT*uaCnT=VcQWb{WeJT+K3f3?UuqkFcw`hetXiu z;?aq14y!6d8tb_SodfqN`~)^+Q3R8uz$tFhVtjU1T--;97jlVW2(o?ghI%V6iE5TN zSnBX%vHt3*_w)@u4N6PN+X`t{>L@n+i3p-FiqM!G=&d_spsnrtcqP>-UiMEtf33mF zS=i*cAQ*yR#!_+LDmhn!^4BfILoWkjB5t*(#V{#wJvH}nT%5j>H*zMyDOdW>8}Aj0 ze%C5{_D6C(=9dxsUWIZ_^&)ZFW0*S{P7bXAp?d;BSM%#Cy)i zK(8i2iugeR)p%Ch21^UCYuzc!p+bIFkA=nk_`R;m$QLm|qZIMEH>>RBgXDpjB3!vA z6@yqu>$@@MT*R&;?sTWy0Rza|q3S?x#FPaoKs(rhfarK(ml+NRZ5jhsT!DRg)evq# zl`jYJnmzB3{=!YlfWPV)(kkWx$8o}$>t#4}xnR;W&f>cn?rTpAP!DHZZW7pFaxRrL zzbdW7rwctTF<`a_xg$z#UveTbm3Pk5UzgN~zlJYGdnX4<^%#Rmii5rl642GCQsEf8 z$H#}rRnjYxJU5U=$2&>wa)`)iH3NEvkAzRk1qW6CPD8dKT&%}f>nb*Eg(3k+kKsA1 zDpQ(cIgKUL!|QQo(5uDPQjl{f!W2pjY}|}ZY_74<@MP~X)+c__fL*_`pjfty#!~3W z;h%TK4WXSE@YSrUzy+mU^+q;c;o3R6?c>}F-Yu)K3hE{=CBopJeIoO8y%q1u zbYBN^ct}Aqxk=NxC4FPqbe6Qc+@x0!Z)&>TYZ;=Qr`QdP!&es(WcP*9nILE+vueB} z59tC0J}x&_p9SnJ|M;JsnPt2|=kt=@4v!WeuX7;erCOl})CqrrHFU&(iS@zHEa z*>H}+;#9Ctr#~`(g~-~!+0)Vpj26h7_1hpNIt{#R8YoLt+^pu*-hTkxkkzo}Q#we8@2Zzc`4of{`<76$x4Zy&@?~jVU#fWnhXuE{*)tdh^F5)7$jaU#X>mV<%0T;26m=?}q?H=H! zqsra?SwqEVlBu>fl?m_y9W){jtF6qpk^{wyOK}lymC6lrf@1#F#WnJr5?HPWJLv!F}z;jO;u+^iPsht=^qYnUF3 zk=40&^GzHU6gK^SthE*^XNzxT!epQFqoh!Tmmku}mnh)Ulr}fP-5Fo$@qJ`)%Bb9QI8~| zQXBQ}xO&P9C@Ywek$MSIz$sP*1zab70WP3$h@QE~%YJK`p~~)V(g0AXNuQjyD9Cz_ za;d7W6a}gz$O##|It zW&dh{JDtTvYPuQf5_e5sr)=UzV$GvY)f3^GMn+`QGpBOaGnR9~bh*_nLyh+sTV zUNUtHJji`~zl9?Xd*45vMh?g^Vcf@R_}j|y<^Qmw%8MN0!hq*(E>OIsdSBC|O-QTlqO zkxaRA)L@(J;u#@aaJNRjuah>7SNr5tSYE1I#$C2Y)GJx9P$2lEE+nNK2qb3|5h#?! zEzIUappy@ED?4{K_w$d^8nT07>Qsw~IoET+1W`X*IRD-*Na{?X+yS+eqMF>aMMiqE;!aIb-GZw(pQJYMtkmSWLGPn_u zUhYh+Po(p~lMii>Yf={I~|P`8NThlKl%SibNlu zvU7P+?az=MT+exyQjdt2SWe$_aN;Z)ew{{w^YxfT|ihyM_Hy?l`VL!SPiiA#_ zm){R5+*7o(9`*5gq~1s85LYp_9=)BiK4vrn3!860ot&ii zv<#r>(Vl^q3Kj6H3@ZYXzz9gO2});Bgts^({Ly!L!}PB{6LR=-OgHQ_+BoQxbxSjl z_-7HLQ=hU~th2Cd)wm%teQ&ZvC$qeX;4KubROQ(lg= zTr!moEuzN=nXZv;JD>x1?_m$j|0M-;qE7oI-HN+oQnMM?)k4% zOh>e2j*S3a-F2z6ow}s^-v;k&plr473|9UXM=8gdF6q`@O<|BHQ#{&aLvg0&Fp?k4 z4((0Q_q5P&82Q(H8Z9;s?#t|Eiv1aE$h;Feq!7PeIW-*R(?1+K^dxmg2}N)rzxt9- zG0lVI%b>bUAC9*PmhwYvjA6dkP58W~4_7j6n8KVjm3|QeQYrRnu`!(MafT03bcmKyhrBMbT|JjP!e75m^}Y#tzdIqRD}+e57NVLzXD4Wen`gr^OGuX=DaJU~Wz*f@WF(YZ?p$ zC3$=@gb6Cf)(KIn55%w#FQW)tNrAbXnxt|<4jY-}rcZI|T;nW*u7Axp&8oStA~S13 zStY;uxCt%d`90DO=ka&Es#>|5xRj&Glw~iBx_1xu>#;tqlYRGG9w(T#bMf^=OQ?ib zKNem1pk+VbIP3tsP4{$jQRS)70W0y9n!E2|fNYqT<6m#5-Y#qQz2Ar|haXJ$WozXl z^NhDnW`C@}8Q|bOEm{^ytmQ})fokt+Zzn7a_FK=`Gbp2*tIr3V&-Mz$D_IyHWkR52 zGJYM_{UqK2ElZc-$>Bc2Cy!>f-yEW2E?Va%y*-aV5^SQI%)0x!C~-T82tzpx*jWD> z$3HZSmV6Dw|NZ5MZrt@t0yjfEI3C5m`q4}GH4zm-bOHY_r}l-^G*+~+mstq>{%B`V z5__Y(4#-MD32=*ef;QhwUtRW+BbpvoL?3M#*n%1XXoQb6^nM0c*)8znMHSsO1$?e= zmAy)kd<@9S#BQWEMiCE;4Jbh-VsaS$zAi?b<_IY0;-O@Q{G}KnkJAG3cq2Ld5hGd2 zpDw-qzK~xLcFhJw_>^8Kb(1;4v>S-`srkJSNGC(hL3nKJPFL!7a;VsCDdJnT%r$cU zJ3(^3LE7?;s&GWVO(SA6!Sp1KeK#;E&>KDhxizmhxsxce8DZxmhrh$B%ER))ri1l2 zA6ZzswQHypG6j!P!bd0vA!0m`u^WTsTGjefvAUIYQ+R5NbyaP5Uon)!$LV{j=Er}? zI`A>s*LpoIBFTZbU=#55_#ES!MG8iWk{Z3j0A&lIZxkVZd80)^dMg<1-A{ z?Wq~Q0=j{oC2C!6!F`?&S_Grk-|C4boX^MnzpMvq?oTvs3`U~J-o;IS^HO=d0Nr7H zh&`*84O`PUn_c*w5w>zs6oLIPY~*G%UjplUGn`0I%Ll}t7Ku?uGM-5|$D}CmW`WIU zGd--!=Ft{k!LY{!L@tu$wC?H;sjU;;rjD+{D*ErvRZ|i{2!-V(gvB0!Ou9J)j7cpl zdmEoe$ww8fT#xlef~a5j2jr-oC|s;YtECiw9 z%DQMv4G)#iklucRJ|$SRB3>YAX3@M^wVRR$)&b429KXX;KkoB7t}~wdeH2=jB0(e_ zB+PI!hol>Q9qXt~Bk%c=h4UuF*wT;6pyc2qMJ73=by}>1U#&asmx6sQZ=ZDVhKA!c zMCsM;%MV5OR5|a3c<2=9?D@L3KZiAJ-Dvece|+mpHEJuW$j>6~i9a{#a=a5I$ABUE zoY*@a(pxH@;=Hhxus>ErUQi~0VpjeqNC1eXv;qdt4ZN|drw+f_Oc46Fn~dR{jO?V- zyw$Pr?k9cpaw5LH8kAGal?9Q{O8N$%b6=ideT;}qI5C$c){obFTIMTj<=+Y=n$7}@ z>AsW-|M&3=YMm`VkvLw59tKYaBGREcZc9CTE#aQrKd{;po(22QDY(?kl)dAF18y;q z9u?{v6wh4GKa;Z`5RjQjiR}y7k?Hy`wQa<<fYNmsgehBNCa9$7>uIH7qJ_FjG{RJ5zP$MTEXB8+}I<*0f%8KVfcm{Rg9{_|-@NL)bgDs%BC8O>v8wf&>J=oDk3{vyCr6(- z6zau0{#@_|fM&>_q4cJ^LN@ z$#h-A^>(GSl0Jc+7W>VjrGW;%jWO1gDGDp`*(Qbi6iqD)+;7Y-%WM%G$RZvre*c{YTkIzX?wb+5z?Xl zrB(966_T>^o(9&qaD=W-#fC0W<_A~d1tk7lZi#{HSo1BBuEFNhNPg0Lo5qWg^m%O~ zUbtYiPmp+E_3Nq4APUZs5tXV@;1uV5KkQQ`{~mrY-*Bly_{iQE`Lq+U$vYrOx<9H2|HjiQYAnabkBdu(>! zJ%*BOqrDm&OGfTr2;xnjOFW}Dydh>H_w{J$gBAd(oQ@VZ4x5d1ADr-{Tx_`jRt{PM zigqoA!om@)E1G zI`6KA^BLZ1W8T}tKR@91W0p8(_Q^~5izoF{G$-{rStqx3T*HIs)#D6NRoPt1e0Rcr zb@StflLPIVg-78iLTULfB=hm22+k;hk)O7TRU9wt*&sv5ZrIQAa&spvInY;TBSd&Q zeW-6#`_ip;w$I6N#?^G;7cI_n6l!`mynZ#JlBY`=k`at>p53$PUC6gD3cPh(-_}CD zr@fytFuL&U2`U^OC+}7?EUne_stpk#*6E=pe3v&BatoT@yBluL(+P87Jbe3DWP?j@ z3f>Dt>h*0YP4SZEjPBk+BB^%h*;mzZ9T*pbP@plsmjx2ZdppEC3Cj4}IRNSS0Rjwc zCn2XN7q^Qsfv!_#z&ZOyU1^*Sop?jUI+Q~t{i2H1diepqDyd!2azRu`?SqySJX?F{ z<+bedY7O#digvq=wTqdK^0ut6+`)CFYq;G7ko4;Fl0I1wtIV`Y;q-cOstNh;gC!pu zedZ2f4?&!?Ff>7;wmLa$)i(_0uHCo5)|Ng*lAmqJx@LAaim}>En$!$isT`! z6&}tiv=ZsN+rOpQGFeKF!f}5@ddt*M1O$!=5fcR^v-sTyZzk^=?I|wwZq;O?ofgtd zW@4RkSYA3`tdGH*^mSe>d1m?ttJ=XkQ}gI^U1*wo8!Y_wr+DwZ*u`DbvEG-t9#x6{ z!spEFds-aOOxiR@-p&MRBLK)QZ25?qyLsLX%McBNlOUNKd9y2bT&lu+qnoJb^8;um z3M6cg&UR(AF@PM6(=W%=e6vEmp)x#{)#v@WM20}G^F(Eq0HAB?R_cxiM)*sZPBU`u$7cpTou28mb z^YGXsWUUtHxqxDI0>KC*OdvbHpoSKPwMILPeDmoLaEhjz)p4$|yN1s&c3>7aHlZvI z2Z-S>RDG7QC32e7({jP_rEsdgEU% z0OOpWBwi+lhRZT<42~^P zTfN`)vZbCWD)HI@sdG+A-$N{0n&u_Oa4dTMHd9+Cdj8%VEiqf9H>9JtR|ryNs*Mn6 zp`8REVr;@?zmBX~kSrgO6CXDxrpTpKgVw+;&$~{)(!LE|+?=w~bV%hlDB^H=nH3#y zDU$x%RgvDW95cIh_Nr#b>wA|#!D@3iNkuuUR_gaK)n$TN|E+qvrvF%X3 zyOkVh@S@$-GP)vmSAn|{zlc+xFb!7H-v4?Aw_}^tcH?eNyTr+Yul(y?+2LWdy$XRf z-B%)loWf>rfF31BxPz%Vt&ntGK zybT%x0d7>FWp*2&;L)vomnlxcofw!&hGf+v;qO#ufkB?O%}U}W4ShI~dFBa9R$b5r z!w&SudR%06@pdWUAx$%cpLPDohLO!^r<6BjyH#b+OxAqi?_P_j<>=_WDM3|OJHqs; z%lLG`mHV#|ZlOG#mx{lPgQ_yLtmn&6CPo4Mre5(Y5P&Z@z`tGZ*DV}utbZI`_#$m| z8SNwx$X`>PlkjV-r{!^_s`m2F-?*0;7lH;FLD7$)EWbma`!Z|f%gKS3Iya6qP5;pSs8%Cefm2G zq|EI1-V))km;bQFE z%1BvU(J`0SZT)&VMMW2UsW$kd=*C|1xC!&x;!i8L3*y!+6@t^esu(oY zujT~yJ5`Xt>jfbPR0#@FvT&!5qppe4Mr+bi`Wd1p{i6$Gq^{~~PS_^2QDm0BH3Yo>Epb;B1ruP4IL=k4i5o=6+Lf_tJ(2Sx}xOQ+2@ zVO?b{5i|-0$2!ib(ngMS%%s4r;k>#qg_IZ6ogy{tlA7ZmSJ{(WGsdoD(e*Y+zM=bADbAq zAWWN9uU_j3kCEGCu52L#IL&Xk`yxN&ivr+XWmRoXqhhcaRS-Cz z!x@d=)qG?qY&f?2yN)OSuH(87Wco#kfvWQ-6Uro|qEa*y)i)oq%3eaHXyiA?QzdJ| zT;%|ZTGlvY+EhcCppcdh@3!r;vDQtD9z(|%Dz8=L7#0Qk7uc{)jN^)+bK#0Y?4Qe- z8Tx!dY|DW7SFD_g4s{BBRC}~HecCXc3o{0fIY47yKQ(v=)}a+w5@RW+KWtfSEjufl zFwJ*245TPB{e%j+yk9sO+pHTx!WST+^}E#=?qGa&Ps`+`ChZE*FLdwJd&MJ%-~S-H zgwwqGT=XWp6>iUY|I_9r+7*ClYG>>YTvXR613gfcy`J!8pSWEyrL#=C7yUprZ~_#I zxJ8{%Pg8rHhuRA8iHh@N;M3rMrU4JZs=RYRI}zok8w(%+5{b-y4; zmI7#>@*}FCaqh=7pSbaOR%fhT6ZQet2m6vq#d?JLso8gir*ehG32Q02Xnk$2`LKvX z#wIz?LqjYnNb#{nqH%JVd7~Z!G<=bPyZ%bksxrcICr`s)@Z9{_HtOG$NpBcCsBbo= zz%>~xnmCj%03E!-_8cWXuR>G3?V(hoCfi}lVaaN^7#8c2?{&1SGDOkKDDPQl)OVX5{S=0Gx z`6BRVu%8t%q;PFN-r{T4PqhotmM!-!TALw$_p#;Iezq#wsl>9!sf+kZ^*hB=`URo6 zElYnFo^Ltee~z{S?nQ~Ls&*7vrr@^uB?Z5kLS~#rdoLSwv$6`$vnn7~Ja>L*Lm13v{q} z($ItE1Beb-jZN(e@rAIF)Am85sUClG?sJ!)`A4Mal3t)Ui{ArvPum33{xB)!dv6kP zI5a85P2%jXiI&XfeG*3C>~p)DA+e7>>Zp5_ADy+sJa$@5uRI<^7TR#68F`(TB)NN> zv+HcD;{36H=RsD?=jP=uLn=Z)mW`V^abf)^*Yls|#&@Nji;8xc0G|58vYh3zcrKK4 zMz-Qwk%!bYcP@R5++H?IeIZDKHv@=%?@dbR+}Ka}bt)FPoqZ24G(WyTu>&)v=MN6j z+^yUXAcnM)4T&L^>jI)?Zy!@`UTIX`@Qa;k<+|B;)fklN!p?1vgNg_@I(t#!F}kEZ z&AReTPaOSIb%QMjP_Wf0@^~LG15dLKqLLn3Inb0$C-9==eJQMh#*zyZ403AQ_ReFI z|bZl@z)q1F&+ylPtRfI<1GeR!In?c zkA<>$^~tlnh}q22+I`5h;MA_n&fSEt$PgXoCPf-Omk4Zyfoc&@RH)*DebC&2g#m@< z={k9wnpXwo3+G+LOkYMu`k49l!cS6|gZ+tdH2z|&F5d={1ZntdxC#TtDVt8IID|*D zdHsB#pQd@IkI(+7LE(p!eJaeePtNO|4U*}6)QTFF_UzIL2vGwym~0fFwq$P(8x`LL zx~5XTU`B2SECZc{OHyvK-uYkaG4p@s%5j?wPi(1j9pSUlk?UL%?{#p7(77tlD*OEN zm0Pc~x)nRFl+1-F$27u0AJn5U8f}6)dH@Ofe6sKZx4GOfp}t*_v;^xV#baggb)nVVB&R}ap#=S-!-NfFeE(fw zP$vn1O!1fKQj|6lhBkFiEeDZ;`bIVq3vP%Vh}5;^pkUwe5$3`airdK?P(&Q@4U;>JiqDt8f0a8kM6X7?l?_Ux={Fh_wCHy6$O}FG=-&Bs)gd(NU3=Bn+>-{q-(XrbL z(e78=WY*Eb;i7Xk<@e^%(`D%a>%czJuUls3Kx$t<{tUq3aRONL7tyNd>fhgWmVfdS z-|Ay$=)={_Zlgc9)8HAw61^!?c5T48cG70wOAy`9w#tzSai6TF^?qedhHn3?nxwV( z(g}DFgzGF7Yr48Zlov_`W6D&~gTHfhyd(_Mf8iz&ul%a8K55(-;Fjn@fQtyGN*b^H z+&n!qKd&`I6ZZz;`Qq>9nSkuHy^4m+e>lQq;&QchjxGhkMg;&3;oZld4>i)gdh z9*fNhUkEX{n1i zLlxPwK`@11ZqlL@BrNX*Nc=khz52kDV)(hi( zbZK+1StWebE9_V#7w9&`cve)`ykN3#GD`ZidRi`QY1OHi7a;mVT-fYi*Od&-1G@{K|qoEkDpAn!T$iOZ!Vgb;uclZPsn}^LcUX z>*34R(f6SM1=atUjpcIntTVxdL{xi;v71piZQD{eops^Ngpjsv(7donSUA)MuACM0 z`%HJSm|2{!c2avh)+dw3|AbX}Iu?LNwEXobP{(0RC>alyU@0thja)bY?!YHcYkrEf zDmQp&n-zT{w*iBFZ8q$rExOtU2voCxtI)veA1*v>fTZQFTnChu8qi~PbG_&7%tu^A zr}J2XK-F!30USMA zTlN_VXK5A*z1&v|m*}@6jmA$Rxz1bt+@X&!)G51iUS6gD2RDsNVVoP z-kUgib2TWQl*3ZwZ0%#|T&u#kBKaEGrCj01#y42b;{ngHf@4FOGf_agrpLs)=_zbCo8ghyZm|T?w-23 z$o|wor<;3kva=zbu*E!L>xCjhxb;mro%_Kwo4O}M3_1MDizS$O=n5dNT{BTe5$==E zeJDKgz0w<6Trhu4_v5p(`App2k1ZNQDJs3LY z(aa{=1#+Q2ZLp&VPwO6XldO7nm!Hgadz@ES<)TaqL}Pu*(VHqRRZ{~tyR(y_abL7S zea@(6n8O$O24H9E60eM|ly=y5kDK2`kgYmTZ~8l!94Fv`oUwAz zMWhGPY%;euY?>Zy5!Lx55Q$??-Pm0#wA1g&JgVA_e4Z z+Ip^+v0n|YwPjhgSa<)@=%nHHW+BF*H{Azp8fpFL{L23}a&sehbwsUVIdp-6Z-uX% z^;)PxWAS2#77MgIBt}RF9q3IS+*=7(DMUQ&8uwuw@rh(m&hD$0^R2`g(l&pGM zbp4$$bOOFhk<^%pT|0u#Crdf~36_bhJWc-n(tAstE6oM|~HAA&m4 za<5NvFBR4Uner=NKIx=~+yW_*)jQ9(HAP^3V?Ht|Gj?}FGW8}O1_d<36j*15Axu9RCSV8R=UU7F>qzX|cq3W6A;au;4~adXUQFRkis^Hz_b?ms1`e z0a1SQbH1PS3AzH<$RMASrwdni{wPf3lCyS&EpTacLZ=nSobH@D?6YZ%AXh=iVjWAy z>QOOU8qnsR8-)&TmU&Nh**jJ-_rzzOaNYIZd4jX;X}JjR34eH~Mus^rss;5%F;)p( zt{nQLbl}S(ai!H0t$^VOQ||wcrlxkkpj0WRaRwCMw#8W0F@HtGMqnghLPJatHfYLD$|9da5{QMr6Dv!l!?n<14WR* znS8#`#@yji#Rq`A#8})-vO$(`7379%l>%^gT;hvSJfsY$%m-v&?z3+6@8rNz zh!ZGTyPf-#>`I}fl!;tgtvp`LeMpanp;PSMpK}bKug(&h&j0j&8QYdQobtb^)+C7mdNA84A zE7@J1-!8ci$TzAEE`+s3X1RL=%vixpL4s) z@OPogGhhqRBR)eqtrt&yhpt!>)3|icq?c%JJrlq-QUK&#DndsC#cx~U?cMZz)P2M@oV(}aLwkly~(!GFdH5+U{*|}x9bDaHfTN5H8D*V zMSpj7S%FgC+2D=3-AapW^RmS8>+8gz%%fWI?(GTDldiy1OUB_FEjn?f~RWU(@H`P z{Ul4LU18P8@&T~#SY4^bWwtaPff(7hJ9n>)CqCPpve3HyOf{=%I8b+hXhPLNp@ynz zg*Ndxm4z@z-Q9&9YX-hM^cFcB_I5bze|s#r)J?Z=zQh{HO#gv|E^r)ALFvam$u=nz zHEa6HZBzF6ak7C<4}jZ2%ECsYTJ7WR1Sl{7uQWS225zzpyQUmo*nE`}c444%dF8vb zQNNvIByxj4GV3bGZEYp1yz#zbdUZ;B_Nb*jW)xvugI+yw8A`k!{w~-!T-g8S;e|tv zjWM+es%af;%#82cF!iGB#`9boMshNCtrv$(Sjlv&nmVNn{pm^a0!@3`SXIznjX^Z% zD}waIqv}BQhg0dbN3Z7o0EF>6D))>rYBw3J&PQS;k^vD|Vy+<6cQh5=OZ0ua<05ld zaWj2JIkalxu%%=*#4IN$z~|dwwFfc^s&*MAhkrc+@!8c$CX0(eaT4RO8xVB(g|364cXj4w%-A{6p|82fGHTxU|)jlJaSE zVO^xRiL+DS>hiBOkXV1-B)gbaxqtsXS1Q85M_Pl*yhE~f@-zX6aOqYg2;c_9J2)!x z#C+`Yh!0;KKT#)flTOuIXNbx*1}1df6YLOoq+D7;#uf)3%-0xc)g%bipN-s~n*djn zpq)K4In9)00Nl$Ck_SUkzkh7z!_Cn~n^Jr9d`$}U18{3z661$_U#cSlxa28{_euFP zYlAqkW3^$kVT!utQy$XS{_aW{jmY?2*5d_H_x!^2Uv$SACB;RWTL7vFo4+x6m`ND`K33?<;T}dt9LFT)Nrb=GfzO`kZbv7cbja z%E^y5jfU}4kvbJC_ld%Xl%cnmx{V8*7B0b2 z-lfLn^mySi;obXc8#Nl({jY{NF}RXgJ7b8v2EW9WV?n?#xmKs>c|AEX)z+3f>fHe+ z(Wpxb925rN)f;_(%FQFNKL%e^)+QX>BrXFw&5QJn2)asln$FQc5fEOUbV+CodMFUx zQ3Pr&N(+{&J@wR)I$8u{{fY}eG#3uK)~B{CQG}~*)Ic=X!+&>`u_5U%hRj2|Y>m)ip*z4-3$vAdFw^ zxQM;Clp}4_!Kb_kj5FQE0i=VH{b4>Ur_=;hGkN!D9((FMJ@tHsC5j`MgYISoK;o$} zgw3hxVg>41->Xlr>WK50hy-oOu$cy$&jO-8lr`lAS9WIO3 zEao9J)gI@JGDI`4&lS&J-lp-h_-X-`m7g(e<#Cq;q=~buixU`Xboypk zSnqekqLPv~@W>7cOA6gb<7-lK>-+j?*Dvhx&hNb~~A>QLFE*O^bx7^dI4 zt~KQk~o1Q z5odO$A=?+!S&SRO;r=(R#)gL^l&H(I^I1AE8+JITFziS7({mVmt***uJq%NH&Q*E( zGuys1(N{d$A~jbiDgd^uK#MFWeBF^(()ag%52Bej1YvfYpiP5PCvsua%W5+*0^q7Z zM4YpvW}o&eXjF2pcIM?Pt<5)P_3j`iz}#|?Qv@jP0bBU434N;U8xSO<$Z}=ahz~Yg zuI&DR&_5^UQ^u^+5d|>^Crrwnb?@mLl*^*&lhRFdz5_eZ#-ow}mk*x-eDF?q{oT+a zRGnh{r9R8ES#1&_N#{bDAQOOH;I}pIp05#8X8VG1C9TAuRxll`hs;}jeL3v9ylidM zO+9ecPOCMP#gFfp;dYRHme0$P3U8=Me}D|L>+)9$PFM;(hjjk)Mjn;EtY-&kBe0fp zL5OCyP0F3fE%mN^W1jviWxFHMb&3Y)2-Ea$JOUXd@!-mpK4q6p+P$~;Yh%*6_|&0? z;z2STTk?OK^tWP8Re(#ZL$+ke2!U0j)@F~1RM58cKsLT4+@9s5@==J_^X7Qkb|sQ) z@$+OTq!nBYqvg2$Nb`$Mp$i^oq;Y14u8ikL`@nvA@K6bE7bV7WHA6HQqSrfAv<%cP zSj*P2+kHBl5d`$ULM$6gdEBWGNxy4v)@Xp9AE^t|VJ-Fe+Wy@HUF81x&3bK0P;E=y8z6R zfB!B3X_1aYdY$DByx^Qrq(q29j0vy^Cm^*-jm$u${pD&NBLmaSjxi zb-av#M(agiy_v5*G8(PTvVO=&k+Bwsp0*raQksmA)Wca4mJNaz_N&P`TpOFftp1!4 zon#ATA!}xcw)Q@MfTX21TlXIshS=ZoG@BT%e*J^%x)9|thiYcUfb8*fyptSK|M=83 z;Mtx`#>ZKFZib@Dg+pC!vvR0!C;2wY>&s9~gEP8{Wi@5F>RvN)|IvQRn;V>y0q@s6 zkeM$DY7|j=+h>V`mwLWfsl70boS1FI{)R9DdKQ}sAa`&E8`X{mRO}8<`hC=y*E)h%v%3Lj+So!+Z0pm6Zf0C@mxcgP->D~cI zaMzFQlYMa(mdE?g zIZuBP0E7h*4gOzXk+J~q5{k?YY8byF(#jhGqPUoKp(Q54bo7NTN$&7%n~EKG)1#o@ z_r47}cp}w}TSGa4V~E5(pzOKo*|2O^m5v6&;cSu)62yrm1t#0P0|!{HR^^!SOC@$o zyssGtuBY(>P6fDw^r8xErz`*Q_)YKWhd5E&EQ?tsOIolN=<^3oF=Brg-X3~0JnV4q zih2lV)CW|%v{6OvzEv@!=I!(`t2R0yieQ{7S{7!aYg{URf-|A`4opTBC8nSYj3jBk zd|hYmJMPwop;HuW1@?60>7JMfzxn>eJ1pDBh+!M#ttuj@{PJcnc5Gz1KN0yn0X!XF z=ZC=A=2Cs(`04!D+J1&4S;`Bh4=0ddu1Mk~T>SRQg@>8|d4bkm*toc?DnNESbp7}j zfdF)$mW!gJ%_rS8E;8w_<}5)YLl%%;V6}99?0@duIQAv-fvYt6RyY5QC4uNNq+}OG zJ(QBG8*@otY5!2)2n@>BanboU37!wUFK`jSRT?;-BZhtPrr)R}r}s+$h!V(T9VKS* z6eOph;~3>kPn@3I`$Uu@g3D01pY87agB~!%sMaR?OZQ}_WnXdM3hG?vH zAahEBsl073fFs^V>J}+o3Su==r8ZCIpwk1bvxHm$6H!F|tspzu0RB%vig{dNHW^F&nv94;&7#_A{FgD}$)yEBvP~*OSl$Orxvk z6JU$iR-#4CdV9)R19qUS(w9}sk4L5Vs2bGQ+l--6n)RQ`8= zdA~aB+A8@@gDSCcwR;;9NjcSwdt+%ocjHyK{V<@`u0zA12cHkLM~pAQk|1JUKg@%- zX2$D5qn4N`nNRr^z8IhN-07V{@>V16p2$hF1LX~H&69nSGfK_{y@x3Ib3T%}KNSR_ z%Vvy-qh+)3cg;z=x_=&46o%j3XvQ@I6nb;1m~--Z2z}Ub#?p4ZR)Z#|rYkc5+ur#yOr1Tkd%N)1gqR(0!r63#?T#bhG{QsFJCvK0 zI$|}`dJ@={AY-6~6P`{ds^2vtqLEQdKgz*_UxAn2f^yd%eea~`59GC{?F(X#jUWh zaj@QA{gU+f;sHWS-!&hpbGhZNXQXvTSCz{qh&U&;a!;0LFixMdD z-Mu?SzY1UZZ9P3utouYpJWT(m13yfR(<`kd4)&q_rX?kui-WwG(2Lf?FN)ISm{Qlj zg6$GNCY4+6>0v)uek2q8XQ#so0e=rC;VubVOe_v;Hw5-9o$3+X>W*w1YsPKH#9lXw z?Wv#O2%?EleP9-uxM|C`=rg}BK&6^RZ^Ck>oxYuhO?kPze7w=)7|$u~_Oxy7*>-k4 ze#?lu?X~aq%+hkz;6QeLbr?5OqcbpWW}RsvpSrRb;G7lV71m`M+>UDFAO6Fjb$OmS zn&3m&6nu7brikX`o5g;bV0EA;di2^1Ht(px^+soXeGlMX zDFWv6hZJTiO(j?AV*j@8PWu~{((EDEm0Glbn&L#cvGEy`5 zivlpFINsl!u_23(CF449E$!g|6Pc7(S6Esu8=M^K{;$7r~1E5U-dH-gOTl%d@@G0?1IcMx@OLgNHAl z-Ucnz5C|BbemgxPpMxe7L)`%JdC_I1@9|kcT9UPjF97G6T^;RIUJ_93k9jPP5QSRB z9hKS9`fw8zT^3H2xTOy}d`pnCRkA&HFpW3O)GRc2GqERsHFFgTxN5+xsE6u!`L$iQ zU7aSph0anS_8DJe13il2MXTg9*mVLVjyK9m;hycxP|@4%Kcci@I42+wiXwDQ))tmA z$j5f^YiFlK!sm|TeRNbGbp0`@+TOYFm@2%QGX z7$}{cnD3vHW=}V4maL+i_25<+dUn=ChS#qQb0^$)KnO8txFWELId)a;rYjWoyQF8v zCzqAvosMMnVv2vQj);3>7<_$TI6a^uq^K{#n$hwtw)4`~w{l?XV1dmnv994p4sFdD zdg$D5t^jmT1cJi0!476NCVBFNPGD#?eG9BK-akfnb*o&qj1lL)>vXzYVyMr1RD&kG zN_~%7`QozjNn#WQR3z=C+5SNq^Y*P4KRG~Me?qT$GB&!!=4Aj^QWWpMXpoUws#_AF z-h4xKWHA8ZR7_v~vVhD0CqRKJy0=T`jIpp9tO1Bn5i%jPIFPB$!R7DbpTbb%`6?!-$#J(;#;!`u)K_k)tF4l2K z&6Gx}MA)=53@G}mdfquaU#O>g;h+sP)5Bk`n6m=mvQB6fAELL}8ml)Sg@=htG)-ux zi@!X#o&eHE`A{dHxH#Av{ukKWR48_=e&C&9E|R0lv<$~2+bFT=DpUK`!3Rk6q{B$` zbCeBxw_9S8%F>LyHQbP*c4$M8ICQM`jCfS9@bokA4Gtup{K^s4K6daii zG6MMCyFiv*RnQI2(4(Ajv^uFc9EDRx49-ZiNg=aSA>j9+J?aXVYb)qTIrx76EwMzv zn+^000{+Bz1Wd;`{9huetKqxqa*4GjZ~k+WU*sJFIDNkcDw~5G+P5VOgzGHe2d3Sp zPUcDjB=4?V;v%WQoE9*uqB)n#L1t5#lw#XJUxtU+>i$G*2HsF IR=#)t33s4~#sB~S literal 0 HcmV?d00001 diff --git a/docs/src/people.rst b/docs/src/people.rst index 99dbd33d9e..26b2bcac89 100644 --- a/docs/src/people.rst +++ b/docs/src/people.rst @@ -48,6 +48,11 @@ Silver Sponsors Bronze Sponsors --------------- +.. figure:: _static/images/route4me-logo.png + :target: https://route4me.com + :width: 50% + :alt: Route Optimizer and Route Planner Software + .. figure:: _static/images/eaccidents-logo.png :target: https://eaccidents.com/ :width: 50% From f34a077d5bd092fb1005c3f26935957afc0b44f5 Mon Sep 17 00:00:00 2001 From: Gordon Mohr Date: Tue, 4 Jun 2024 10:32:32 -0700 Subject: [PATCH 13/24] test numpy==2.0.0rc2 --- setup.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 01cda61aba..4f36cc358d 100644 --- a/setup.py +++ b/setup.py @@ -324,10 +324,7 @@ def run(self): 'pandas', ] -# -# see https://github.com/piskvorky/gensim/pull/3535 -# -NUMPY_STR = 'numpy >= 1.18.5, < 2.0' +NUMPY_STR = 'numpy == 2.0.0rc2' install_requires = [ NUMPY_STR, @@ -340,7 +337,7 @@ def run(self): setup( name='gensim', - version='4.3.3', + version='4.3.2.np2test0', description='Python framework for fast Vector Space Modelling', long_description=LONG_DESCRIPTION, From 3847b73abc36e5cdf283e1cffdd3b57c3b485de7 Mon Sep 17 00:00:00 2001 From: Gordon Mohr Date: Tue, 4 Jun 2024 11:52:21 -0700 Subject: [PATCH 14/24] numpy==2.0.0.rc2 & python>=3.9 in pyproject.toml --- pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dba0603d0f..8ffd5854a2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,8 +7,10 @@ requires = [ "Cython>=0.29.32,<3.0.0", # oldest supported Numpy for this platform is 1.17 but the oldest supported by Gensim # is 1.18.5, remove the line when they increase oldest supported Numpy for this platform - "numpy==1.18.5; python_version=='3.8' and platform_machine not in 'arm64|aarch64'", - "oldest-supported-numpy; python_version>'3.8' or platform_machine in 'arm64|aarch64'", + # 20240604 GM: testing numpy-2.0.0rc2 which requires python >= 3.9 (to 3.12) + "numpy==2.0.0rc2; python_version>='3.9' and platform_machine not in 'arm64|aarch64'", + # "oldest-supported-numpy; python_version>'3.8' or platform_machine in 'arm64|aarch64'", + "scipy", "setuptools", "wheel", ] From 712780d3eebf8230fad81b8236e1e7762fbbb896 Mon Sep 17 00:00:00 2001 From: Gordon Mohr Date: Tue, 4 Jun 2024 11:58:42 -0700 Subject: [PATCH 15/24] use legal version id: `4.4.0a1.dev0` --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4f36cc358d..c69c51fa36 100644 --- a/setup.py +++ b/setup.py @@ -337,7 +337,7 @@ def run(self): setup( name='gensim', - version='4.3.2.np2test0', + version='4.4.0a0.dev0', description='Python framework for fast Vector Space Modelling', long_description=LONG_DESCRIPTION, From b9119e0ada5ab599a5b7bf2a178e292d9a3f89e5 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Wed, 6 Nov 2024 17:58:32 +0100 Subject: [PATCH 16/24] changed numpy pin --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8ffd5854a2..818faf19ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ requires = [ # oldest supported Numpy for this platform is 1.17 but the oldest supported by Gensim # is 1.18.5, remove the line when they increase oldest supported Numpy for this platform # 20240604 GM: testing numpy-2.0.0rc2 which requires python >= 3.9 (to 3.12) - "numpy==2.0.0rc2; python_version>='3.9' and platform_machine not in 'arm64|aarch64'", + "numpy==2.0.0; python_version>='3.9' and platform_machine not in 'arm64|aarch64'", # "oldest-supported-numpy; python_version>'3.8' or platform_machine in 'arm64|aarch64'", "scipy", "setuptools", From fe730c252d4baf5395f2e63bd6b12c2969914483 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 10:49:11 +0100 Subject: [PATCH 17/24] removed scipy sparsetools functions --- gensim/models/lsimodel.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gensim/models/lsimodel.py b/gensim/models/lsimodel.py index cce19b0b6b..b6fb4bf125 100644 --- a/gensim/models/lsimodel.py +++ b/gensim/models/lsimodel.py @@ -66,7 +66,6 @@ import numpy as np import scipy.linalg import scipy.sparse -from scipy.sparse import sparsetools from gensim import interfaces, matutils, utils from gensim.models import basemodel @@ -960,10 +959,8 @@ def stochastic_svd( m, n = corpus.shape assert num_terms == m, f"mismatch in number of features: {m} in sparse matrix vs. {num_terms} parameter" o = random_state.normal(0.0, 1.0, (n, samples)).astype(y.dtype) # draw a random gaussian matrix - sparsetools.csc_matvecs( - m, n, samples, corpus.indptr, corpus.indices, - corpus.data, o.ravel(), y.ravel(), - ) # y = corpus * o + y = corpus.dot(o) # y = corpus * o + del o # unlike np, scipy.sparse `astype()` copies everything, even if there is no change to dtype! @@ -994,10 +991,7 @@ def stochastic_svd( num_docs += n logger.debug("multiplying chunk * gauss") o = random_state.normal(0.0, 1.0, (n, samples), ).astype(dtype) # draw a random gaussian matrix - sparsetools.csc_matvecs( - m, n, samples, chunk.indptr, chunk.indices, # y = y + chunk * o - chunk.data, o.ravel(), y.ravel(), - ) + y = y + chunk * o del chunk, o y = [y] q, _ = matutils.qr_destroy(y) # orthonormalize the range From 546657e56da1586cb67a06119331496c6f94cb93 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 11:14:25 +0100 Subject: [PATCH 18/24] lint --- gensim/models/lsimodel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gensim/models/lsimodel.py b/gensim/models/lsimodel.py index b6fb4bf125..c38da5f91a 100644 --- a/gensim/models/lsimodel.py +++ b/gensim/models/lsimodel.py @@ -959,7 +959,7 @@ def stochastic_svd( m, n = corpus.shape assert num_terms == m, f"mismatch in number of features: {m} in sparse matrix vs. {num_terms} parameter" o = random_state.normal(0.0, 1.0, (n, samples)).astype(y.dtype) # draw a random gaussian matrix - y = corpus.dot(o) # y = corpus * o + y = corpus.dot(o) # y = corpus * o del o From 21765118b1897627318a2cdbb0306eb0043047bd Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 13:51:32 +0100 Subject: [PATCH 19/24] numpy string --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c69c51fa36..00a969e457 100644 --- a/setup.py +++ b/setup.py @@ -324,7 +324,7 @@ def run(self): 'pandas', ] -NUMPY_STR = 'numpy == 2.0.0rc2' +NUMPY_STR = 'numpy == 2.0.0' install_requires = [ NUMPY_STR, From 6c43d1b6227dcc15ca67a06fd9bd82411d62c564 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 13:56:09 +0100 Subject: [PATCH 20/24] removed python 3.8 from supported versions --- .github/workflows/build-docs.yml | 4 ++-- .github/workflows/build-wheels.yml | 4 ---- .github/workflows/tests.yml | 6 ++---- pyproject.toml | 2 +- setup.py | 3 +-- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index d369eec05a..3c8031220f 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -25,7 +25,7 @@ jobs: # # We use Py3.8 here for historical reasons. # - python-version: "3.8" + python-version: "3.9" - name: Update pip run: python -m pip install -U pip @@ -35,7 +35,7 @@ jobs: sudo apt-get -yq update sudo apt-get -yq remove texlive-binaries --purge sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install dvipng texlive-latex-base texlive-latex-extra texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended latexmk - sudo apt-get -yq install build-essential python3.8-dev + sudo apt-get -yq install build-essential python3.9-dev - name: Install gensim and its dependencies run: pip install -e .[docs] diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index c4c3444499..aa80162b2e 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -61,21 +61,17 @@ jobs: fail-fast: false matrix: include: - - {python: '3.8', os: macos-12} - {python: '3.9', os: macos-12} - {python: '3.10', os: macos-12} - {python: '3.11', os: macos-12} - {python: '3.12', os: macos-12} - - {python: '3.8', os: ubuntu-20.04} - {python: '3.9', os: ubuntu-20.04} - {python: '3.10', os: ubuntu-20.04} - {python: '3.11', os: ubuntu-20.04} - {python: '3.12', os: ubuntu-20.04} - - {python: '3.8', os: windows-2019} - {python: '3.9', os: windows-2019} - - {python: '3.10', os: windows-2019} - {python: '3.11', os: windows-2019} - {python: '3.12', os: windows-2019} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2d342f2c11..9bd6c2bd47 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,7 +33,7 @@ jobs: # # We use Py3.8 here for historical reasons. # - python-version: "3.8" + python-version: "3.9" - name: Update pip run: python -m pip install -U pip @@ -43,7 +43,7 @@ jobs: sudo apt-get -yq update sudo apt-get -yq remove texlive-binaries --purge sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install dvipng texlive-latex-base texlive-latex-extra texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended latexmk - sudo apt-get -yq install build-essential python3.8-dev + sudo apt-get -yq install build-essential python3.9-dev - name: Install gensim and its dependencies run: pip install -e .[docs] @@ -63,13 +63,11 @@ jobs: fail-fast: false matrix: include: - - {python: '3.8', os: ubuntu-20.04} - {python: '3.9', os: ubuntu-20.04} - {python: '3.10', os: ubuntu-20.04} - {python: '3.11', os: ubuntu-20.04} - {python: '3.12', os: ubuntu-20.04} - - {python: '3.8', os: windows-2019} - {python: '3.9', os: windows-2019} - {python: '3.10', os: windows-2019} - {python: '3.11', os: windows-2019} diff --git a/pyproject.toml b/pyproject.toml index 818faf19ee..515d69c5a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ requires = [ "Cython>=0.29.32,<3.0.0", # oldest supported Numpy for this platform is 1.17 but the oldest supported by Gensim # is 1.18.5, remove the line when they increase oldest supported Numpy for this platform - # 20240604 GM: testing numpy-2.0.0rc2 which requires python >= 3.9 (to 3.12) + # 20240604 GM: testing numpy-2.0.0 which requires python >= 3.9 (to 3.12) "numpy==2.0.0; python_version>='3.9' and platform_machine not in 'arm64|aarch64'", # "oldest-supported-numpy; python_version>'3.8' or platform_machine in 'arm64|aarch64'", "scipy", diff --git a/setup.py b/setup.py index 00a969e457..7a20a09f96 100644 --- a/setup.py +++ b/setup.py @@ -370,7 +370,6 @@ def run(self): 'Environment :: Console', 'Intended Audience :: Science/Research', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', @@ -382,7 +381,7 @@ def run(self): ], test_suite="gensim.test", - python_requires='>=3.8', + python_requires='>=3.9', install_requires=install_requires, tests_require=linux_testenv, extras_require={ From ca32ff064536f3e2b0e762576dfef4528151b745 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 14:31:02 +0100 Subject: [PATCH 21/24] added item to get explicit python scalar type --- gensim/models/keyedvectors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gensim/models/keyedvectors.py b/gensim/models/keyedvectors.py index ffb808f6cc..09035f9ff5 100644 --- a/gensim/models/keyedvectors.py +++ b/gensim/models/keyedvectors.py @@ -1977,7 +1977,7 @@ def _word2vec_read_text(fin, kv, counts, vocab_size, vector_size, datatype, unic def _word2vec_line_to_vector(line, datatype, unicode_errors, encoding): parts = utils.to_unicode(line.rstrip(), encoding=encoding, errors=unicode_errors).split(" ") - word, weights = parts[0], [datatype(x) for x in parts[1:]] + word, weights = parts[0], [datatype(x).item() for x in parts[1:]] return word, weights From 48166459e305da32347e142f5b7554a6d5dcefda Mon Sep 17 00:00:00 2001 From: Julian Pollmann Date: Fri, 6 Dec 2024 19:38:22 +0100 Subject: [PATCH 22/24] Fix Keyvector stored as str of np.float32 --- gensim/models/keyedvectors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gensim/models/keyedvectors.py b/gensim/models/keyedvectors.py index 09035f9ff5..3dd6cf61d0 100644 --- a/gensim/models/keyedvectors.py +++ b/gensim/models/keyedvectors.py @@ -1667,7 +1667,7 @@ def save_word2vec_format( if binary: fout.write(f"{prefix}{key} ".encode('utf8') + key_vector.astype(REAL).tobytes()) else: - fout.write(f"{prefix}{key} {' '.join(repr(val) for val in key_vector)}\n".encode('utf8')) + fout.write(f"{prefix}{key} {' '.join(repr(val) for val in key_vector.tolist())}\n".encode('utf8')) @classmethod def load_word2vec_format( From 3657d3031fa5d44bd6424042f8690ce1070c6b0e Mon Sep 17 00:00:00 2001 From: Julian Pollmann Date: Mon, 9 Dec 2024 11:02:09 +0100 Subject: [PATCH 23/24] Changed np.alltrue() -> np.all() --- gensim/test/test_similarities.py | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/gensim/test/test_similarities.py b/gensim/test/test_similarities.py index 314336dadc..ab03551d7c 100644 --- a/gensim/test/test_similarities.py +++ b/gensim/test/test_similarities.py @@ -323,11 +323,11 @@ def test_full(self, num_best=None): # Sparse array. for i, sim in sims: # Note that similarities are bigger than zero, as they are the 1/ 1 + distances. - self.assertTrue(numpy.alltrue(sim > 0.0)) + self.assertTrue(numpy.all(sim > 0.0)) else: self.assertTrue(sims[0] == 1.0) # Similarity of a document with itself is 0.0. - self.assertTrue(numpy.alltrue(sims[1:] > 0.0)) - self.assertTrue(numpy.alltrue(sims[1:] < 1.0)) + self.assertTrue(numpy.all(sims[1:] > 0.0)) + self.assertTrue(numpy.all(sims[1:] < 1.0)) @unittest.skipIf(POT_EXT is False, "POT not installed") def test_non_increasing(self): @@ -354,15 +354,15 @@ def test_chunking(self): sims = index[query] for i in range(3): - self.assertTrue(numpy.alltrue(sims[i, i] == 1.0)) # Similarity of a document with itself is 0.0. + self.assertTrue(numpy.all(sims[i, i] == 1.0)) # Similarity of a document with itself is 0.0. # test the same thing but with num_best index.num_best = 3 sims = index[query] for sims_temp in sims: for i, sim in sims_temp: - self.assertTrue(numpy.alltrue(sim > 0.0)) - self.assertTrue(numpy.alltrue(sim <= 1.0)) + self.assertTrue(numpy.all(sim > 0.0)) + self.assertTrue(numpy.all(sim <= 1.0)) @unittest.skipIf(POT_EXT is False, "POT not installed") def test_iter(self): @@ -370,8 +370,8 @@ def test_iter(self): index = self.cls(TEXTS, self.w2v_model) for sims in index: - self.assertTrue(numpy.alltrue(sims >= 0.0)) - self.assertTrue(numpy.alltrue(sims <= 1.0)) + self.assertTrue(numpy.all(sims >= 0.0)) + self.assertTrue(numpy.all(sims <= 1.0)) @unittest.skipIf(POT_EXT is False, "POT not installed") def test_str(self): @@ -399,12 +399,12 @@ def test_full(self, num_best=None): if num_best is not None: # Sparse array. for i, sim in sims: - self.assertTrue(numpy.alltrue(sim <= 1.0)) - self.assertTrue(numpy.alltrue(sim >= 0.0)) + self.assertTrue(numpy.all(sim <= 1.0)) + self.assertTrue(numpy.all(sim >= 0.0)) else: self.assertAlmostEqual(1.0, sims[0]) # Similarity of a document with itself is 1.0. - self.assertTrue(numpy.alltrue(sims[1:] >= 0.0)) - self.assertTrue(numpy.alltrue(sims[1:] < 1.0)) + self.assertTrue(numpy.all(sims[1:] >= 0.0)) + self.assertTrue(numpy.all(sims[1:] < 1.0)) # Corpora for query in ( @@ -416,15 +416,15 @@ def test_full(self, num_best=None): # Sparse array. for result in sims: for i, sim in result: - self.assertTrue(numpy.alltrue(sim <= 1.0)) - self.assertTrue(numpy.alltrue(sim >= 0.0)) + self.assertTrue(numpy.all(sim <= 1.0)) + self.assertTrue(numpy.all(sim >= 0.0)) else: for i, result in enumerate(sims): self.assertAlmostEqual(1.0, result[i]) # Similarity of a document with itself is 1.0. - self.assertTrue(numpy.alltrue(result[:i] >= 0.0)) - self.assertTrue(numpy.alltrue(result[:i] < 1.0)) - self.assertTrue(numpy.alltrue(result[i + 1:] >= 0.0)) - self.assertTrue(numpy.alltrue(result[i + 1:] < 1.0)) + self.assertTrue(numpy.all(result[:i] >= 0.0)) + self.assertTrue(numpy.all(result[:i] < 1.0)) + self.assertTrue(numpy.all(result[i + 1:] >= 0.0)) + self.assertTrue(numpy.all(result[i + 1:] < 1.0)) def test_non_increasing(self): """ Check that similarities are non-increasing when `num_best` is not `None`.""" @@ -445,7 +445,7 @@ def test_chunking(self): sims = index[query] for i in range(3): - self.assertTrue(numpy.alltrue(sims[i, i] == 1.0)) # Similarity of a document with itself is 1.0. + self.assertTrue(numpy.all(sims[i, i] == 1.0)) # Similarity of a document with itself is 1.0. # test the same thing but with num_best index.num_best = 5 @@ -459,8 +459,8 @@ def test_chunking(self): def test_iter(self): index = self.cls(CORPUS, self.similarity_matrix) for sims in index: - self.assertTrue(numpy.alltrue(sims >= 0.0)) - self.assertTrue(numpy.alltrue(sims <= 1.0)) + self.assertTrue(numpy.all(sims >= 0.0)) + self.assertTrue(numpy.all(sims <= 1.0)) class TestSparseMatrixSimilarity(_TestSimilarityABC): From 122f4ae80ccf7b27d49889ba9ac4f338ed082b7b Mon Sep 17 00:00:00 2001 From: Julian Pollmann Date: Mon, 9 Dec 2024 17:15:15 +0100 Subject: [PATCH 24/24] Fix dtype float32/64 mismatch --- gensim/models/keyedvectors.py | 4 ++-- gensim/models/ldamodel.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gensim/models/keyedvectors.py b/gensim/models/keyedvectors.py index 3dd6cf61d0..475a0b4810 100644 --- a/gensim/models/keyedvectors.py +++ b/gensim/models/keyedvectors.py @@ -495,9 +495,9 @@ def get_mean_vector(self, keys, weights=None, pre_normalize=True, post_normalize if len(keys) == 0: raise ValueError("cannot compute mean with no input") if isinstance(weights, list): - weights = np.array(weights) + weights = np.array(weights, dtype=self.vectors.dtype) if weights is None: - weights = np.ones(len(keys)) + weights = np.ones(len(keys), dtype=self.vectors.dtype) if len(keys) != weights.shape[0]: # weights is a 1-D numpy array raise ValueError( "keys and weights array must have same number of elements" diff --git a/gensim/models/ldamodel.py b/gensim/models/ldamodel.py index 945ff04599..c3e8afbf85 100755 --- a/gensim/models/ldamodel.py +++ b/gensim/models/ldamodel.py @@ -133,10 +133,11 @@ def update_dir_prior(prior, N, logphat, rho): The updated prior. """ + dtype = logphat.dtype gradf = N * (psi(np.sum(prior)) - psi(prior) + logphat) - c = N * polygamma(1, np.sum(prior)) - q = -N * polygamma(1, prior) + c = N * polygamma(1, np.sum(prior)).astype(dtype) + q = -N * polygamma(1, prior).astype(dtype) b = np.sum(gradf / q) / (1 / c + np.sum(1 / q))