Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Update 3rdparty/mkldnn remote URL and pin to v1.3 #17972

Merged
merged 6 commits into from
Apr 11, 2020
Merged

Update 3rdparty/mkldnn remote URL and pin to v1.3 #17972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6ecb27
update onednn remote url
TaoLv Apr 4, 2020
efe0c98
checkout onednn v1.3 release
TaoLv Apr 4, 2020
aaf66ea
fix format test
TaoLv Apr 4, 2020
9e8d14a
make test
TaoLv Apr 5, 2020
85e33b2
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Apr 9, 2020
30cf341
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Apr 10, 2020
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
url = https://github.com/google/googletest.git
[submodule "3rdparty/mkldnn"]
path = 3rdparty/mkldnn
url = https://github.com/intel/mkl-dnn.git
url = https://github.com/oneapi-src/oneDNN.git
[submodule "3rdparty/tvm"]
path = 3rdparty/tvm
url = https://github.com/apache/incubator-tvm.git
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/mkldnn
Open in desktop
Submodule mkldnn updated 1043 files
2 changes: 1 addition & 1 deletion tests/cpp/operator/mkldnn_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static void VerifyDefMem(const mkldnn::memory &mem) {

TEST(MKLDNN_UTIL_FUNC, MemFormat) {
// Check whether the number of format is correct.
CHECK_EQ(mkldnn_format_tag_last, 152);
CHECK_EQ(mkldnn_format_tag_last, 154);
CHECK_EQ(mkldnn_nchw, 5);
CHECK_EQ(mkldnn_oihw, 5);
}
Expand Down
7 changes: 6 additions & 1 deletion tests/cpp/unittest.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ TEST_CFLAGS += -I/usr/local/include/breakpad
TEST_LDFLAGS += -lbreakpad_client -lbreakpad
endif

TEST_LIB_DEP = gtest.a
ifeq ($(USE_MKLDNN), 1)
TEST_LIB_DEP += $(MKLDNNROOT)/lib/libdnnl.a
endif

.PHONY: runtest testclean

gtest-all.o : $(GTEST_SRCS_)
Expand Down Expand Up @@ -67,7 +72,7 @@ build/tests/cpp/thread_safety/%.o : tests/cpp/thread_safety/%.cc | mkldnn
$(CXX) -std=c++11 $(TEST_CFLAGS) $(TEST_CPPFLAGS) -I$(GTEST_INC) -MM -MT tests/cpp/thread_safety/$* $< > build/tests/cpp/thread_safety/$*.d
$(CXX) -c -std=c++11 $(TEST_CFLAGS) $(TEST_CPPFLAGS) -I$(GTEST_INC) -o build/tests/cpp/thread_safety/$*.o $(filter %.cc %.a, $^)

$(TEST): $(TEST_OBJ) lib/libmxnet.so gtest.a
$(TEST): $(TEST_OBJ) lib/libmxnet.so $(TEST_LIB_DEP)
$(CXX) -std=c++11 $(TEST_CFLAGS) -I$(GTEST_INC) -o $@ $^ $(TEST_LDFLAGS)

runtest: $(TEST)
Expand Down