Skip to content

Commit

Permalink
Merge branch 'oneapi-src:main' into dhanus/xcp
Browse files Browse the repository at this point in the history
  • Loading branch information
DhanusML committed Sep 23, 2024
2 parents 9617b65 + a4e440b commit 988389d
Show file tree
Hide file tree
Showing 27 changed files with 894 additions and 88 deletions.
2 changes: 1 addition & 1 deletion .ci/pipeline/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ jobs:
conda activate CB
source $(Pipeline.Workspace)/daal/latest/env/vars.sh
./sklearnex/conda-recipe/run_test.sh
timeoutInMinutes: 15
timeoutInMinutes: 20
displayName: sklearnex test
- script: |
source /usr/share/miniconda/etc/profile.d/conda.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Documentation owners and reviewers
/docs/ @Vika-F @maria-Petrova @Alexsandruss @bdmoore1
*.md @Vika-F @maria-Petrova @Alexsandruss @bdmoore1
/docs/ @Vika-F @maria-Petrova @Alexsandruss @emmwalsh
*.md @Vika-F @maria-Petrova @Alexsandruss @emmwalsh

# TTP files
third-party* @maria-Petrova
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/label-enforcement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ on:
pull_request:
branches: [ "main" ]

permissions:
contents: read

jobs:
label_checker:
name: Please include labels on your pull request
Expand Down
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ editorconfig-checker

For your convenience we also added [coding guidelines](http://oneapi-src.github.io/oneDAL/contribution/coding_guide.html) with examples and detailed descriptions of the coding style oneDAL follows. We encourage you to consult them when writing your code.

## Custom Components

### Threading Layer

In the source code of the algorithms, oneDAL does not use threading primitives directly. All the threading primitives used within oneDAL form are called the [threading layer](http://oneapi-src.github.io/oneDAL/contribution/threading.html). Contributors should leverage the primitives from the layer to implement parallel algorithms.

## Documentation Guidelines

oneDAL uses `Doxygen` for inline comments in public header files that are used to build the API reference and `reStructuredText` for the Developer Guide. See [oneDAL documentation](https://oneapi-src.github.io/oneDAL/) for reference.
Expand Down
6 changes: 3 additions & 3 deletions cpp/daal/src/threading/threading.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ DAAL_EXPORT size_t _setNumberOfThreads(const size_t numThreads, void ** globalCo
return 1;
}

DAAL_EXPORT void _daal_threader_for(int n, int threads_request, const void * a, daal::functype func)
DAAL_EXPORT void _daal_threader_for(int n, int reserved, const void * a, daal::functype func)
{
if (daal::threader_env()->getNumberOfThreads() > 1)
{
Expand Down Expand Up @@ -160,7 +160,7 @@ DAAL_EXPORT void _daal_threader_for_blocked_size(size_t n, size_t block, const v
}
}

DAAL_EXPORT void _daal_threader_for_simple(int n, int threads_request, const void * a, daal::functype func)
DAAL_EXPORT void _daal_threader_for_simple(int n, int reserved, const void * a, daal::functype func)
{
if (daal::threader_env()->getNumberOfThreads() > 1)
{
Expand Down Expand Up @@ -318,7 +318,7 @@ DAAL_PARALLEL_SORT_IMPL(daal::IdxValType<double>, pair_fp64_uint64)

#undef DAAL_PARALLEL_SORT_IMPL

DAAL_EXPORT void _daal_threader_for_blocked(int n, int threads_request, const void * a, daal::functype2 func)
DAAL_EXPORT void _daal_threader_for_blocked(int n, int reserved, const void * a, daal::functype2 func)
{
if (daal::threader_env()->getNumberOfThreads() > 1)
{
Expand Down
Loading

0 comments on commit 988389d

Please sign in to comment.