From c55003d9a2b64fe08470507211b4235a1c61137f Mon Sep 17 00:00:00 2001 From: jajupmochi Date: Fri, 16 Oct 2020 18:08:44 +0200 Subject: [PATCH 1/3] Add a requirement: slycot. --- README.md | 2 +- requirements.txt | 1 + requirements_pypi.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9ade200..a8720cf 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ A Python package for graph kernels, graph edit distances and graph pre-image pro * tabulate>=0.8.2 * tqdm>=4.26.0 * control>=0.8.2 (for generalized random walk kernels only) -* slycot==0.3.3 (for generalized random walk kernels only, which requires a fortran compiler, gfortran for example) +* slycot>0.4.0 (for generalized random walk kernels only, which requires a fortran compiler, gfortran for example) ## How to use? diff --git a/requirements.txt b/requirements.txt index e67a6a3..2e8cbc0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ scikit-learn>=0.20.0 tabulate>=0.8.2 tqdm>=4.26.0 control>=0.8.2 # for generalized random walk kernels only. +slycot>=0.4.0 # for generalized random walk kernels only, which requires a fortran compiler, gfortran for example cvxpy>=1.0.31 # for preimage. Does not work for "pip install graphkit-learn". # -e https://files.pythonhosted.org/packages/11/d0/d900870dc2d02ea74961b90c353666c6528a33ea61a10aa59a0d5574ae59/cvxpy-1.0.31.tar.gz # for preimage. cvxopt>=1.2.5 # for preimage. diff --git a/requirements_pypi.txt b/requirements_pypi.txt index d03fb10..1a42146 100644 --- a/requirements_pypi.txt +++ b/requirements_pypi.txt @@ -6,6 +6,7 @@ scikit-learn>=0.20.0 tabulate>=0.8.2 tqdm>=4.26.0 control>=0.8.2 # for generalized random walk kernels only. +# slycot>=0.4.0 # for generalized random walk kernels only, which requires a fortran compiler, gfortran for example # cvxpy>=1.0.31 # for preimage. Does not work for "pip install graphkit-learn". # -e https://files.pythonhosted.org/packages/11/d0/d900870dc2d02ea74961b90c353666c6528a33ea61a10aa59a0d5574ae59/cvxpy-1.0.31.tar.gz # for preimage. cvxopt>=1.2.5 # for preimage. From 051727faa7f6187eec9a681aa8a3a7640ac0514c Mon Sep 17 00:00:00 2001 From: jajupmochi Date: Fri, 16 Oct 2020 18:09:08 +0200 Subject: [PATCH 2/3] Add test for Python 3.9. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 293c49a..a99fedb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - '3.6' - '3.7' - '3.8' +- '3.9' before_install: - python --version From d529e060524b7dad42e0682eacc5fafda3617dcc Mon Sep 17 00:00:00 2001 From: jajupmochi Date: Fri, 16 Oct 2020 18:34:33 +0200 Subject: [PATCH 3/3] Update MPG. --- gklearn/preimage/median_preimage_generator.py | 2 +- gklearn/tests/test_median_preimage_generator.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gklearn/preimage/median_preimage_generator.py b/gklearn/preimage/median_preimage_generator.py index dae2b0a..7cb362f 100644 --- a/gklearn/preimage/median_preimage_generator.py +++ b/gklearn/preimage/median_preimage_generator.py @@ -183,7 +183,7 @@ class MedianPreimageGenerator(PreimageGenerator): results['mge']['num_decrease_order'] = self._mge.get_num_times_order_decreased() results['mge']['num_increase_order'] = self._mge.get_num_times_order_increased() results['mge']['num_converged_descents'] = self._mge.get_num_converged_descents() - results['ged_matrix_set_median'] = self._mge.ged_matrix_set_median_tmp +# results['ged_matrix_set_median'] = self._mge.ged_matrix_set_median_tmp return results diff --git a/gklearn/tests/test_median_preimage_generator.py b/gklearn/tests/test_median_preimage_generator.py index a376c7a..b8b294e 100644 --- a/gklearn/tests/test_median_preimage_generator.py +++ b/gklearn/tests/test_median_preimage_generator.py @@ -71,4 +71,8 @@ def test_median_preimage_generator(): try: generate_median_preimages_by_class(ds_name, mpg_options, kernel_options, ged_options, mge_options, save_results=save_results, save_medians=True, plot_medians=True, load_gm='auto', dir_save=dir_save, irrelevant_labels=irrelevant_labels, edge_required=edge_required, cut_range=range(0, 4)) except Exception as exception: - assert False, exception \ No newline at end of file + assert False, exception + + +if __name__ == '__main__': + test_median_preimage_generator() \ No newline at end of file