Skip to content

Commit 3123e3c

Browse files
lcy-sesolcy-seso
committed
Merge branch 'develop' into crf
2 parents cc220ee + 064c369 commit 3123e3c

File tree

273 files changed

+5452
-4928
lines changed

Some content is hidden

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

273 files changed

+5452
-4928
lines changed

‎.pre-commit-config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@
3131
- id: go-fmt
3232
types:
3333
- go
34-
- id: gometalinter
35-
types:
36-
- go

‎CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ if (WITH_C_API AND WITH_PYTHON)
105105
"different Python interpreter from compiling.")
106106
endif()
107107

108+
if(MOBILE_INFERENCE)
109+
set(THIRD_PARTY_BUILD_TYPE MinSizeRel)
110+
else()
111+
set(THIRD_PARTY_BUILD_TYPE Release)
112+
endif()
113+
108114
########################################################################################
109115

110116
include(external/mklml) # download mklml package

‎cmake/external/eigen.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ExternalProject_Add(
88
extern_eigen3
99
${EXTERNAL_PROJECT_LOG_ARGS}
1010
GIT_REPOSITORY "https://github.com/RLovelett/eigen.git"
11-
GIT_TAG "master"
11+
GIT_TAG 4e79cb69b9425f5f8c3a84be4350d4ab75b5fd9d
1212
PREFIX ${EIGEN_SOURCE_DIR}
1313
UPDATE_COMMAND ""
1414
CONFIGURE_COMMAND ""

‎cmake/external/gflags.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ ExternalProject_Add(
3636
# change this back to the official Github repo once my PR is
3737
# merged.
3838
GIT_REPOSITORY "https://github.com/wangkuiyi/gflags.git"
39+
GIT_TAG 986964c07427ecb9cdb5bd73f73ebbd40e54dadb
3940
PREFIX ${GFLAGS_SOURCES_DIR}
4041
UPDATE_COMMAND ""
4142
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -45,11 +46,11 @@ ExternalProject_Add(
4546
-DCMAKE_INSTALL_PREFIX=${GFLAGS_INSTALL_DIR}
4647
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
4748
-DBUILD_TESTING=OFF
48-
-DCMAKE_BUILD_TYPE=Release
49+
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
4950
${EXTERNAL_OPTIONAL_ARGS}
5051
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${GFLAGS_INSTALL_DIR}
5152
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
52-
-DCMAKE_BUILD_TYPE:STRING=Release
53+
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
5354
)
5455

5556
ADD_LIBRARY(gflags STATIC IMPORTED GLOBAL)

‎cmake/external/glog.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ ExternalProject_Add(
3131
${EXTERNAL_PROJECT_LOG_ARGS}
3232
DEPENDS gflags
3333
GIT_REPOSITORY "https://github.com/google/glog.git"
34+
GIT_TAG v0.3.5
3435
PREFIX ${GLOG_SOURCES_DIR}
3536
UPDATE_COMMAND ""
3637
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -43,12 +44,12 @@ ExternalProject_Add(
4344
-DWITH_GFLAGS=ON
4445
-Dgflags_DIR=${GFLAGS_INSTALL_DIR}/lib/cmake/gflags
4546
-DBUILD_TESTING=OFF
46-
-DCMAKE_BUILD_TYPE=Release
47+
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
4748
${EXTERNAL_OPTIONAL_ARGS}
4849
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${GLOG_INSTALL_DIR}
4950
-DCMAKE_INSTALL_LIBDIR:PATH=${GLOG_INSTALL_DIR}/lib
5051
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
51-
-DCMAKE_BUILD_TYPE:STRING=Release
52+
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
5253
)
5354

5455
ADD_LIBRARY(glog STATIC IMPORTED GLOBAL)

‎cmake/external/gtest.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ IF(WITH_TESTING)
5656
-DBUILD_GMOCK=ON
5757
-Dgtest_disable_pthreads=ON
5858
-Dgtest_force_shared_crt=ON
59-
-DCMAKE_BUILD_TYPE=Release
59+
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
6060
${EXTERNAL_OPTIONAL_ARGS}
6161
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_INSTALL_DIR}
6262
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
63-
-DCMAKE_BUILD_TYPE:STRING=Release
63+
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
6464
)
6565

6666
ADD_LIBRARY(gtest STATIC IMPORTED GLOBAL)

‎cmake/external/protobuf.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
191191
${OPTIONAL_ARGS}
192192
-Dprotobuf_BUILD_TESTS=OFF
193193
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
194-
-DCMAKE_BUILD_TYPE=Release
194+
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
195195
-DCMAKE_INSTALL_PREFIX=${PROTOBUF_INSTALL_DIR}
196196
-DCMAKE_INSTALL_LIBDIR=lib
197197
CMAKE_CACHE_ARGS
198198
-DCMAKE_INSTALL_PREFIX:PATH=${PROTOBUF_INSTALL_DIR}
199-
-DCMAKE_BUILD_TYPE:STRING=Release
199+
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
200200
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
201201
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
202202
${OPTIONAL_CACHE_ARGS}

‎cmake/external/warpctc.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ ExternalProject_Add(
3535
extern_warpctc
3636
${EXTERNAL_PROJECT_LOG_ARGS}
3737
GIT_REPOSITORY "https://github.com/gangliao/warp-ctc.git"
38+
GIT_TAG b63a0644654a3e0ed624c85a1767bc8193aead09
3839
PREFIX ${WARPCTC_SOURCES_DIR}
3940
UPDATE_COMMAND ""
4041
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -48,9 +49,9 @@ ExternalProject_Add(
4849
-DCMAKE_DISABLE_FIND_PACKAGE_Torch=ON
4950
-DBUILD_SHARED=ON
5051
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
51-
-DCMAKE_BUILD_TYPE=Release
52+
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
5253
${EXTERNAL_OPTIONAL_ARGS}
53-
CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release
54+
CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
5455
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
5556
-DCMAKE_INSTALL_PREFIX:PATH=${WARPCTC_INSTALL_DIR}
5657
)

‎cmake/external/zlib.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ ExternalProject_Add(
4242
-DBUILD_SHARED_LIBS=OFF
4343
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
4444
-DCMAKE_MACOSX_RPATH=ON
45-
-DCMAKE_BUILD_TYPE=Release
45+
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
4646
${EXTERNAL_OPTIONAL_ARGS}
4747
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${ZLIB_INSTALL_DIR}
4848
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
49-
-DCMAKE_BUILD_TYPE:STRING=Release
49+
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
5050
)
5151

5252
LIST(APPEND external_project_dependencies zlib)

‎doc/design/block.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ class SymbolTable {
243243
// TODO determine whether name is generated by python or C++.
244244
// Currently assume that a unique name will be generated by C++ if the
245245
// argument name is left default.
246-
VarDesc* NewVar(const string& name="");
246+
VarDesc* Var(const string& name="");
247247

248248
// find a VarDesc by name, if recursive is true, find parent's SymbolTable
249249
// recursively.

0 commit comments

Comments
 (0)