Enable common verbosity arguments for pytest (#2647)

* Enable common arguments for pytest

* Store pytest verbosity args in common file

* Fix typos in script

* Linting

* Exception for license check

* Include pytest args file in conda-recipe testing

* Change entry point to pass args to sklearn tests

Author: Alexsandruss

.ci/scripts/run_sklearn_tests.py

@@ -49,7 +49,6 @@
         os.environ["SCIPY_ARRAY_API"] = "1"
 
     pytest_args = (
-        "--verbose --durations=100 --durations-min=0.01 "
         f"--rootdir={sklearn_file_dir} "
         f'{os.environ["DESELECTED_TESTS"]} {os.environ["SELECTED_TESTS"]}'.split(" ")
     )

.ci/scripts/run_sklearn_tests.sh

@@ -48,5 +48,5 @@ if [ -n "$(pip list | grep dpctl)" ]; then
     python -c "import dpctl; print(dpctl.get_devices())"
 fi
 
-python scripts/run_sklearn_tests.py -d ${1:-none}
+python scripts/run_sklearn_tests.py -d ${1:-none} $(cat ../.pytest-verbosity-args)
 exit $?

.github/.licenserc.yaml

@@ -42,6 +42,8 @@ header:
     # Clang-format configs
     - '.clang-format'
     - '_clang-format'
+    # pytest arguments
+    - .pytest-verbosity-args
     # All .csv and .ipynb files
     - '**/*.csv'
     - '**/*.ipynb'

.pytest-verbosity-args

@@ -0,0 +1 @@
+--verbose --durations=100 --durations-min=0.05

conda-recipe/meta.yaml

@@ -95,6 +95,7 @@ test:
     - array-api-strict
   source_files:
     - .ci
+    - .pytest-verbosity-args
     - examples
     - tests
 

conda-recipe/run_test.bat

@@ -33,6 +33,7 @@ if "%PYTHON%"=="python" (
 %PYTHON% -c "from sklearnex import patch_sklearn; patch_sklearn()" || set exitcode=1
 
 set "PYTEST_ARGS= "
+set /p PYTEST_VERBOSITY_ARGS=<"%1.pytest-verbosity-args"
 
 IF DEFINED COVERAGE_RCFILE (set "PYTEST_ARGS=--cov=onedal --cov=sklearnex --cov-config=%COVERAGE_RCFILE% --cov-append --cov-branch --cov-report= %PYTEST_ARGS%")
 
@@ -47,19 +48,19 @@ if "%~2"=="--json-report" (
 
 echo "NO_DIST=%NO_DIST%"
 setlocal enabledelayedexpansion
-pytest --verbose -s "%1tests" %PYTEST_ARGS:FILENAME=legacy_report% || set exitcode=1
-pytest --verbose --pyargs daal4py %PYTEST_ARGS:FILENAME=daal4py_report% || set exitcode=1
-pytest --verbose --pyargs sklearnex %PYTEST_ARGS:FILENAME=sklearnex_report% || set exitcode=1
-pytest --verbose --pyargs onedal %PYTEST_ARGS:FILENAME=onedal_report% || set exitcode=1
-pytest --verbose "%1.ci\scripts\test_global_patch.py" %PYTEST_ARGS:FILENAME=global_patching_report% || set exitcode=1
+pytest %PYTEST_VERBOSITY_ARGS% -s "%1tests" %PYTEST_ARGS:FILENAME=legacy_report% || set exitcode=1
+pytest %PYTEST_VERBOSITY_ARGS% --pyargs daal4py %PYTEST_ARGS:FILENAME=daal4py_report% || set exitcode=1
+pytest %PYTEST_VERBOSITY_ARGS% --pyargs sklearnex %PYTEST_ARGS:FILENAME=sklearnex_report% || set exitcode=1
+pytest %PYTEST_VERBOSITY_ARGS% --pyargs onedal %PYTEST_ARGS:FILENAME=onedal_report% || set exitcode=1
+pytest %PYTEST_VERBOSITY_ARGS% "%1.ci\scripts\test_global_patch.py" %PYTEST_ARGS:FILENAME=global_patching_report% || set exitcode=1
 if NOT "%NO_DIST%"=="1" (
     %PYTHON% "%1tests\helper_mpi_tests.py"^
-        pytest -k spmd --with-mpi --verbose -s --pyargs sklearnex %PYTEST_ARGS:FILENAME=sklearnex_spmd%
+        pytest -k spmd --with-mpi %PYTEST_VERBOSITY_ARGS% -s --pyargs sklearnex %PYTEST_ARGS:FILENAME=sklearnex_spmd%
     if !errorlevel! NEQ 0 (
         set exitcode=1
     )
     %PYTHON% "%1tests\helper_mpi_tests.py"^
-        pytest --with-mpi --verbose -s "%1tests\test_daal4py_spmd_examples.py" %PYTEST_ARGS:FILENAME=mpi_legacy%
+        pytest --with-mpi %PYTEST_VERBOSITY_ARGS% -s "%1tests\test_daal4py_spmd_examples.py" %PYTEST_ARGS:FILENAME=mpi_legacy%
     if !errorlevel! NEQ 0 (
         set exitcode=1
     )

conda-recipe/run_test.sh

@@ -60,22 +60,24 @@ function generate_pytest_args {
     printf -- "${ARGS[*]}"
 }
 
+PYTEST_VERBOSITY_ARGS=$(cat "${sklex_root}/.pytest-verbosity-args")
+
 ${PYTHON} -c "from sklearnex import patch_sklearn; patch_sklearn()"
 return_code=$(($return_code + $?))
 
-pytest --verbose -s "${sklex_root}/tests" $@ $(generate_pytest_args legacy)
+pytest ${PYTEST_VERBOSITY_ARGS} -s "${sklex_root}/tests" $@ $(generate_pytest_args legacy)
 return_code=$(($return_code + $?))
 
-pytest --verbose --pyargs daal4py $@ $(generate_pytest_args daal4py)
+pytest ${PYTEST_VERBOSITY_ARGS} --pyargs daal4py $@ $(generate_pytest_args daal4py)
 return_code=$(($return_code + $?))
 
-pytest --verbose --pyargs sklearnex $@ $(generate_pytest_args sklearnex)
+pytest ${PYTEST_VERBOSITY_ARGS} --pyargs sklearnex $@ $(generate_pytest_args sklearnex)
 return_code=$(($return_code + $?))
 
-pytest --verbose --pyargs onedal $@ $(generate_pytest_args onedal)
+pytest ${PYTEST_VERBOSITY_ARGS} --pyargs onedal $@ $(generate_pytest_args onedal)
 return_code=$(($return_code + $?))
 
-pytest --verbose -s "${sklex_root}/.ci/scripts/test_global_patch.py" $@ $(generate_pytest_args global_patching)
+pytest ${PYTEST_VERBOSITY_ARGS} -s "${sklex_root}/.ci/scripts/test_global_patch.py" $@ $(generate_pytest_args global_patching)
 return_code=$(($return_code + $?))
 
 echo "NO_DIST=$NO_DIST"
@@ -90,10 +92,10 @@ if [[ ! $NO_DIST ]]; then
         export EXTRA_MPI_ARGS="-n 4"
     fi
     mpirun ${EXTRA_MPI_ARGS} python "${sklex_root}/tests/helper_mpi_tests.py" \
-        pytest -k spmd --with-mpi --verbose --pyargs sklearnex $@ $(generate_pytest_args sklearnex_spmd)
+        pytest -k spmd --with-mpi ${PYTEST_VERBOSITY_ARGS} --pyargs sklearnex $@ $(generate_pytest_args sklearnex_spmd)
     return_code=$(($return_code + $?))
     mpirun ${EXTRA_MPI_ARGS} python "${sklex_root}/tests/helper_mpi_tests.py" \
-        pytest --verbose -s "${sklex_root}/tests/test_daal4py_spmd_examples.py" $@ $(generate_pytest_args mpi_legacy)
+        pytest ${PYTEST_VERBOSITY_ARGS} -s "${sklex_root}/tests/test_daal4py_spmd_examples.py" $@ $(generate_pytest_args mpi_legacy)
     return_code=$(($return_code + $?))
 fi