Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions ci/run_cuml_accel_integration_pytests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
# Copyright (c) 2025, NVIDIA CORPORATION.

# Support invoking run_cuml_singlegpu_pytests.sh outside the script directory
cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../python/cuml/cuml/tests

python -m pytest -p cudf.pandas -p cuml.experimental.accel --cache-clear "$@" experimental/accel/
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the cuml.accel tests in run_cuml_singlegpu_accel_pytests.sh we cd into the experimental/accel directory. Can we keep it consistent? Not sure but maybe it effects the paths we see in the logs?

18 changes: 15 additions & 3 deletions ci/test_python_integration.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2024, NVIDIA CORPORATION.
# Copyright (c) 2024-2025, NVIDIA CORPORATION.

# Support invoking test_python_singlegpu.sh outside the script directory
cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
Expand All @@ -11,15 +11,27 @@ EXITCODE=0
trap "EXITCODE=1" ERR
set +e

rapids-logger "pytest cuml integration"
rapids-logger "pytest cuml integration with cudf.pandas"
./ci/run_cuml_integration_pytests.sh \
--numprocesses=8 \
--dist=worksteal \
--junitxml="${RAPIDS_TESTS_DIR}/junit-cuml.xml" \
--cov-config=../../.coveragerc \
--cov=cuml \
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuml-coverage.xml" \
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuml-integ-coverage.xml" \
--cov-report=term

rapids-logger "pytest cuml.accel integration with cudf.pandas"

./ci/run_cuml_accel_integration_pytests.sh \
--numprocesses=8 \
--dist=worksteal \
--junitxml="${RAPIDS_TESTS_DIR}/junit-cuml.xml" \
--cov-config=../../.coveragerc \
--cov=cuml \
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuml-accel-integ-coverage.xml" \
--cov-report=term
Comment thread
betatim marked this conversation as resolved.


rapids-logger "Test script exiting with value: $EXITCODE"
exit ${EXITCODE}
23 changes: 18 additions & 5 deletions python/cuml/cuml/experimental/accel/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
import runpy
import sys

from cuml.internals import logger

from . import install


@click.command()
@click.option("-m", "module", required=False, help="Module to run")
Expand Down Expand Up @@ -54,8 +50,25 @@
count=True,
help="Increase output verbosity (can be used multiple times, e.g. -vv). Default shows warnings only.",
)
@click.option(
"--cudf-pandas",
is_flag=True,
default=False,
help="Turn on cudf.pandas alongside cuml.accel.",
)
@click.argument("args", nargs=-1)
def main(module, convert_to_sklearn, format, output, verbose, args):
def main(
module, convert_to_sklearn, format, output, verbose, cudf_pandas, args
):
if cudf_pandas:
import cudf.pandas

cudf.pandas.install()

# avoid importing cuML before cuDF.pandas
from cuml.internals import logger
from . import install

default_logger_level_index = list(logger.level_enum).index(
logger.level_enum.warn
)
Expand Down