Skip to content

Commit

Permalink
Merge branch 'uxlfoundation:main' into dev/remove_convert_to_supported
Browse files Browse the repository at this point in the history
  • Loading branch information
icfaust authored Dec 12, 2024
2 parents 764cd7a + 7743060 commit d1bd343
Show file tree
Hide file tree
Showing 62 changed files with 1,521 additions and 915 deletions.
11 changes: 0 additions & 11 deletions .ci/scripts/install_windows.bat

This file was deleted.

69 changes: 69 additions & 0 deletions .github/.licenserc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Copyright contributors to the oneDAL project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

header:
license:
spdx-id: Apache-2.0
copyright-owner: contributors to the oneDAL project
pattern: |
(Copyright \d{4} Intel Corporation|Copyright contributors to the oneDAL project|Copyright \d{4} Fujitsu Limited)
Licensed under the Apache License, Version 2\.0 \(the "License"\);
you may not use this file except in compliance with the License\.
You may obtain a copy of the License at
http:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.
See the License for the specific language governing permissions and
limitations under the License\.
paths:
- '**'

paths-ignore:
- '.gitignore'
- '.gitattributes'
# Empty __init__.py files
- 'daal4py/sklearn/monkeypatch/__init__.py'
- 'generator/__init__.py'
# Clang-format configs
- '.clang-format'
- '_clang-format'
# All .csv and .ipynb files
- '**/*.csv'
- '**/*.ipynb'
# Something in doc/
- 'doc/daal4py/_static/style.css'
- 'doc/daal4py/_templates/layout.html'
- 'doc/sources/_static/style.css'
- 'doc/sources/_templates/footer.html'
- 'doc/sources/_templates/layout.html'
- 'doc/daal4py/third-party-programs.txt'
- 'doc/third-party-programs-sklearnex.txt'
# requirements
- 'dependencies-dev'
- 'requirements*.txt'
# Some files from .ci/.github
- '.github/CODEOWNERS'
- '.github/Pull_Request_template.md'
- '.github/renovate.json'
# Specific files
- 'setup.cfg'
- 'LICENSE'

comment: never

license-location-threshold: 80 # specifies the index threshold where the license header can be located.
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/-bug_report.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
<!--
~ Copyright 2020 Intel Corporation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

---
name: " Bug_report"
about: Create a report to help us improve
Expand Down
16 changes: 16 additions & 0 deletions .github/issue_template/Bug_report.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
<!--
~ Copyright 2020 Intel Corporation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

---
name: Bug report
about: Create a report to help us improve
Expand Down
25 changes: 15 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,16 @@ jobs:
export COVERAGE_FILE=$(pwd)/.coverage.sklearn
if [ "${{ steps.set-env.outputs.DPCFLAG }}" == "" ]; then export CPU=cpu; fi
bash .ci/scripts/run_sklearn_tests.sh $CPU
- name: Archive coverage data
- name: Create coverage report
run: |
source venv/bin/activate
coverage combine .coverage.sklearnex .coverage.sklearn
coverage json -o coverage.lnx${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}.json
- name: Archive coverage report
uses: actions/upload-artifact@v4
with:
name: coverage_lnx_Py${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}
path: |
.coverage.sklearn
.coverage.sklearnex
include-hidden-files: true
path: coverage.lnx${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}.json
- name: Sklearn testing [preview]
run: |
source venv/bin/activate
Expand Down Expand Up @@ -282,14 +284,17 @@ jobs:
set COVERAGE_FILE=%cd%\.coverage.sklearn
if "${{ steps.set-env.outputs.DPCFLAG }}"=="" set CPU=cpu
bash .ci/scripts/run_sklearn_tests.sh %CPU%
- name: Archive coverage data
- name: Create coverage report
shell: cmd
run: |
call .\venv\Scripts\activate.bat
coverage combine .coverage.sklearnex .coverage.sklearn
coverage json -o coverage.win${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}.json
- name: Archive coverage report
uses: actions/upload-artifact@v4
with:
name: coverage_win_Py${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}
path: |
.coverage.sklearn
.coverage.sklearnex
include-hidden-files: true
path: coverage.win${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}.json
- name: Sklearn testing [preview]
shell: cmd
run: |
Expand Down
58 changes: 58 additions & 0 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#===============================================================================
# Copyright contributors to the oneDAL project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#===============================================================================

name: codecov
on:
workflow_run:
workflows: [CI]
types:
- completed

permissions: read-all

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name }}-${{ github.event.number || github.sha }}
cancel-in-progress: true

jobs:
upload_coverage:
name: Codecov
runs-on: ubuntu-24.04
if: ${{ github.repository == 'uxlfoundation/scikit-learn-intelex' && github.event.workflow_run.conclusion == 'success' }}
timeout-minutes: 5

