Skip to content

Commit

Permalink
MAINT: Remove unneeded .def files (#2974)
Browse files Browse the repository at this point in the history
* remove blas and lapack functions from .def lists

* remove .def files altogether

* suggested removals
  • Loading branch information
david-cortes-intel authored Nov 18, 2024
1 parent ad4efd2 commit 32b31aa
Show file tree
Hide file tree
Showing 10 changed files with 1 addition and 251 deletions.
4 changes: 0 additions & 4 deletions cpp/daal/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,6 @@ daal_dynamic_lib(
deps = [
":threading_tbb",
],
def_file = select({
"@config//:backend_ref": "src/threading/export_lnx32e.ref.def",
"//conditions:default": "src/threading/export_lnx32e.mkl.def",
}),
)

daal_module(
Expand Down
17 changes: 0 additions & 17 deletions cpp/daal/src/threading/export.def

This file was deleted.

17 changes: 0 additions & 17 deletions cpp/daal/src/threading/export_lnx32e.mkl.def

This file was deleted.

63 changes: 0 additions & 63 deletions cpp/daal/src/threading/export_lnx32e.ref.def

This file was deleted.

63 changes: 0 additions & 63 deletions cpp/daal/src/threading/export_lnxarm.ref.def

This file was deleted.

63 changes: 0 additions & 63 deletions cpp/daal/src/threading/export_lnxriscv64.ref.def

This file was deleted.

17 changes: 0 additions & 17 deletions cpp/daal/src/threading/export_mac.def

This file was deleted.

1 change: 0 additions & 1 deletion dev/make/function_definitions/mac32e.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ define set_daal_rt_deps
$$(eval daaldep.mac32e.rt.thr := -L$$(RELEASEDIR.tbb.soia) -ltbb -ltbbmalloc \
$$(daaldep.mac32e.rt.$$(COMPILER)))
$$(eval daaldep.mac32e.rt.seq := $$(daaldep.mac32e.rt.$$(COMPILER)))
$$(eval daaldep.mac32e.threxport := export_mac.def)

$$(eval daaldep.mac.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 @@ -28,7 +28,6 @@ define set_daal_rt_deps
$$(dep_thr) $$(if $$(CHECK_DLL_SIG),Wintrust.lib))
$$(eval daaldep.win32e.rt.seq := $$(dep_seq) \
$$(if $$(CHECK_DLL_SIG),Wintrust.lib))
$$(eval daaldep.win32e.threxport := export.def)

$$(eval daaldep.win.threxport.create = grep -v -E '^(;|$$$$$$$$)' $$$$< $$$$(USECPUS.out.grep.filter))
endef
6 changes: 1 addition & 5 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,6 @@ $(WORKDIR.lib)/$(core_y:%.$(MAJORBINARY).dll=%_dll.lib): $(WORKDIR.lib)/$(core_y
endif
$(CORE.tmpdir_y)/$(core_y:%.$y=%_link.txt): $(CORE.objs_y) $(if $(OS_is_win),$(CORE.tmpdir_y)/dll.res,) | $(CORE.tmpdir_y)/. ; $(WRITE.PREREQS)
$(WORKDIR.lib)/$(core_y): $(daaldep.math_backend.ext) \
$(if $(PLAT_is_win32e),$(CORE.srcdir)/export_win32e.def) \
$(CORE.tmpdir_y)/$(core_y:%.$y=%_link.txt) ; $(LINK.DYNAMIC) ; $(LINK.DYNAMIC.POST)

$(CORE.objs_a): $(CORE.tmpdir_a)/inc_a_folders.txt
Expand Down Expand Up @@ -840,12 +839,9 @@ THR_TBB.objs_y := $(addprefix $(THR.tmpdir_y)/,$(THR.srcs:%.cpp=%_tbb.$o))
$(WORKDIR.lib)/$(thr_tbb_a): LOPT:=
$(WORKDIR.lib)/$(thr_tbb_a): $(THR_TBB.objs_a) ; $(LINK.STATIC)

$(THR.tmpdir_y)/%_link.def: $(THR.srcdir)/$(daaldep.$(PLAT).threxport) | $(THR.tmpdir_y)/.
$(daaldep.$(_OS).threxport.create) > $@

$(WORKDIR.lib)/$(thr_tbb_y): LOPT += $(-fPIC) $(daaldep.rt.thr)
$(WORKDIR.lib)/$(thr_tbb_y): LOPT += $(if $(OS_is_win),-IMPLIB:$(@:%.dll=%_dll.lib),)
$(WORKDIR.lib)/$(thr_tbb_y): $(THR_TBB.objs_y) $(if $(OS_is_win),$(THR.tmpdir_y)/dll_tbb.res,) $(THR.tmpdir_y)/$(thr_tbb_y:%.$y=%_link.def) ; $(LINK.DYNAMIC) ; $(LINK.DYNAMIC.POST)
$(WORKDIR.lib)/$(thr_tbb_y): $(THR_TBB.objs_y) $(if $(OS_is_win),$(THR.tmpdir_y)/dll_tbb.res,) ; $(LINK.DYNAMIC) ; $(LINK.DYNAMIC.POST)

THR.objs_a := $(THR_TBB.objs_a)
THR.objs_y := $(THR_TBB.objs_y)
Expand Down

0 comments on commit 32b31aa

Please sign in to comment.