Skip to content

Commit f5bf1cf

Browse files
committed
Merge branch 'v1.2.1_beta'
2 parents 0bb72dc + b842d5a commit f5bf1cf

File tree

1,111 files changed

+107124
-33246
lines changed

Some content is hidden

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

1,111 files changed

+107124
-33246
lines changed

.Doxyfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ OPTIMIZE_OUTPUT_FOR_C = YES
250250
# qualified scopes will look different, etc.
251251
# The default value is: NO.
252252

253-
OPTIMIZE_OUTPUT_JAVA = NO
253+
OPTIMIZE_OUTPUT_JAVA = YES
254254

255255
# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
256256
# sources. Doxygen will then generate output that is tailored for Fortran.
@@ -281,7 +281,7 @@ OPTIMIZE_OUTPUT_VHDL = NO
281281
# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
282282
# the files are not read by doxygen.
283283

284-
EXTENSION_MAPPING =
284+
EXTENSION_MAPPING = proto=C++
285285

286286
# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
287287
# according to the Markdown format, which allows for more readable
@@ -771,8 +771,8 @@ WARN_LOGFILE =
771771
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
772772
# Note: If this tag is empty the current directory is searched.
773773

774-
INPUT = ./inference/engine/api/java ./inference/engine/api/c \
775-
./inference/flow/include/flow.h ./common/uni/include/task.h ./inference/flow/src/flow.proto
774+
INPUT = ./inference/engine/api ./inference/flow/include/flow.h \
775+
./common/uni/include/task.h ./inference/flow/src/flow.proto
776776

777777
# This tag can be used to specify the character encoding of the source files
778778
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

.github/workflows/linux-android-armv7.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ jobs:
1818
export ANDROID_NDK_ROOT=${PWD}/android-ndk-r20b
1919
export PATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
2020
cd ..
21+
chmod +x install.sh
2122
./install.sh --target=android-armv7 -t 32

.github/workflows/linux-android-armv8.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ jobs:
1818
export ANDROID_NDK_ROOT=${PWD}/android-ndk-r20b
1919
export PATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
2020
cd ..
21-
./install.sh --target=android-aarch64 --mali
21+
chmod +x install.sh
22+
./install.sh --target=android-aarch64

.github/workflows/linux-android-x86_64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ jobs:
1818
export ANDROID_NDK_ROOT=${PWD}/android-ndk-r20b
1919
export PATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
2020
cd ..
21+
chmod +x install.sh
2122
./install.sh --target=android-x86_64

.github/workflows/linux-x86-avx2.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ jobs:
1212
uses: actions/checkout@v2
1313
- name: compile x86-avx2 on linux
1414
run: |
15+
chmod +x install.sh
1516
./install.sh --target=linux-x86_64_avx2 -t 32

.github/workflows/linux-x86.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ jobs:
1212
uses: actions/checkout@v2
1313
- name: compile x86 on linux
1414
run: |
15+
chmod +x install.sh
1516
./install.sh --target=linux-x86_64 -t 32

.github/workflows/macos-android-armv7.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
export ANDROID_NDK_ROOT=${PWD}/android-ndk-r20b
2020
export PATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin:$PATH
2121
cd ..
22+
chmod +x install.sh
2223
./install.sh --target=android-armv7
2324
2425

.github/workflows/macos-android-armv8.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ jobs:
1919
export ANDROID_NDK_ROOT=${PWD}/android-ndk-r20b
2020
export PATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin:$PATH
2121
cd ..
22-
./install.sh --target=android-aarch64 --mali
22+
chmod +x install.sh
23+
./install.sh --target=android-aarch64

.github/workflows/macos-android-x86_64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ jobs:
1919
export ANDROID_NDK_ROOT=${PWD}/android-ndk-r20b
2020
export PATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin:$PATH
2121
cd ..
22+
chmod +x install.sh
2223
./install.sh --target=android-x86_64

.github/workflows/macos-ios-armv7.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ jobs:
1414
echo 'export FLAGS_GETOPT_CMD="$(brew --prefix gnu-getopt)/bin/getopt"' >> /Users/runner/.bash_profile
1515
source /Users/runner/.bash_profile
1616
export IOS_SDK_ROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk
17+
chmod +x install.sh
1718
./install.sh --target=ios-armv7

0 commit comments

Comments
 (0)