@@ -41,7 +41,6 @@ CXX_ENCLAVE_FLAGS += -nostdinc++
41
41
42
42
DNNL_DIR = dnnl
43
43
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)
45
44
SGX_DNNL_DIR = sgx_dnnl
46
45
SGX_DNNL_LIB = $(SGX_DNNL_DIR ) /lib
47
46
SGX_DNNL_INCLUDE = $(SGX_DNNL_DIR ) /include
53
52
54
53
DNNL_CONFIG += -DSGX_PROGRAM_SEARCH_PATH="$(EXT_BINUTILS_DIR ) "
55
54
56
- CHECK_SOURCE :=
57
- ifneq ($(SGX_DNNL_LOG ) , SGX)
58
- CHECK_SOURCE := dnnl_src
59
- endif
60
-
61
55
.PHONY : all
62
56
all : $(LIBDNNL ) $(SGX_DNNL_LIB ) $(SGX_DNNL_INCLUDE )
63
57
@$(CP ) $(LIBDNNL ) $(SGX_DNNL_LIB ) /libsgx_dnnl.a
@@ -76,8 +70,8 @@ $(SGX_DNNL_LIB):
76
70
$(SGX_DNNL_INCLUDE ) :
77
71
@$(MKDIR ) $@
78
72
79
- .PHONY : dnnl_src
80
- dnnl_src :
73
+ $( DNNL_DIR ) /build :
74
+ @echo " Checkout dnnl and apply sgx_dnnl patch "
81
75
ifeq ($(shell git rev-parse --is-inside-work-tree) , true)
82
76
@$(RM) -r $(DNNL_DIR)/*
83
77
git submodule update -f --init dnnl
87
81
git clone https://github.com/intel/mkl-dnn.git -b v1.1.1 --depth 1 $(DNNL_DIR)
88
82
cd $(DNNL_DIR) && git apply ../sgx_dnnl.patch
89
83
endif
84
+ mkdir -p $(DNNL_DIR)/build
85
+ @echo "success" > $(DNNL_DIR)/build/apply_patch
90
86
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 )
93
89
94
90
.PHONY : clean
95
91
clean :
0 commit comments