steps:
- name: Checkout Scikit-learn-intelex
uses: actions/checkout@v4
- name: Download artifacts
uses: actions/download-artifact@v4
with:
path: coverage
github-token: ${{ github.token }}
run-id: ${{ github.event.workflow_run.id }}
merge-multiple: true
- name: Install codecov cli
run: |
curl -Os https://cli.codecov.io/latest/linux/codecov
chmod +x codecov
- name: Upload to codecov
run: |
export PR=${{ github.event.workflow_run.pull_requests[0].number }}
export SHA=${{ github.event.workflow_run.head_sha }}
export VARARGS="-n github"
# if a PR, pass proper information to codecov about SHA and PR, otherwise use main branch info
if [ -n "${PR}" ]; then export VARARGS="${VARARGS}-${PR}-${SHA} -P ${PR} -C ${SHA}"; fi
./codecov -v upload-process -Z -t ${{ secrets.CODECOV_TOKEN }} $VARARGS -F github -s ./coverage
16 changes: 16 additions & 0 deletions .github/workflows/renovate-validation.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
#===============================================================================
# Copyright 2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#===============================================================================

name: renovate-validation

on:
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/skywalking-eyes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Copyright contributors to the oneDAL project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Check License Header

on:
pull_request:
branches:
- main
- rls/*
push:
branches:
- main
- rls/*

permissions: read-all

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name }}-${{ github.event.number || github.sha }}
cancel-in-progress: true

jobs:
check-license-header:
name: Copyright Check
if: github.event.repository.fork == false
runs-on: ubuntu-24.04
steps:
- name: "Checkout code"
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: "Run check"
uses: apache/skywalking-eyes/header@cd7b195c51fd3d6ad52afceb760719ddc6b3ee91 # v0.6.0
with:
config: ".github/.licenserc.yaml"
mode: "check"
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ daal4py.egg-info
**/.ipynb_checkpoints
doc/_build
doc/sources/samples/*.ipynb
doc/daal4py/_build/
*.obj
*.pyd
build_oneapi_backend
Expand All @@ -34,3 +35,7 @@ tests/_results*

# json reports from pytest
.pytest_reports/*

# Configurations from file explorers
.directory
.DS_Store
16 changes: 16 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
<!--
~ Copyright 2019 Intel Corporation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

# Contributor Covenant Code of Conduct

## Our Pledge
Expand Down
26 changes: 21 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
<!--
~ Copyright 2018 Intel Corporation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<div align="center">


# Intel(R) Extension for Scikit-learn*
# Intel(R) Extension for Scikit-learn*

<h3> Speed up your scikit-learn applications for Intel(R) CPUs and GPUs across single- and multi-node configurations

Expand Down Expand Up @@ -35,7 +51,7 @@ With Intel(R) Extension for Scikit-learn, you can:
* Continue to use the open-source scikit-learn API
* Enable and disable the extension with a couple of lines of code or at the command line

Intel(R) Extension for Scikit-learn is also a part of [Intel(R) AI Tools](https://www.intel.com/content/www/us/en/developer/tools/oneapi/ai-analytics-toolkit.html).
Intel(R) Extension for Scikit-learn is also a part of [Intel(R) AI Tools](https://www.intel.com/content/www/us/en/developer/tools/oneapi/ai-analytics-toolkit.html).

## Acceleration

Expand Down Expand Up @@ -91,7 +107,7 @@ See all installation instructions in the [Installation Guide](https://uxlfoundat
The software acceleration is achieved through patching. It means, replacing the stock scikit-learn algorithms with their optimized versions provided by the extension.

The patching only affects [supported algorithms and their parameters](https://uxlfoundation.github.io/scikit-learn-intelex/latest/algorithms.html).
You can still use not supported ones in your code, the package simply fallbacks into the stock version of scikit-learn.
You can still use not supported ones in your code, the package simply fallbacks into the stock version of scikit-learn.

> **_TIP:_** Enable [verbose mode](https://uxlfoundation.github.io/scikit-learn-intelex/latest/verbose.html) to see which implementation of the algorithm is currently used.

Expand All @@ -106,7 +122,7 @@ To patch scikit-learn, you can:
patch_sklearn()
```
:eyes: Read about [other ways to patch scikit-learn](https://uxlfoundation.github.io/scikit-learn-intelex/index.html#usage).
:eyes: Read about [other ways to patch scikit-learn](https://uxlfoundation.github.io/scikit-learn-intelex/index.html#usage).
## Documentation
Expand Down Expand Up @@ -134,5 +150,5 @@ The acceleration is achieved through the use of the Intel(R) oneAPI Data Analyti
We welcome community contributions, check our [Contributing Guidelines](https://github.com/uxlfoundation/scikit-learn-intelex/blob/master/CONTRIBUTING.md) to learn more.
------------------------------------------------------------------------
\* The Intel logo, and other Intel marks are trademarks of Intel Corporation or its subsidiaries. Other names and brands may be claimed as the property of others.
\* The Intel logo, and other Intel marks are trademarks of Intel Corporation or its subsidiaries. Other names and brands may be claimed as the property of others.
Loading

0 comments on commit d1bd343

Please sign in to comment.