Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: dynamic setting deps layouts #2928

Merged
merged 4 commits into from
Oct 9, 2024
Merged

feature: dynamic setting deps layouts #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e38eaf
init commit
Alexandr-Solovev Oct 1, 2024
5593f2f
Merge branch 'oneapi-src:main' into dev/asolovev_old_layout_fix
Alexandr-Solovev Oct 1, 2024
226d07f
remove all mkl_fpk_gpu_line vars
Alexandr-Solovev Oct 2, 2024
178761d
Merge branch 'oneapi-src:main' into dev/asolovev_old_layout_fix
Alexandr-Solovev Oct 7, 2024
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
1 change: 0 additions & 1 deletion .ci/pipeline/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,6 @@ jobs:
variables:
release.dir: '__release_win_vc'
platform.type : 'win32e'
MKL_FPK_GPU_VERSION_LINE : 2024.0.0
pool:
vmImage: 'windows-2022'
steps:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/nightly-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ jobs:
uses: actions/checkout@v4
with:
repository: oneapi-src/oneDAL
- name: Set MKL_FPK_GPU_VERSION_LINE
shell: bash
run: |
echo "MKL_FPK_GPU_VERSION_LINE=2024.0.0" >> "$GITHUB_ENV"
- name: Install DPC++
shell: cmd
run: |
Expand Down
12 changes: 7 additions & 5 deletions makefile
View file
Open in desktop
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)
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need to support old tbb layout?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is it possible scenario that user will try to use tbb with old layout in build? I guess that just since 2021.12 or 13 new layout exists, it makes sense to support old layout, but not sure


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
4 changes: 3 additions & 1 deletion samples/daal/cpp/mpi/makefile_lnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ ifndef TBBROOT
TBBROOT = ./../../../../../../tbb/latest
endif

ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)
OLD_TBB_LAYOUT := $(if $(wildcard $(TBBROOT)/lib/intel64/),yes,no)

ifeq ($(OLD_TBB_LAYOUT),no)
TBB_PATH = "$(TBBROOT)/lib"
else
TBB_PATH = "$(TBBROOT)/lib/intel64/gcc4.8"
Expand Down
5 changes: 4 additions & 1 deletion samples/daal/cpp/mysql/makefile_lnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ endif
ifndef TBBROOT
TBBROOT = ./../../../../../../tbb/latest
endif
ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)

OLD_TBB_LAYOUT := $(if $(wildcard $(TBBROOT)/lib/intel64/),yes,no)

ifeq ($(OLD_TBB_LAYOUT),no)
TBB_PATH = "$(TBBROOT)/lib"
else
TBB_PATH = "$(TBBROOT)/lib/intel64/gcc4.8"
Expand Down
4 changes: 3 additions & 1 deletion samples/oneapi/dpc/ccl/makefile_lnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ ifndef TBBROOT
TBBROOT = ./../../../../../tbb/latest
endif

ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)
OLD_TBB_LAYOUT := $(if $(wildcard $(TBBROOT)/lib/intel64/),yes,no)

ifeq ($(OLD_TBB_LAYOUT),no)
TBB_PATH = $(TBBROOT)/lib
else
TBB_PATH = $(TBBROOT)/lib/intel64/gcc4.8
Expand Down
5 changes: 4 additions & 1 deletion samples/oneapi/dpc/mpi/makefile_lnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ DAAL_PATH = $(DALROOT)/lib/intel64
ifndef TBBROOT
TBBROOT = ./../../../../../tbb/latest
endif
ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)

OLD_TBB_LAYOUT := $(if $(wildcard $(TBBROOT)/lib/intel64/),yes,no)

ifeq ($(OLD_TBB_LAYOUT),no)
TBB_PATH = $(TBBROOT)/lib
else
TBB_PATH = $(TBBROOT)/lib/intel64/gcc4.8
Expand Down
Loading