From c557adf69c1d050e8de6201250bc8f17baa47a62 Mon Sep 17 00:00:00 2001 From: Alexandria Barghi Date: Tue, 14 May 2024 12:26:17 -0700 Subject: [PATCH] refactor tests --- .../test_dask_graph_store.py} | 0 .../test_dask_graph_store_mg.py} | 0 .../test_dask_neighbor_loader.py} | 0 .../test_dask_neighbor_loader_mg.py} | 0 .../test_sampler_utils.py} | 8 +------- .../test_sampler_utils_mg.py} | 2 +- 6 files changed, 2 insertions(+), 8 deletions(-) rename python/cugraph-pyg/cugraph_pyg/tests/{test_cugraph_store.py => data/test_dask_graph_store.py} (100%) rename python/cugraph-pyg/cugraph_pyg/tests/{mg/test_mg_cugraph_store.py => data/test_dask_graph_store_mg.py} (100%) rename python/cugraph-pyg/cugraph_pyg/tests/{test_cugraph_loader.py => loader/test_dask_neighbor_loader.py} (100%) rename python/cugraph-pyg/cugraph_pyg/tests/{mg/test_mg_cugraph_loader.py => loader/test_dask_neighbor_loader_mg.py} (100%) rename python/cugraph-pyg/cugraph_pyg/tests/{test_cugraph_sampler.py => sampler/test_sampler_utils.py} (96%) rename python/cugraph-pyg/cugraph_pyg/tests/{mg/test_mg_cugraph_sampler.py => sampler/test_sampler_utils_mg.py} (99%) diff --git a/python/cugraph-pyg/cugraph_pyg/tests/test_cugraph_store.py b/python/cugraph-pyg/cugraph_pyg/tests/data/test_dask_graph_store.py similarity index 100% rename from python/cugraph-pyg/cugraph_pyg/tests/test_cugraph_store.py rename to python/cugraph-pyg/cugraph_pyg/tests/data/test_dask_graph_store.py diff --git a/python/cugraph-pyg/cugraph_pyg/tests/mg/test_mg_cugraph_store.py b/python/cugraph-pyg/cugraph_pyg/tests/data/test_dask_graph_store_mg.py similarity index 100% rename from python/cugraph-pyg/cugraph_pyg/tests/mg/test_mg_cugraph_store.py rename to python/cugraph-pyg/cugraph_pyg/tests/data/test_dask_graph_store_mg.py diff --git a/python/cugraph-pyg/cugraph_pyg/tests/test_cugraph_loader.py b/python/cugraph-pyg/cugraph_pyg/tests/loader/test_dask_neighbor_loader.py similarity index 100% rename from python/cugraph-pyg/cugraph_pyg/tests/test_cugraph_loader.py rename to python/cugraph-pyg/cugraph_pyg/tests/loader/test_dask_neighbor_loader.py diff --git a/python/cugraph-pyg/cugraph_pyg/tests/mg/test_mg_cugraph_loader.py b/python/cugraph-pyg/cugraph_pyg/tests/loader/test_dask_neighbor_loader_mg.py similarity index 100% rename from python/cugraph-pyg/cugraph_pyg/tests/mg/test_mg_cugraph_loader.py rename to python/cugraph-pyg/cugraph_pyg/tests/loader/test_dask_neighbor_loader_mg.py diff --git a/python/cugraph-pyg/cugraph_pyg/tests/test_cugraph_sampler.py b/python/cugraph-pyg/cugraph_pyg/tests/sampler/test_sampler_utils.py similarity index 96% rename from python/cugraph-pyg/cugraph_pyg/tests/test_cugraph_sampler.py rename to python/cugraph-pyg/cugraph_pyg/tests/sampler/test_sampler_utils.py index 772bc5ebfa2..913928e4dd0 100644 --- a/python/cugraph-pyg/cugraph_pyg/tests/test_cugraph_sampler.py +++ b/python/cugraph-pyg/cugraph_pyg/tests/sampler/test_sampler_utils.py @@ -17,7 +17,7 @@ import pytest from cugraph_pyg.data import DaskGraphStore -from cugraph_pyg.sampler.cugraph_sampler import ( +from cugraph_pyg.sampler.sampler_utils import ( _sampler_output_from_sampling_results_heterogeneous, ) @@ -191,9 +191,3 @@ def test_neighbor_sample_mock_sampling_results(abc_graph): assert out.num_sampled_edges[("A", "ab", "B")].tolist() == [3, 0, 1, 0] assert out.num_sampled_edges[("B", "ba", "A")].tolist() == [0, 1, 0, 1] assert out.num_sampled_edges[("B", "bc", "C")].tolist() == [0, 2, 0, 2] - - -@pytest.mark.skipif(isinstance(torch, MissingModule), reason="torch not available") -@pytest.mark.skip("needs to be written") -def test_neighbor_sample_renumbered(): - pass diff --git a/python/cugraph-pyg/cugraph_pyg/tests/mg/test_mg_cugraph_sampler.py b/python/cugraph-pyg/cugraph_pyg/tests/sampler/test_sampler_utils_mg.py similarity index 99% rename from python/cugraph-pyg/cugraph_pyg/tests/mg/test_mg_cugraph_sampler.py rename to python/cugraph-pyg/cugraph_pyg/tests/sampler/test_sampler_utils_mg.py index 89fcde5a278..fb6ff65422f 100644 --- a/python/cugraph-pyg/cugraph_pyg/tests/mg/test_mg_cugraph_sampler.py +++ b/python/cugraph-pyg/cugraph_pyg/tests/sampler/test_sampler_utils_mg.py @@ -17,7 +17,7 @@ import pytest from cugraph_pyg.data import DaskGraphStore -from cugraph_pyg.sampler.cugraph_sampler import ( +from cugraph_pyg.sampler.sampler_utils import ( _sampler_output_from_sampling_results_heterogeneous, )