Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enables MG python tests using a single-GPU LocalCUDACluster in CI #3596

Merged
merged 7 commits into from
May 27, 2023
Merged

Enables MG python tests using a single-GPU LocalCUDACluster in CI #3596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
867a2b0
Adds options for testing dask MG code paths using a LocalCUDACluster …
rlratzel May 20, 2023
ddd23f5
Merge remote-tracking branch 'upstream/branch-23.06' into branch-23.0…
rlratzel May 20, 2023
3c41371
Adds missing dask_client fixtures to tests that assumed a cluster was…
rlratzel May 24, 2023
3c8f71f
Merge remote-tracking branch 'upstream/branch-23.06' into branch-23.0…
rlratzel May 24, 2023
63a0c82
Merge remote-tracking branch 'upstream/branch-23.06' into branch-23.0…
rlratzel May 26, 2023
f49a049
Merge remote-tracking branch 'upstream/branch-23.06' into branch-23.0…
rlratzel May 27, 2023
c523f46
Added verbose flag to pytest to assist with identifying test hang.
rlratzel May 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ci/test_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ popd

rapids-logger "pytest cugraph"
pushd python/cugraph/cugraph
export DASK_WORKER_DEVICES="0"
pytest \
-m sg \
-v \
--cache-clear \
--junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph.xml" \
--cov-config=../../.coveragerc \
Expand Down
2 changes: 2 additions & 0 deletions python/cugraph/cugraph/tests/data_store/test_property_graph_mg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from cudf.testing import assert_frame_equal, assert_series_equal
from cupy.testing import assert_array_equal
from pylibcugraph.testing.utils import gen_fixture_params_product
from cugraph.dask.common.mg_utils import is_single_gpu

import cugraph.dask as dcg
from cugraph.experimental.datasets import cyber
Expand Down Expand Up @@ -991,6 +992,7 @@ def test_renumber_vertices_edges_dtypes(dask_client):


@pytest.mark.mg
@pytest.mark.skipif(is_single_gpu(), reason="FIXME: MG test fails on single-GPU")
@pytest.mark.parametrize("set_index", [True, False])
def test_add_data_noncontiguous(dask_client, set_index):
from cugraph.experimental import MGPropertyGraph
Expand Down
4 changes: 1 addition & 3 deletions python/cugraph/cugraph/tests/link_prediction/test_jaccard_mg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import pytest
import dask_cudf
from pylibcugraph.testing import gen_fixture_params_product
from cugraph.dask.common.mg_utils import is_single_gpu
import cugraph.dask as dcg
import cugraph
from cugraph.testing import utils
Expand Down Expand Up @@ -119,7 +118,6 @@ def input_expected_output(input_combo):


@pytest.mark.mg
@pytest.mark.skipif(is_single_gpu(), reason="skipping MG testing on Single GPU system")
def test_dask_jaccard(dask_client, benchmark, input_expected_output):

dg = input_expected_output["MGGraph"]
Expand Down Expand Up @@ -155,7 +153,7 @@ def test_dask_jaccard(dask_client, benchmark, input_expected_output):


@pytest.mark.mg
def test_dask_weighted_jaccard():
def test_dask_weighted_jaccard(dask_client):
input_data_path = datasets[0]
chunksize = dcg.get_chunksize(input_data_path)
ddf = dask_cudf.read_csv(
Expand Down
2 changes: 1 addition & 1 deletion python/cugraph/cugraph/tests/link_prediction/test_sorensen_mg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def test_dask_sorensen(dask_client, benchmark, input_expected_output):


@pytest.mark.mg
def test_dask_weighted_sorensen():
def test_dask_weighted_sorensen(dask_client):
input_data_path = datasets[0]
chunksize = dcg.get_chunksize(input_data_path)
ddf = dask_cudf.read_csv(
Expand Down
3 changes: 3 additions & 0 deletions python/cugraph/cugraph/tests/sampling/test_uniform_neighbor_sample_mg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import cudf
import dask_cudf
from pylibcugraph.testing.utils import gen_fixture_params_product
from cugraph.dask.common.mg_utils import is_single_gpu

import cugraph.dask as dcg
import cugraph
Expand Down Expand Up @@ -261,6 +262,7 @@ def test_mg_uniform_neighbor_sample_tree(dask_client, directed):


@pytest.mark.mg
@pytest.mark.skipif(is_single_gpu(), reason="FIXME: MG test fails on single-GPU")
@pytest.mark.cugraph_ops
def test_mg_uniform_neighbor_sample_unweighted(dask_client):
df = cudf.DataFrame(
Expand Down Expand Up @@ -295,6 +297,7 @@ def test_mg_uniform_neighbor_sample_unweighted(dask_client):


@pytest.mark.mg
@pytest.mark.skipif(is_single_gpu(), reason="FIXME: MG test fails on single-GPU")
@pytest.mark.cugraph_ops
def test_mg_uniform_neighbor_sample_ensure_no_duplicates(dask_client):
# See issue #2760
Expand Down