Skip to content

Commit 49844ea

Browse files
arp2600georgepaw
authored andcommitted
Use exact paths when specifying libs.
Summary: Globs such as "lib*/poplar/libpoplar*" will match against libpoplar_mock.so when tf is built against a poplar sandbox, but this made the resulting whl unuseable with the output of poplar_packaging. Removing the glob and specifying the library names in full fixes this issue. Reviewers: #tensorflow, #framework_ip_review_-_any_oss_or_third-party_code_use_has_been_approved, jakeh, georgep Reviewed By: #tensorflow, #framework_ip_review_-_any_oss_or_third-party_code_use_has_been_approved, georgep Maniphest Tasks: T56876 Differential Revision: https://phabricator.sourcevertex.net/D62232
1 parent c349f5b commit 49844ea

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

third_party/ipus/poplar_lib/BUILD_poplar.tpl

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ cc_library(
2929
name = "poplar_libs",
3030
srcs = glob(
3131
[
32-
"lib*/poplar/libpoplar*",
32+
"lib*/poplar/libpoplar.so",
33+
"lib*/poplar/libpoplar_test.so",
3334
] + if_custom_poplibs([
3435
"lib*/poplar/libgcl_ct*",
3536
"lib*/poplar/libpva.so",
@@ -39,14 +40,14 @@ cc_library(
3940
"lib*/poplar/libtbbmalloc.*",
4041
"lib*/poplar/libnuma.*",
4142
"lib*/poplar/libpopef.so",
42-
"lib*/poplibs/libpoplin*",
43-
"lib*/poplibs/libpopnn*",
44-
"lib*/poplibs/libpopops*",
45-
"lib*/poplibs/libpoprand*",
46-
"lib*/poplibs/libpopfloat*",
47-
"lib*/poplibs/libpopsparse*",
48-
"lib*/poplibs/libpopsys*",
49-
"lib*/poplibs/libpoputil*",
43+
"lib*/poplibs/libpoplin.so",
44+
"lib*/poplibs/libpopnn.so",
45+
"lib*/poplibs/libpopops.so",
46+
"lib*/poplibs/libpoprand.so",
47+
"lib*/poplibs/libpopfloat.so",
48+
"lib*/poplibs/libpopsparse.so",
49+
"lib*/poplibs/libpopsys.so",
50+
"lib*/poplibs/libpoputil.so",
5051
], [
5152
"lib*/**/libgcl_ct*",
5253
"lib*/**/libpopef.so",
@@ -56,14 +57,14 @@ cc_library(
5657
"lib*/**/libtbb_preview.*",
5758
"lib*/**/libtbbmalloc.*",
5859
"lib*/**/libnuma.*",
59-
"lib*/**/libpoplin*",
60-
"lib*/**/libpopnn*",
61-
"lib*/**/libpopops*",
62-
"lib*/**/libpoprand*",
63-
"lib*/**/libpopfloat*",
64-
"lib*/**/libpopsparse*",
65-
"lib*/**/libpopsys*",
66-
"lib*/**/libpoputil*",
60+
"lib*/**/libpoplin.so",
61+
"lib*/**/libpopnn.so",
62+
"lib*/**/libpopops.so",
63+
"lib*/**/libpoprand.so",
64+
"lib*/**/libpopfloat.so",
65+
"lib*/**/libpopsparse.so",
66+
"lib*/**/libpopsys.so",
67+
"lib*/**/libpoputil.so",
6768
]),
6869
),
6970
deps = [":poplar_headers"],

0 commit comments

Comments
 (0)