Skip to content

Commit

Permalink
Add copying tbb into daal/latest/redist/intel64 on Win; Remove tbb12.…
Browse files Browse the repository at this point in the history
…lib dependency from onedal_core link line
  • Loading branch information
Vika-F committed Sep 20, 2024
1 parent 1a718ee commit b868032
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion dev/make/function_definitions/lnx32e.mk
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ define set_daal_rt_deps
$$(eval daaldep.lnx32e.rt.dpc := -lpthread -lOpenCL \
$$(if $$(COV.libia),$$(COV.libia)/libcov.a))
$$(eval daaldep.lnx32e.threxport := export_lnx32e.$$(BACKEND_CONFIG).def)
$$(eval daaldep.lnx32e.rt.tbb := -ltbb -lpthread)

$$(eval daaldep.lnx.threxport.create = grep -v -E '^(EXPORTS|;|$$$$$$$$)' $$$$< $$$$(USECPUS.out.grep.filter) | sed -e 's/^/-u /')
endef
1 change: 0 additions & 1 deletion dev/make/function_definitions/win32e.mk
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ define set_daal_rt_deps
$$(eval daaldep.win32e.rt.seq := $$(dep_seq) \
$$(if $$(CHECK_DLL_SIG),Wintrust.lib))
$$(eval daaldep.win32e.threxport := export.def)
$$(eval daaldep.win32e.rt.tbb := $$(dep_tbb))

$$(eval daaldep.win.threxport.create = grep -v -E '^(;|$$$$$$$$)' $$$$< $$$$(USECPUS.out.grep.filter))
endef
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ $(eval $(call set_daal_rt_deps))
daaldep.rt.thr := $(daaldep.$(PLAT).rt.thr)
daaldep.rt.seq := $(daaldep.$(PLAT).rt.seq)
daaldep.rt.dpc := $(daaldep.$(PLAT).rt.dpc)
daaldep.rt.tbb := $(daaldep.$(PLAT).rt.tbb)

# List oneAPI header files to populate release/include.
release.ONEAPI.HEADERS.exclude := ! -path "*/backend/*" ! -path "*.impl.*" ! -path "*_test.*" ! -path "*/test/*"
Expand Down Expand Up @@ -456,7 +455,7 @@ $(CORE.tmpdir_a)/$(core_a:%.$a=%_link.$a): $(CORE.tmpdir_a)/$(core_a:%.$a=%_lin
$(WORKDIR.lib)/$(core_a): LOPT:=
$(WORKDIR.lib)/$(core_a): $(daaldep.math_backend.ext) $(CORE.tmpdir_a)/$(core_a:%.$a=%_link.$a) ; $(LINK.STATIC)

$(WORKDIR.lib)/$(core_y): LOPT += $(-fPIC) $(daaldep.rt.tbb)
$(WORKDIR.lib)/$(core_y): LOPT += $(-fPIC)
$(WORKDIR.lib)/$(core_y): LOPT += $(daaldep.rt.seq)
$(WORKDIR.lib)/$(core_y): LOPT += $(if $(OS_is_win),-IMPLIB:$(@:%.$(MAJORBINARY).dll=%_dll.lib),)
$(WORKDIR.lib)/$(core_y): LOPT += $(if $(OS_is_win),-LIBPATH:$(RELEASEDIR.tbb.libia),-L$(TBBDIR.soia.lnx))
Expand Down Expand Up @@ -1053,6 +1052,7 @@ $2/$(notdir $1): $(call frompf1,$1) | $2/. ; $(value cpy)
endef
$(foreach t,$(releasetbb.LIBS_Y),$(eval $(call .release.t,$t,$(RELEASEDIR.tbb.soia))))
$(foreach t,$(releasetbb.LIBS_A),$(eval $(call .release.t,$t,$(RELEASEDIR.tbb.libia))))
$(if $(OS_is_win),$(foreach t,$(releasetbb.LIBS_Y),$(eval $(call .release.t,$t,$(RELEASEDIR.soia)))),)

#----- cmake configs generation

Expand Down

0 comments on commit b868032

Please sign in to comment.