Skip to content

Commit da2a5bb

Browse files
committed
Update submodule external/dnnl and external/openmp
Signed-off-by: Li, Xun <[email protected]>
1 parent 1eaa455 commit da2a5bb

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

external/dnnl/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ $(SGX_DNNL_INCLUDE):
7676

7777
.PHONY: dnnl_src
7878
dnnl_src:
79-
#ifeq ($(shell git rev-parse --is-inside-work-tree), true)
80-
# @$(RM) -r $(DNNL_DIR)/*
81-
# git submodule update -f --init dnnl
82-
# cd $(DNNL_DIR) && git am ../sgx_dnnl.patch
83-
#else
79+
ifeq ($(shell git rev-parse --is-inside-work-tree), true)
80+
@$(RM) -r $(DNNL_DIR)/*
81+
git submodule update -f --init dnnl
82+
cd $(DNNL_DIR) && git am ../sgx_dnnl.patch
83+
else
8484
@$(RM) -r $(DNNL_DIR)
8585
git clone https://github.com/intel/mkl-dnn.git -b v1.1.1 --depth 1 $(DNNL_DIR)
8686
cd $(DNNL_DIR) && git am ../sgx_dnnl.patch
87-
#endif
87+
endif
8888

8989
$(LIBDNNL):$(CHECK_SOURCE)
9090
mkdir -p $(DNNL_DIR)/build && cd $(DNNL_DIR)/build && cmake -DCMAKE_CXX_ENCLAVE_FLAGS="$(CXX_ENCLAVE_FLAGS)" -DCMAKE_C_ENCLAVE_FLAGS="$(C_ENCLAVE_FLAGS)" $(DNNL_CONFIG) .. && make

external/dnnl/dnnl

Submodule dnnl updated from 52c3052 to e1fe0eb

external/openmp/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,12 @@ $(BUILD_DIR):
5656

5757
.PHONY: omp_code
5858
omp_code:
59-
## Need to enable below code when release
60-
#ifeq ($(shell git rev-parse --is-inside-work-tree 2> /dev/null), true)
61-
# git submodule update -f --init --recursive --remote -- $(OMP_DIR)
62-
#else
59+
ifeq ($(shell git rev-parse --is-inside-work-tree 2> /dev/null), true)
60+
git submodule update -f --init --recursive --remote -- $(OMP_DIR)
61+
else
6362
$(RM) -rf openmp_code
6463
git clone -b svn-tags/RELEASE_801 https://github.com/llvm-mirror/openmp.git --depth 1 $(OMP_DIR)
65-
#endif
64+
endif
6665

6766

6867
$(LIBOMP): $(CHECK_SOURCE)

0 commit comments

Comments
 (0)