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

Commit

Permalink
Update 3rdparty/mkldnn remote URL and pin to v1.3 (#17972)
Browse files Browse the repository at this point in the history
* update onednn remote url

* checkout onednn v1.3 release

* fix format test

* make test
  • Loading branch information
TaoLv committed Apr 11, 2020
1 parent 58911b5 commit c9f8caa
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
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
Submodule mkldnn updated 1043 files
2 changes: 1 addition & 1 deletion tests/cpp/operator/mkldnn_test.cc
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
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

0 comments on commit c9f8caa

Please sign in to comment.