Skip to content

Commit a597187

Browse files
Muhammad El-Hindilzha101
authored andcommitted
Check if dnnl preparation step is required
1 parent e20be7e commit a597187

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

external/dnnl/Makefile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ CXX_ENCLAVE_FLAGS += -nostdinc++
4141

4242
DNNL_DIR = dnnl
4343
LIBDNNL = $(DNNL_DIR)/build/src/libdnnl.a
44-
SGX_DNNL_LOG = $(shell cd ./$(DNNL_DIR) && git log --oneline --grep='SGX mkl-dnn' | cut -d' ' -f 2)
4544
SGX_DNNL_DIR = sgx_dnnl
4645
SGX_DNNL_LIB = $(SGX_DNNL_DIR)/lib
4746
SGX_DNNL_INCLUDE = $(SGX_DNNL_DIR)/include
@@ -53,11 +52,6 @@ endif
5352

5453
DNNL_CONFIG += -DSGX_PROGRAM_SEARCH_PATH="$(EXT_BINUTILS_DIR)"
5554

56-
CHECK_SOURCE :=
57-
ifneq ($(SGX_DNNL_LOG), SGX)
58-
CHECK_SOURCE := dnnl_src
59-
endif
60-
6155
.PHONY: all
6256
all: $(LIBDNNL) $(SGX_DNNL_LIB) $(SGX_DNNL_INCLUDE)
6357
@$(CP) $(LIBDNNL) $(SGX_DNNL_LIB)/libsgx_dnnl.a
@@ -76,8 +70,8 @@ $(SGX_DNNL_LIB):
7670
$(SGX_DNNL_INCLUDE):
7771
@$(MKDIR) $@
7872

79-
.PHONY: dnnl_src
80-
dnnl_src:
73+
$(DNNL_DIR)/build:
74+
@echo "Checkout dnnl and apply sgx_dnnl patch"
8175
ifeq ($(shell git rev-parse --is-inside-work-tree), true)
8276
@$(RM) -r $(DNNL_DIR)/*
8377
git submodule update -f --init dnnl
@@ -87,9 +81,11 @@ else
8781
git clone https://github.com/intel/mkl-dnn.git -b v1.1.1 --depth 1 $(DNNL_DIR)
8882
cd $(DNNL_DIR) && git apply ../sgx_dnnl.patch
8983
endif
84+
mkdir -p $(DNNL_DIR)/build
85+
@echo "success" > $(DNNL_DIR)/build/apply_patch
9086

91-
$(LIBDNNL):$(CHECK_SOURCE)
92-
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)
87+
$(LIBDNNL): $(DNNL_DIR)/build
88+
cd $(DNNL_DIR)/build && cmake -DCMAKE_CXX_ENCLAVE_FLAGS="$(CXX_ENCLAVE_FLAGS)" -DCMAKE_C_ENCLAVE_FLAGS="$(C_ENCLAVE_FLAGS)" $(DNNL_CONFIG) .. && $(MAKE)
9389

9490
.PHONY: clean
9591
clean:

0 commit comments

Comments
 (0)