Skip to content

Commit

Permalink
Merge branch 'oneapi-src:main' into dev/asolovev_workspace_mkl_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexandr-Solovev authored Oct 10, 2024
2 parents 618e8b4 + e5487b8 commit 9a9f557
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 19 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
source /opt/intel/oneapi/compiler/latest/env/vars.sh
.ci/scripts/build.sh --compiler icx --optimizations avx2 --target onedal
- name: Archive build
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v4.4.0
with:
name: __release_lnx
path: ./__release_lnx
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
call .\oneapi\compiler\latest\bin\sycl-ls.exe
call .\.ci\scripts\build.bat onedal_dpc vc avx2
- name: Archive build
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v4.4.0
with:
name: __release_win
path: .\__release_win_vc
Expand All @@ -114,12 +114,12 @@ jobs:
run: |
tar -cvzf icx.zip .\oneapi
- name: Archive DPC++
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v4.4.0
with:
name: icx_compiler
path: .\icx.zip
- name: Archive Intel OpenCL CPU runtime
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v4.4.0
with:
name: opencl_rt_installer
path: .\opencl_rt.msi
2 changes: 1 addition & 1 deletion .github/workflows/openssf-scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
persist-credentials: false

Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/pr-checklist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ name: Check PR Checklist

on:
pull_request:
types: [opened, edited, synchronize]
types: [opened, edited, synchronize, ready_for_review, converted_to_draft]

permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name }}-${{ github.event.number || github.sha }}
Expand All @@ -44,15 +47,16 @@ jobs:
});
core.setOutput('body', pr_desc.data.body)
core.setOutput('draft', pr_desc.data.draft)
core.setOutput('author_type', pr_desc.data.user.type)
- name: Check if all checkboxes are checked
id: checkboxes
env:
DESCRIPTION: ${{ steps.pr.outputs.body }}
run: |
UNCHECKED=$(echo "$DESCRIPTION" | grep -c '\[ \]' || true)
echo "unchecked=$UNCHECKED" >> $GITHUB_OUTPUT
- name: Fail if not all checkboxes are checked and PR is not draft
if: ${{ (steps.pr.outputs.draft == 'false') && (steps.checkboxes.outputs.unchecked != '0') }}
- name: Fail if not all checkboxes are checked, PR is not draft and author is not a bot
if: ${{ (steps.pr.outputs.draft == 'false') && (steps.checkboxes.outputs.unchecked != '0') && (steps.pr.outputs.author_type != 'Bot') }}
run: |
echo "Unchecked checkboxes: ${{ steps.checkboxes.outputs.unchecked }}"
exit 1
2 changes: 1 addition & 1 deletion deploy/pkg-config/pkg-config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ includedir=${{prefix}}/include
#info
Name: oneDAL
Description: Intel(R) oneAPI Data Analytics Library
Version: 2025.0
Version: 2025.1
URL: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html
#Link line
Libs: {libs}
Expand Down
2 changes: 1 addition & 1 deletion dev/bazel/config/config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def _declare_onedal_config_impl(repo_ctx):
substitutions = {
"%{auto_cpu}": auto_cpu,
"%{version_major}": "2025",
"%{version_minor}": "0",
"%{version_minor}": "1",
"%{version_update}": "0",
"%{version_build}": utils.datestamp(repo_ctx),
"%{version_buildrev}": "work",
Expand Down
6 changes: 6 additions & 0 deletions dev/bazel/deps/mkl.tpl.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ cc_library(

cc_library(
name = "mkl_dpc",
# TODO: add a mechanism to get attr from bazel command(it's not available for now)
linkopts = [
# Currently its hardcoded to 16 to get the best trade-off between linking speedup and resources used.
# If the number of processors on machine is below 16 it will be defaulted to `nproc`.
"-fsycl-max-parallel-link-jobs=16",
],
srcs = [
"lib/libmkl_sycl.a",
],
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/doxygen_conf_cpp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "C++ API Reference for Intel(R) oneAPI Data Analytics L
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "2025.0"
PROJECT_NUMBER = "2025.1"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/doxygen_conf_cpp_examples.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "C++ API Reference for Intel(R) oneAPI Data Analytics L
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "2025.0"
PROJECT_NUMBER = "2025.1"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/doxygen_conf_cpp_web.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "C++ API Reference for Intel(R) oneAPI Data Analytics L
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "2025.0"
PROJECT_NUMBER = "2025.1"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
12 changes: 7 additions & 5 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,17 @@ TBBDIR.include := $(if $(TBBDIR.2),$(TBBDIR.2)/include/tbb $(TBBDIR.2)/include)

TBBDIR.libia.prefix := $(TBBDIR.2)/lib

ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)
OLD_TBB_LAYOUT := $(if $(wildcard $(call frompf1,$(TBBDIR.libia.prefix))/$(_IA)),yes,no)

ifeq ($(OLD_TBB_LAYOUT),no)
TBBDIR.libia.win.vc1 := $(if $(OS_is_win),$(if $(wildcard $(call frompf1,$(TBBDIR.libia.prefix))/vc_mt),$(TBBDIR.libia.prefix)/vc_mt,$(if $(wildcard $(call frompf1,$(TBBDIR.libia.prefix))/vc14),$(TBBDIR.libia.prefix)/vc14)))
else
TBBDIR.libia.win.vc1 := $(if $(OS_is_win),$(if $(wildcard $(call frompf1,$(TBBDIR.libia.prefix))/$(_IA)/vc_mt),$(TBBDIR.libia.prefix)/$(_IA)/vc_mt,$(if $(wildcard $(call frompf1,$(TBBDIR.libia.prefix))/$(_IA)/vc14),$(TBBDIR.libia.prefix)/$(_IA)/vc14)))
endif
TBBDIR.libia.win.vc2 := $(if $(OS_is_win),$(if $(TBBDIR.libia.win.vc1),,$(firstword $(filter $(call topf,$$TBBROOT)%,$(subst ;,$(space),$(call topf,$$LIB))))))
TBBDIR.libia.win.vc22 := $(if $(OS_is_win),$(if $(TBBDIR.libia.win.vc2),$(wildcard $(TBBDIR.libia.win.vc2)/tbb12$(dtbb).dll)))

ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)
ifeq ($(OLD_TBB_LAYOUT),no)
TBBDIR.libia.win:= $(if $(OS_is_win),$(if $(TBBDIR.libia.win.vc22),$(TBBDIR.libia.win.vc2),$(if $(TBBDIR.libia.win.vc1),$(TBBDIR.libia.win.vc1),$(error Can`t find TBB libs nether in $(call frompf,$(TBBDIR.libia.prefix))/vc_mt not in $(firstword $(filter $(TBBROOT)%,$(subst ;,$(space),$(LIB)))).))))
TBBDIR.libia.lnx.gcc1 := $(if $(OS_is_lnx),$(if $(wildcard $(TBBDIR.libia.prefix)/*),$(TBBDIR.libia.prefix)))
else
Expand All @@ -239,7 +241,7 @@ endif

TBBDIR.libia.lnx.gcc2 := $(if $(OS_is_lnx),$(if $(TBBDIR.libia.lnx.gcc1),,$(firstword $(filter $(TBBROOT)%,$(subst :,$(space),$(LD_LIBRARY_PATH))))))
TBBDIR.libia.lnx.gcc22 := $(if $(OS_is_lnx),$(if $(TBBDIR.libia.lnx.gcc2),$(wildcard $(TBBDIR.libia.lnx.gcc2)/libtbb.so)))
ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)
ifeq ($(OLD_TBB_LAYOUT),no)
TBBDIR.libia.lnx := $(if $(OS_is_lnx),$(if $(TBBDIR.libia.lnx.gcc22),$(TBBDIR.libia.lnx.gcc2),$(if $(TBBDIR.libia.lnx.gcc1),$(TBBDIR.libia.lnx.gcc1),$(error Can`t find TBB runtimes nether in $(TBBDIR.libia.prefix) not in $(firstword $(filter $(TBBROOT)%,$(subst :,$(space),$(LD_LIBRARY_PATH)))).))))
else
TBBDIR.libia.lnx := $(if $(OS_is_lnx),$(if $(TBBDIR.libia.lnx.gcc22),$(TBBDIR.libia.lnx.gcc2),$(if $(TBBDIR.libia.lnx.gcc1),$(TBBDIR.libia.lnx.gcc1),$(error Can`t find TBB runtimes nether in $(TBBDIR.libia.prefix)/$(_IA)/gcc4.8 not in $(firstword $(filter $(TBBROOT)%,$(subst :,$(space),$(LD_LIBRARY_PATH)))).))))
Expand All @@ -252,7 +254,7 @@ TBBDIR.libia.mac := $(if $(OS_is_mac),$(if $(TBBDIR.libia.mac.clang22),$(TBBDIR.
TBBDIR.libia := $(TBBDIR.libia.$(_OS))

TBBDIR.soia.prefix := $(TBBDIR.2)/
ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)
ifeq ($(OLD_TBB_LAYOUT),no)
TBBDIR.soia.win := $(if $(OS_is_win),$(if $(TBBDIR.libia.win.vc22),$(TBBDIR.libia.win.vc2),$(if $(wildcard $(call frompf1,$(TBBDIR.soia.prefix))bin/vc_mt/*),$(TBBDIR.soia.prefix)bin/vc_mt,$(if $(wildcard $(call frompf1,$(TBBDIR.soia.prefix))bin/vc14/*),$(TBBDIR.soia.prefix)bin/vc14,$(error Can`t find TBB runtimes nether in $(TBBDIR.soia.prefix)bin/vc_mt not in $(firstword $(filter $(TBBROOT)%,$(subst ;,$(space),$(LIB)))).)))))
else
TBBDIR.soia.win := $(if $(OS_is_win),$(if $(TBBDIR.libia.win.vc22),$(TBBDIR.libia.win.vc2),$(if $(wildcard $(call frompf1,$(TBBDIR.soia.prefix))redist/$(_IA)/vc_mt/*),$(TBBDIR.soia.prefix)redist/$(_IA)/vc_mt,$(if $(wildcard $(call frompf1,$(TBBDIR.soia.prefix))redist/$(_IA)/vc14/*),$(TBBDIR.soia.prefix)redist/$(_IA)/vc14,$(error Can`t find TBB runtimes nether in $(TBBDIR.soia.prefix)redist/$(_IA)/vc_mt not in $(firstword $(filter $(TBBROOT)%,$(subst ;,$(space),$(LIB)))).)))))
Expand All @@ -262,7 +264,7 @@ TBBDIR.soia.mac := $(if $(OS_is_mac),$(TBBDIR.libia.mac))
TBBDIR.soia := $(TBBDIR.soia.$(_OS))

RELEASEDIR.tbb := $(RELEASEDIR)/tbb/latest
ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)
ifeq ($(OLD_TBB_LAYOUT),no)
RELEASEDIR.tbb.libia := $(RELEASEDIR.tbb)/lib$(if $(OS_is_mac),,$(if $(OS_is_win),/vc_mt,/$(TBBDIR.libia.lnx.gcc)))
RELEASEDIR.tbb.soia := $(if $(OS_is_win),$(RELEASEDIR.tbb)/bin/vc_mt,$(RELEASEDIR.tbb.libia))
else
Expand Down
2 changes: 1 addition & 1 deletion makefile.ver
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#===============================================================================

MAJOR = 2025
MINOR = 0
MINOR = 1
UPDATE = 0
BUILD = $(shell date +'%Y%m%d')
STATUS = P
Expand Down

0 comments on commit 9a9f557

Please sign in to comment.