From 0aef036cdd81f5ef756b650a9d3915c945d1aa58 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 23 Feb 2024 10:08:34 +0800 Subject: [PATCH 1/4] add gfql colab links to readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b4dcae316..299c1936f 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ It is easy to turn arbitrary data into insightful graphs. PyGraphistry comes wit g2.plot() ``` -* GFQL: Cypher-style graph pattern mining queries on dataframes with optional GPU acceleration ([ipynb demo](demos/more_examples/graphistry_features/hop_and_chain_graph_pattern_mining.ipynb), [benchmark](demos/gfql/benchmark_hops_cpu_gpu.ipynb)) +* GFQL: Cypher-style graph pattern mining queries on dataframes with optional GPU acceleration ([ipynb demo](demos/more_examples/graphistry_features/hop_and_chain_graph_pattern_mining.ipynb), [benchmark](demos/gfql/benchmark_hops_cpu_gpu.ipynb)). One run this [full benchmark on colab](https://github.com/dcolinmorgan/grph/blob/main/clean_gfql_cpu_gpu_benchmark.ipynb), or run a [smaller demo on colab](https://github.com/dcolinmorgan/grph/blob/main/simple_GFQL.ipynb)) Run Cypher-style graph queries natively on dataframes without going to a database or Java with GFQL: @@ -1250,6 +1250,8 @@ PyGraphistry supports GFQL, its PyData-native variant of the popular Cypher grap See also [graph pattern matching tutorial](demos/more_examples/graphistry_features/hop_and_chain_graph_pattern_mining.ipynb) and the CPU/GPU [benchmark](demos/gfql/benchmark_hops_cpu_gpu.ipynb) +Run a [small demo on google colab](https://github.com/dcolinmorgan/grph/blob/main/simple_GFQL.ipynb) T4 GPU for free, or run the [entire benchmark on colab](https://github.com/dcolinmorgan/grph/blob/main/clean_gfql_cpu_gpu_benchmark.ipynb) + Traverse within a graph, or expand one graph against another Simple node and edge filtering via `filter_edges_by_dict()` and `filter_nodes_by_dict()`: From 62e5d80677186d123d72d1a342c5f7e64627c77a Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 23 Feb 2024 11:09:51 +0800 Subject: [PATCH 2/4] update dcat version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8b048e6ab..6b49a6d42 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def unique_flatten_dict(d): } base_extras_heavy = { - 'umap-learn': ['umap-learn', 'dirty-cat==0.2.0', 'scikit-learn>=1.0'], + 'umap-learn': ['umap-learn', 'dirty-cat==0.4.1', 'scikit-learn>=1.0'], } # https://github.com/facebookresearch/faiss/issues/1589 for faiss-cpu 1.6.1, #'setuptools==67.4.0' removed base_extras_heavy['ai'] = base_extras_heavy['umap-learn'] + ['scipy', 'dgl', 'torch<2', 'sentence-transformers', 'faiss-cpu', 'joblib'] From f909e1055f721af96f2eacbb0b509774520394b2 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 23 Feb 2024 12:40:25 +0800 Subject: [PATCH 3/4] update sklearn version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6b49a6d42..5563c040a 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def unique_flatten_dict(d): } base_extras_heavy = { - 'umap-learn': ['umap-learn', 'dirty-cat==0.4.1', 'scikit-learn>=1.0'], + 'umap-learn': ['umap-learn', 'dirty-cat==0.4.1', 'scikit-learn<=1.3.2'], } # https://github.com/facebookresearch/faiss/issues/1589 for faiss-cpu 1.6.1, #'setuptools==67.4.0' removed base_extras_heavy['ai'] = base_extras_heavy['umap-learn'] + ['scipy', 'dgl', 'torch<2', 'sentence-transformers', 'faiss-cpu', 'joblib'] From 1b426ee5047e21c34c9599a224547872f3fd695c Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 23 Feb 2024 12:47:47 +0800 Subject: [PATCH 4/4] update dcat version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5563c040a..1646f9513 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def unique_flatten_dict(d): } base_extras_heavy = { - 'umap-learn': ['umap-learn', 'dirty-cat==0.4.1', 'scikit-learn<=1.3.2'], + 'umap-learn': ['umap-learn', 'dirty-cat==0.2.0', 'scikit-learn<=1.3.2'], } # https://github.com/facebookresearch/faiss/issues/1589 for faiss-cpu 1.6.1, #'setuptools==67.4.0' removed base_extras_heavy['ai'] = base_extras_heavy['umap-learn'] + ['scipy', 'dgl', 'torch<2', 'sentence-transformers', 'faiss-cpu', 'joblib']