Skip to content

Commit

Permalink
Enable temporarily disabled MG tests (#3837)
Browse files Browse the repository at this point in the history
Enable TEMPORARILY disable single-GPU "MG" tests
And Skip deleting copied Dataframe while creating distributed graph from cudf edge-lists.
Ideally we would like to merger this PR once the [issue 3790](#3790) is closed, but me  might need to merger it if the issue is not resolved before the next release.

Authors:
  - Naim (https://github.com/naimnv)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: #3837
  • Loading branch information
naimnv authored Sep 26, 2023
1 parent b199bf0 commit 8b02e24
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 1 addition & 5 deletions ci/test_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ pytest \
tests
popd

# FIXME: TEMPORARILY disable single-GPU "MG" testing until
# https://github.com/rapidsai/cugraph/issues/3790 is closed
# When closed, replace -k "not _mg" with
# -k "not test_property_graph_mg" \
rapids-logger "pytest cugraph"
pushd python/cugraph/cugraph
export DASK_WORKER_DEVICES="0"
Expand All @@ -79,7 +75,7 @@ pytest \
--cov=cugraph \
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-coverage.xml" \
--cov-report=term \
-k "not _mg" \
-k "not test_property_graph_mg" \
tests
popd

Expand Down
4 changes: 1 addition & 3 deletions ci/test_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@ arch=$(uname -m)
if [[ "${arch}" == "aarch64" && ${RAPIDS_BUILD_TYPE} == "pull-request" ]]; then
python ./ci/wheel_smoke_test_${package_name}.py
else
# FIXME: TEMPORARILY disable single-GPU "MG" testing until
# https://github.com/rapidsai/cugraph/issues/3790 is closed
RAPIDS_DATASET_ROOT_DIR=`pwd`/datasets python -m pytest -k "not _mg" ./python/${package_name}/${package_name}/tests
RAPIDS_DATASET_ROOT_DIR=`pwd`/datasets python -m pytest ./python/${package_name}/${package_name}/tests
fi
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import gc
from typing import Union
import warnings
import random

import cudf
import cupy as cp
Expand Down Expand Up @@ -182,7 +183,9 @@ def __from_edgelist(
# Repartition to 2 partitions per GPU for memory efficient process
input_ddf = input_ddf.repartition(npartitions=len(workers) * 2)
# FIXME: Make a copy of the input ddf before implicitly altering it.
input_ddf = input_ddf.map_partitions(lambda df: df.copy())
input_ddf = input_ddf.map_partitions(
lambda df: df.copy(), token="custom-" + str(random.random())
)
# The dataframe will be symmetrized iff the graph is undirected
# otherwise, the inital dataframe will be returned
if edge_attr is not None:
Expand Down
5 changes: 4 additions & 1 deletion python/cugraph/cugraph/tests/traversal/test_bfs_mg.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# limitations under the License.

import gc
import random

import pytest

Expand Down Expand Up @@ -61,7 +62,9 @@ def modify_dataset(df):
return cudf.concat([df, temp_df])

meta = ddf._meta
ddf = ddf.map_partitions(modify_dataset, meta=meta)
ddf = ddf.map_partitions(
modify_dataset, meta=meta, token="custom-" + str(random.random())
)

df = cudf.read_csv(
input_data_path,
Expand Down

0 comments on commit 8b02e24

Please sign in to comment.