From 3f84e6c4a31e36c5facbecc8fa3153e5f78faf8f Mon Sep 17 00:00:00 2001 From: KeishiS Date: Thu, 29 Aug 2024 08:39:27 +0900 Subject: [PATCH 1/2] pinned numpy version to avoid breaking changes before major update --- src/GKextCPy/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GKextCPy/setup.py b/src/GKextCPy/setup.py index 2b481b4..f3248bd 100644 --- a/src/GKextCPy/setup.py +++ b/src/GKextCPy/setup.py @@ -13,7 +13,7 @@ # Solve the chicken-and-egg problem of requiring packages *before* the # script has been parsed. -for package in ['numpy', 'pkgconfig']: +for package in ['numpy<2.0', 'pkgconfig']: # Don't try to install packages that already exist. try: @@ -55,7 +55,7 @@ def get_include_dirs(): ) setup(name = 'GKextCPy', - version = '0.4.1', + version = '0.4.2', author = 'Elisabetta Ghisu', description = """Graph Kernels: building the extension Python module. This is a wrapper package from C++ to Python.""", ext_modules = [GKextCPy_module], From 3166a7e971daaef57374e5f86c6f9dce079eb550 Mon Sep 17 00:00:00 2001 From: KeishiS Date: Thu, 29 Aug 2024 10:52:33 +0900 Subject: [PATCH 2/2] updated load function to explicitly specify default values due to changes in numpy version update 1.15 -> 1.16 --- Tutorial/demo_mutag.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tutorial/demo_mutag.py b/Tutorial/demo_mutag.py index 7f7887c..6de15f1 100644 --- a/Tutorial/demo_mutag.py +++ b/Tutorial/demo_mutag.py @@ -11,10 +11,10 @@ # Load data # comment next line if data.mutag is in a different folder -mutag_list = np.load("graphkernels/data.mutag") +mutag_list = np.load("graphkernels/data.mutag", allow_pickle=True) # Uncomment next line if data.mutag is in your current folder -#mutag_list = np.load("data.mutag") +#mutag_list = np.load("data.mutag", allow_pickle=True) ### ALL KERNELS COMPUTE K1 = gk.CalculateEdgeHistKernel(mutag_list)