1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
diff --git a/dev/bazel/deps/onedal.bzl b/dev/bazel/deps/onedal.bzl
index f0f7662c0..6b9d11ff2 100644
--- a/dev/bazel/deps/onedal.bzl
+++ b/dev/bazel/deps/onedal.bzl
@@ -21,18 +21,12 @@ onedal_repo = repos.prebuilt_libs_repo_rule(
"include",
],
libs = [
- # Static
- "lib/intel64/libonedal_core.a",
- "lib/intel64/libonedal_thread.a",
- "lib/intel64/libonedal.a",
- "lib/intel64/libonedal_dpc.a",
- "lib/intel64/libonedal_sycl.a",
-
# Dynamic
"lib/intel64/libonedal_core.so",
"lib/intel64/libonedal_thread.so",
"lib/intel64/libonedal.so",
"lib/intel64/libonedal_dpc.so",
+ "lib/intel64/libonedal_sycl.so",
],
build_template = "@onedal//dev/bazel/deps:onedal.tpl.BUILD",
)
diff --git a/dev/bazel/deps/onedal.tpl.BUILD b/dev/bazel/deps/onedal.tpl.BUILD
index 60be67856..0f7990ef5 100644
--- a/dev/bazel/deps/onedal.tpl.BUILD
+++ b/dev/bazel/deps/onedal.tpl.BUILD
@@ -9,62 +9,17 @@ cc_library(
includes = [ "include" ],
)
-cc_library(
- name = "core_static",
- srcs = [
- "lib/intel64/libonedal_core.a",
- ],
- deps = [
- ":headers",
- # TODO: Currently vml_ipp lib depends on TBB, but it shouldn't
- # Remove TBB from deps once problem with vml_ipp is resolved
- "@tbb//:tbb_binary",
- ],
-)
-
-cc_library(
- name = "thread_static",
- srcs = [
- "lib/intel64/libonedal_thread.a",
- ],
- deps = [
- ":headers",
- "@tbb//:tbb_binary",
- "@tbb//:tbbmalloc_binary",
- ],
-)
cc_library(
name = "onedal_sycl",
srcs = [
- "lib/intel64/libonedal_sycl.a",
- ],
- deps = [
- ":headers",
- ],
-)
-
-cc_library(
- name = "onedal_static",
- srcs = [
- "lib/intel64/libonedal.a",
+ "lib/intel64/libonedal_sycl.so",
],
deps = [
":headers",
],
)
-cc_library(
- name = "onedal_static_dpc",
- srcs = [
- "lib/intel64/libonedal_dpc.a",
- ],
- deps = [
- ":headers",
- ":onedal_sycl",
- ],
-)
-
cc_library(
name = "core_dynamic",
srcs = [
diff --git a/dev/make/cmplr.dpcpp.mk b/dev/make/cmplr.dpcpp.mk
index 2a78043b7..b431e1255 100644
--- a/dev/make/cmplr.dpcpp.mk
+++ b/dev/make/cmplr.dpcpp.mk
@@ -28,13 +28,13 @@ CORE.SERV.COMPILER.dpcpp = generic
-Zl.dpcpp =
-DEBC.dpcpp = -g
-COMPILER.lnx.dpcpp = icpx -fsycl -m64 -stdlib=libstdc++ -fgnu-runtime -fwrapv \
+COMPILER.lnx.dpcpp = $(CXX) $(CXXFLAGS) -fsycl -m64 -stdlib=libstdc++ -fgnu-runtime -fwrapv \
-Werror -Wreturn-type -fsycl-device-code-split=per_kernel
-COMPILER.win.dpcpp = icx -fsycl $(if $(MSVC_RT_is_release),-MD, -MDd /debug:none) -nologo -WX \
+COMPILER.win.dpcpp = $(CC) $(CFLAGS) -fsycl $(if $(MSVC_RT_is_release),-MD, -MDd /debug:none) -nologo -WX \
-Wno-deprecated-declarations -fsycl-device-code-split=per_kernel
-link.dynamic.lnx.dpcpp = icpx -fsycl -m64 -fsycl-device-code-split=per_kernel
-link.dynamic.win.dpcpp = icx -fsycl -m64 -fsycl-device-code-split=per_kernel
+link.dynamic.lnx.dpcpp = $(CXX) $(LDFLAGS) -fsycl -m64 -fsycl-device-code-split=per_kernel
+link.dynamic.win.dpcpp = $(CC) $(LDFLAGS) -fsycl -m64 -fsycl-device-code-split=per_kernel
pedantic.opts.lnx.dpcpp = -pedantic \
-Wall \
diff --git a/dev/make/cmplr.icx.mk b/dev/make/cmplr.icx.mk
index cbcde1a7e..61ef3583c 100644
--- a/dev/make/cmplr.icx.mk
+++ b/dev/make/cmplr.icx.mk
@@ -24,14 +24,14 @@ CMPLRDIRSUFF.icx = _icx
CORE.SERV.COMPILER.icx = generic
--Zl.icx = -no-intel-lib=libirc
+-Zl.icx =
-DEBC.icx = -g
-COMPILER.lnx.icx = icpx -m64 \
+COMPILER.lnx.icx = $(CXX) $(CXXFLAGS) -m64 \
-Werror -Wreturn-type
-link.dynamic.lnx.icx = icpx -m64
+link.dynamic.lnx.icx = $(CXX) $(LDFLAGS) -m64
pedantic.opts.icx = -pedantic \
-Wall \
diff --git a/makefile b/makefile
index 525e52728..db864e9cb 100644
--- a/makefile
+++ b/makefile
@@ -215,7 +215,7 @@ TBBDIR.2 := $(if $(TBBDIR.2),$(TBBDIR.2),$(error Can`t find TBB neither in $(DIR
TBBDIR.include := $(if $(TBBDIR),$(TBBDIR)/include/tbb $(TBBDIR)/include)
-TBBDIR.libia.prefix := $(TBBDIR.2)/lib
+TBBDIR.libia.prefix := $(TBBDIR.2)/lib64
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)))
TBBDIR.libia.win.vc2 := $(if $(OS_is_win),$(if $(TBBDIR.libia.win.vc1),,$(firstword $(filter $(call topf,$$TBBROOT)%,$(subst ;,$(space),$(call topf,$$LIB))))))
@@ -223,10 +223,10 @@ TBBDIR.libia.win.vc22 := $(if $(OS_is_win),$(if $(TBBDIR.libia.win.vc2),$(wildca
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))/$(_IA)/vc_mt not in $(firstword $(filter $(TBBROOT)%,$(subst ;,$(space),$(LIB)))).))))
-TBBDIR.libia.lnx.gcc1 := $(if $(OS_is_lnx),$(if $(wildcard $(TBBDIR.libia.prefix)/$(_IA)/gcc4.8/*),$(TBBDIR.libia.prefix)/$(_IA)/gcc4.8))
+TBBDIR.libia.lnx.gcc1 := $(if $(OS_is_lnx),$(if $(wildcard $(TBBDIR.libia.prefix)/*),$(TBBDIR.libia.prefix)))
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)))
-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)))).))))
+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)))).))))
TBBDIR.libia.mac.clang1 := $(if $(OS_is_mac),$(if $(wildcard $(TBBDIR.libia.prefix)/*),$(TBBDIR.libia.prefix)))
TBBDIR.libia.mac.clang2 := $(if $(OS_is_mac),$(if $(TBBDIR.libia.mac.clang1),,$(firstword $(filter $(TBBROOT)%,$(subst :,$(space),$(LIBRARY_PATH))))))
|
GitWeb