Skip to content
Merged
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
13 changes: 0 additions & 13 deletions .ci/pipeline/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,26 +76,13 @@ jobs:
export LD_LIBRARY_PATH=$(dirname $(dirname $(which python)))/lib:$LD_LIBRARY_PATH
./conda-recipe/build.sh
displayName: 'Build daal4py/sklearnex'
- script: |
export LD_LIBRARY_PATH=$(dirname $(dirname $(which python)))/lib:$LD_LIBRARY_PATH
cd doc/daal4py
make html 2>&1 | tee build.log
cat build.log
# check for autodoc warnings
if grep -i "autodoc" build.log; then
echo "Autodoc Warnings detected, build failed!"
exit 1
fi
displayName: 'Build daal4py documentation'
- script: |
export LD_LIBRARY_PATH=$(dirname $(dirname $(which python)))/lib:$LD_LIBRARY_PATH
cd doc
./build-doc.sh
displayName: 'Build scikit-learn-intelex documentation'
- script: |
mkdir $(Build.ArtifactStagingDirectory)/html/daal4py
mkdir $(Build.ArtifactStagingDirectory)/html/sklearnex
cp -R doc/daal4py/_build $(Build.ArtifactStagingDirectory)/html_daal4py
cp -R doc/_build $(Build.ArtifactStagingDirectory)/html_sklearnex
displayName: 'Copy build'
- task: PublishPipelineArtifact@0
Expand Down
33 changes: 2 additions & 31 deletions daal4py/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# daal4py - A Convenient Python API to the oneAPI Data Analytics Library
[![Build Status](https://dev.azure.com/daal/daal4py/_apis/build/status/CI?branchName=main)](https://dev.azure.com/daal/daal4py/_build/latest?definitionId=9&branchName=main)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/21716/badge.svg)](https://scan.coverity.com/projects/daal4py)
[![Join the community on GitHub Discussions](https://badgen.net/badge/join%20the%20discussion/on%20github/black?icon=github)](https://github.com/IntelPython/daal4py/discussions)
[![Join the community on GitHub Discussions](https://badgen.net/badge/join%20the%20discussion/on%20github/black?icon=github)](https://github.com/uxlfoundation/scikit-learn-intelex/discussions)
[![PyPI Version](https://img.shields.io/pypi/v/daal4py)](https://pypi.org/project/daal4py/)
[![Conda Version](https://img.shields.io/conda/vn/conda-forge/daal4py)](https://anaconda.org/conda-forge/daal4py)

Expand All @@ -40,8 +40,7 @@ We publish blogs on Medium, so [follow us](https://medium.com/intel-analytics-so
- [Accelerate K-Means Clustering](https://medium.com/intel-analytics-software/accelerate-k-means-clustering-6385088788a1)

## 🔗 Important links
- [Documentation](https://intelpython.github.io/daal4py/)
- [scikit-learn API and patching](https://intelpython.github.io/daal4py/sklearn.html#sklearn)
- [Documentation](https://uxlfoundation.github.io/scikit-learn-intelex/latest/about_daal4py.html)
- [Building from Sources](https://github.com/uxlfoundation/scikit-learn-intelex/blob/main/daal4py/INSTALL.md)
- [About oneAPI Data Analytics Library](https://github.com/uxlfoundation/oneDAL)

Expand All @@ -61,34 +60,6 @@ Daal4Py is distributed as part of scikit-learn-intelex, which itself is distribu

See the [installation instructions for scikit-learn-intelex](https://github.com/uxlfoundation/scikit-learn-intelex/blob/main/INSTALL.md) for details.

⚠️ Note: *GPU and MPI support are optional dependencies.
Required dependencies for GPU and MPI support will not be downloaded.
You need to manually install `dpcpp_cpp_rt` and `dpctl` packages for GPU support, and `mpi4py` with `impi_rt` as backend package for MPI support.*

<details><summary>[Click to expand] ℹ️ How to install dpcpp_cpp_rt and impi_rt packages </summary>

```shell
# PyPi for dpcpp
pip install -U dpcpp_cpp_rt dpctl
```

```shell
# PyPi for MPI
pip install -U mpi4py impi_rt
```

```shell
# conda for dpcpp
conda install dpcpp_cpp_rt dpctl -c https://software.repos.intel.com/python/conda/
```

```shell
# conda for MPI
conda install mpi4py impi_rt -c https://software.repos.intel.com/python/conda/
```

</details>


# ⚠️ Scikit-learn patching

Expand Down
2 changes: 1 addition & 1 deletion daal4py/sklearn/monkeypatch/dispatcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def enable(name=None, verbose=True, deprecation=True, get_map=_get_map_of_algori
if verbose and deprecation and sys.stderr is not None:
sys.stderr.write(
"oneAPI Data Analytics Library solvers for sklearn enabled: "
"https://intelpython.github.io/daal4py/sklearn.html\n"
"https://uxlfoundation.github.io/scikit-learn-intelex/\n"
)


Expand Down
2 changes: 1 addition & 1 deletion deselected_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ deselected_tests:
- svm/tests/test_svm.py::test_custom_kernel_not_array_input[SVR]

# test_non_uniform_strategies fails due to differences in handling of vacuous clusters after update
# See https://github.com/IntelPython/daal4py/issues/69
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

wow, I've been through deselected tests hundreds of times and never paid attention to this. Crazy that 1 we still have references to IntelPython here, and 2 we haven't properly closed that issue.

# See https://github.com/uxlfoundation/scikit-learn-intelex/issues/69
- cluster/tests/test_k_means.py::test_kmeans_relocated_clusters >=0.24

# oneAPI Data Analytics Library (oneDAL) does not check convergence for tol == 0.0 for ease of benchmarking
Expand Down
12 changes: 0 additions & 12 deletions doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,3 @@ To build Extension for Scikit-Learn documentation locally:
5. Run the ``build-doc.sh`` script.

You will then find documentation under the `_build/html` folder.

Additional documentation for the `daal4py` module can be built with the following steps (after having installed the `scikit-learn-intelex` packages and doc dependencies):

1. Go to the `doc/daal4py` folder:

cd scikit-learn-intelex/doc/daal4py

2. Run the makefile (assuming linux):

make html

Documentation will similarly be built under `_build/html`.
23 changes: 0 additions & 23 deletions doc/daal4py/Makefile

This file was deleted.

120 changes: 0 additions & 120 deletions doc/daal4py/_static/style.css

This file was deleted.

17 changes: 0 additions & 17 deletions doc/daal4py/_templates/layout.html

This file was deleted.

Loading
Loading