Skip to content

Commit 57c5578

Browse files
gsq7474741gsq7474741
committed
Merge remote-tracking branch 'origin/add_zeropad2d' into add_zeropad2d
2 parents f7aff1a + 97aa42c commit 57c5578

File tree

373 files changed

+12829
-4629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

373 files changed

+12829
-4629
lines changed

‎cmake/external/brpc.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ ExternalProject_Add(
6464
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
6565
BUILD_BYPRODUCTS ${BRPC_LIBRARIES}
6666
)
67+
6768
# ADD_DEPENDENCIES(extern_brpc protobuf ssl crypto leveldb gflags glog gtest snappy)
6869
ADD_DEPENDENCIES(extern_brpc protobuf ssl crypto leveldb gflags glog snappy)
6970
ADD_LIBRARY(brpc STATIC IMPORTED GLOBAL)

‎cmake/external/cryptopp.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,12 @@ set(CRYPTOPP_CMAKE_ARGS ${COMMON_CMAKE_ARGS}
5252

5353
INCLUDE_DIRECTORIES(${CRYPTOPP_INCLUDE_DIR})
5454

55-
cache_third_party(extern_cryptopp
56-
REPOSITORY ${CRYPTOPP_REPOSITORY}
57-
TAG ${CRYPTOPP_TAG}
58-
DIR CRYPTOPP_SOURCE_DIR)
59-
6055
ExternalProject_Add(
6156
extern_cryptopp
6257
${EXTERNAL_PROJECT_LOG_ARGS}
6358
${SHALLOW_CLONE}
64-
"${CRYPTOPP_DOWNLOAD_CMD}"
59+
GIT_REPOSITORY ${CRYPTOPP_REPOSITORY}
60+
GIT_TAG ${CRYPTOPP_TAG}
6561
PREFIX ${CRYPTOPP_PREFIX_DIR}
6662
SOURCE_DIR ${CRYPTOPP_SOURCE_DIR}
6763
UPDATE_COMMAND ""

‎cmake/external/dgc.cmake‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,10 @@ SET(DGC_LIBRARIES "${DGC_INSTALL_DIR}/lib/libdgc.a" CACHE FILEPATH "dgc librar
2222
SET(DGC_URL "https://fleet.bj.bcebos.com/dgc/collective_f66ef73.tgz")
2323
INCLUDE_DIRECTORIES(${DGC_INCLUDE_DIR})
2424

25-
cache_third_party(extern_dgc
26-
URL ${DGC_URL}
27-
DIR DGC_SOURCES_DIR)
28-
2925
ExternalProject_Add(
3026
extern_dgc
3127
${EXTERNAL_PROJECT_LOG_ARGS}
32-
"${DGC_DOWNLOAD_CMD}"
28+
URL ${DGC_URL}
3329
URL_MD5 "94e6fa1bc97169d0e1aad44570fe3251"
3430
PREFIX "${DGC_PREFIX_DIR}"
3531
SOURCE_DIR "${DGC_SOURCES_DIR}"

‎cmake/external/dlpack.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,15 @@ set(DLPACK_SOURCE_DIR ${THIRD_PARTY_PATH}/dlpack/src/extern_dlpack)
2020
set(DLPACK_REPOSITORY ${GIT_URL}/dmlc/dlpack.git)
2121
set(DLPACK_TAG v0.4)
2222

23-
cache_third_party(extern_dlpack
24-
REPOSITORY ${DLPACK_REPOSITORY}
25-
TAG ${DLPACK_TAG}
26-
DIR DLPACK_SOURCE_DIR)
27-
2823
set(DLPACK_INCLUDE_DIR ${DLPACK_SOURCE_DIR}/include)
2924
include_directories(${DLPACK_INCLUDE_DIR})
3025

3126
ExternalProject_Add(
3227
extern_dlpack
3328
${EXTERNAL_PROJECT_LOG_ARGS}
3429
${SHALLOW_CLONE}
35-
"${DLPACK_DOWNLOAD_CMD}"
30+
GIT_REPOSITORY ${DLPACK_REPOSITORY}
31+
GIT_TAG ${DLPACK_TAG}
3632
PREFIX ${DLPACK_PREFIX_DIR}
3733
SOURCE_DIR ${DLPACK_SOURCE_DIR}
3834
UPDATE_COMMAND ""

‎cmake/external/eigen.cmake‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ set(EIGEN_SOURCE_DIR ${THIRD_PARTY_PATH}/eigen3/src/extern_eigen3)
2020
set(EIGEN_REPOSITORY https://gitlab.com/libeigen/eigen.git)
2121
set(EIGEN_TAG f612df273689a19d25b45ca4f8269463207c4fee)
2222

23-
cache_third_party(extern_eigen3
24-
REPOSITORY ${EIGEN_REPOSITORY}
25-
TAG ${EIGEN_TAG}
26-
DIR EIGEN_SOURCE_DIR)
27-
2823
if(WIN32)
2924
add_definitions(-DEIGEN_STRONG_INLINE=inline)
3025
elseif(LINUX)
@@ -46,9 +41,10 @@ ExternalProject_Add(
4641
extern_eigen3
4742
${EXTERNAL_PROJECT_LOG_ARGS}
4843
${SHALLOW_CLONE}
49-
"${EIGEN_DOWNLOAD_CMD}"
50-
PREFIX ${EIGEN_PREFIX_DIR}
51-
SOURCE_DIR ${EIGEN_SOURCE_DIR}
44+
GIT_REPOSITORY ${EIGEN_REPOSITORY}
45+
GIT_TAG ${EIGEN_TAG}
46+
PREFIX ${EIGEN_PREFIX_DIR}
47+
SOURCE_DIR ${EIGEN_SOURCE_DIR}
5248
UPDATE_COMMAND ""
5349
PATCH_COMMAND ${EIGEN_PATCH_COMMAND}
5450
CONFIGURE_COMMAND ""

‎cmake/external/gflags.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@ ENDIF(WIN32)
3030

3131
INCLUDE_DIRECTORIES(${GFLAGS_INCLUDE_DIR})
3232

33-
cache_third_party(extern_gflags
34-
REPOSITORY ${GFLAGS_REPOSITORY}
35-
TAG ${GFLAGS_TAG}
36-
DIR GFLAGS_SOURCE_DIR)
37-
3833
ExternalProject_Add(
3934
extern_gflags
4035
${EXTERNAL_PROJECT_LOG_ARGS}
4136
${SHALLOW_CLONE}
42-
"${GFLAGS_DOWNLOAD_CMD}"
37+
GIT_REPOSITORY ${GFLAGS_REPOSITORY}
38+
GIT_TAG ${GFLAGS_TAG}
4339
PREFIX ${GFLAGS_PREFIX_DIR}
4440
UPDATE_COMMAND ""
4541
SOURCE_DIR ${GFLAGS_SOURCE_DIR}

‎cmake/external/glog.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,12 @@ ENDIF(WIN32)
3232

3333
INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIR})
3434

35-
cache_third_party(extern_glog
36-
REPOSITORY ${GLOG_REPOSITORY}
37-
TAG ${GLOG_TAG}
38-
DIR GLOG_SOURCE_DIR)
39-
4035
ExternalProject_Add(
4136
extern_glog
4237
${EXTERNAL_PROJECT_LOG_ARGS}
4338
${SHALLOW_CLONE}
44-
"${GLOG_DOWNLOAD_CMD}"
39+
GIT_REPOSITORY ${GLOG_REPOSITORY}
40+
GIT_TAG ${GLOG_TAG}
4541
DEPENDS gflags
4642
PREFIX ${GLOG_PREFIX_DIR}
4743
SOURCE_DIR ${GLOG_SOURCE_DIR}

‎cmake/external/gloo.cmake‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,13 @@ SET(GLOO_LIBRARIES "${GLOO_INSTALL_DIR}/lib/libgloo.a" CACHE FILEPATH "gloo
2727

2828
INCLUDE_DIRECTORIES(${GLOO_INCLUDE_DIR})
2929

30-
cache_third_party(extern_gloo
31-
REPOSITORY ${GLOO_REPOSITORY}
32-
TAG ${GLOO_TAG}
33-
DIR GLOO_SOURCE_DIR)
34-
3530
if(WITH_ASCEND OR WITH_ASCEND_CL)
3631
ExternalProject_Add(
3732
extern_gloo
3833
${EXTERNAL_PROJECT_LOG_ARGS}
3934
${SHALLOW_CLONE}
40-
"${GLOO_DOWNLOAD_CMD}"
35+
GIT_REPOSITORY ${GLOO_REPOSITORY}
36+
GIT_TAG ${GLOO_TAG}
4137
PREFIX "${GLOO_PREFIX_DIR}"
4238
SOURCE_DIR "${GLOO_SOURCE_DIR}"
4339
UPDATE_COMMAND ""
@@ -54,7 +50,8 @@ else()
5450
extern_gloo
5551
${EXTERNAL_PROJECT_LOG_ARGS}
5652
${SHALLOW_CLONE}
57-
"${GLOO_DOWNLOAD_CMD}"
53+
GIT_REPOSITORY ${GLOO_REPOSITORY}
54+
GIT_TAG ${GLOO_TAG}
5855
PREFIX "${GLOO_PREFIX_DIR}"
5956
SOURCE_DIR "${GLOO_SOURCE_DIR}"
6057
UPDATE_COMMAND ""

‎cmake/external/gtest.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,12 @@ IF(WITH_MKLML)
4747
SET(GTEST_DEPENDS ${MKLML_PROJECT})
4848
ENDIF()
4949

50-
cache_third_party(extern_gtest
51-
REPOSITORY ${GTEST_REPOSITORY}
52-
TAG ${GTEST_TAG}
53-
DIR GTEST_SOURCE_DIR)
54-
5550
ExternalProject_Add(
5651
extern_gtest
5752
${EXTERNAL_PROJECT_LOG_ARGS}
5853
${SHALLOW_CLONE}
59-
"${GTEST_DOWNLOAD_CMD}"
54+
GIT_REPOSITORY ${GTEST_REPOSITORY}
55+
GIT_TAG ${GTEST_TAG}
6056
DEPENDS ${GTEST_DEPENDS}
6157
PREFIX ${GTEST_PREFIX_DIR}
6258
SOURCE_DIR ${GTEST_SOURCE_DIR}

‎cmake/external/mkldnn.cmake‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ SET(MKLDNN_SOURCE_DIR ${THIRD_PARTY_PATH}/mkldnn/src/extern_mkldnn)
2020
SET(MKLDNN_INSTALL_DIR ${THIRD_PARTY_PATH}/install/mkldnn)
2121
SET(MKLDNN_INC_DIR "${MKLDNN_INSTALL_DIR}/include" CACHE PATH "mkldnn include directory." FORCE)
2222
SET(MKLDNN_REPOSITORY ${GIT_URL}/oneapi-src/oneDNN.git)
23-
SET(MKLDNN_TAG e2d45252ae9c3e91671339579e3c0f0061f81d49)
23+
SET(MKLDNN_TAG 145c4b50196ac90ec1b946fb80cb5cef6e7d2d35)
2424

2525

2626
# Introduce variables:
@@ -49,16 +49,12 @@ ELSE()
4949
SET(MKLDNN_LIB "${MKLDNN_INSTALL_DIR}/bin/mkldnn.lib" CACHE FILEPATH "mkldnn library." FORCE)
5050
ENDIF(NOT WIN32)
5151

52-
cache_third_party(${MKLDNN_PROJECT}
53-
REPOSITORY ${MKLDNN_REPOSITORY}
54-
TAG ${MKLDNN_TAG}
55-
DIR MKLDNN_SOURCE_DIR)
56-
5752
ExternalProject_Add(
5853
${MKLDNN_PROJECT}
5954
${EXTERNAL_PROJECT_LOG_ARGS}
6055
${SHALLOW_CLONE}
61-
"${MKLDNN_DOWNLOAD_CMD}"
56+
GIT_REPOSITORY ${MKLDNN_REPOSITORY}
57+
GIT_TAG ${MKLDNN_TAG}
6258
DEPENDS ${MKLDNN_DEPENDS}
6359
PREFIX ${MKLDNN_PREFIX_DIR}
6460
SOURCE_DIR ${MKLDNN_SOURCE_DIR}

0 commit comments

Comments
 (0)