Merge pull request #5 from alibaba/master

merge20200116

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,26 @@
+# 平台(如果交叉编译请再附上交叉编译目标平台):  
+# Platform(Include target platform as well if cross-compiling):  
+
+
+# Github版本:
+# Github Version:
+
+直接下载ZIP包请提供下载日期以及压缩包注释里的git版本(可通过``7z l zip包路径``命令并在输出信息中搜索``Comment`` 获得，形如``Comment = bc80b11110cd440aacdabbf59658d630527a7f2b``)。 git clone请提供 ``git commit`` 第一行的commit id
+
+Provide date (or better yet, git revision from the comment section of the zip. Obtainable using ``7z l PATH/TO/ZIP`` and search for ``Comment`` in the output) if downloading source as zip,otherwise provide the first commit id from the output of ``git commit``
+
+# 编译方式:
+# Compiling Method
+
+```
+请在这里粘贴cmake参数或使用的cmake脚本路径以及完整输出
+Paste cmake arguments or path of the build script used here as well as the full log of the cmake proess here or pastebin
+```
+
+# 编译日志:
+# Build Log:
+
+```
+粘贴在这里
+Paste log here or pastebin
+```

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+# Label to use when marking an issue as stale
+staleLabel:
+  - wontfix
+  - question
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -63,29 +63,6 @@ obj/
 *.iws
 /out/
 
-# User-specific configurations
-.idea/caches/
-.idea/libraries/
-.idea/shelf/
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-.idea/datasources.xml
-.idea/dataSources.ids
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-.idea/assetWizardSettings.xml
-
 # OS-specific files
 .DS_Store
 .DS_Store?
@@ -113,14 +90,9 @@ hs_err_pid*
 
 ## Plugin-specific files:
 
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
 # JIRA plugin
 atlassian-ide-plugin.xml
 
-# Mongo Explorer plugin
-.idea/mongoSettings.xml
 
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
@@ -310,27 +282,37 @@ build.mac/
 
 ### Projects
 *.podspec.json
-demo/android/.idea
-demo/android/.idea/gradle.xml
-demo/android/.idea/misc.xml
-demo/android/.idea/runConfigurations.xml
-demo/android/.idea/vcs.xml
-demo/android/.idea/caches/build_file_checksums.ser
 demo/android/app/libs/
-project/android/.idea/.name
-project/android/.idea/gradle.xml
-project/android/.idea/misc.xml
-project/android/.idea/modules.xml
-project/android/.idea/runConfigurations.xml
-project/android/.idea/vcs.xml
-project/android/.idea/caches/build_file_checksums.ser
 
 ### Temps
 3rd_party/flatbuffers/tmp
-schema/current
+# FIXME(haijing): Xcode pre-build stage breaks compilation of flatbuffers by setting envs that do cmake cross-compilation for iOS
+# schema/current
 schema/private
 tools/converter/source/IR
 benchmark/benchmark.txt
 
-### Models
-*.mnn
+buildios
+build*/
+source/backend/opencl/execution/cl/codegen/opencl_program.cc
+source/backend/opencl/execution/cl/opencl_program.cc
+# FIXME(haijing): MTL issues.....
+# source/backend/metal/MetalOPRegister.mm
+source/backend/opengl/AllShader.cpp
+source/backend/opengl/AllShader.hpp
+source/backend/vulkan/compiler/AllShader.cpp
+project/ios/iOS_64
+project/ios/iOS_32
+project/ios/SIM_32
+project/ios/SIM_64
+project/ios/out/
+project/ios/MNN_iOS64
+project/ios/MNN_iOS32
+project/ios/MNN_SIM_32
+project/ios/MNN_SIM_64
+.idea/
+include/MNN/VCS.h
+schema/current/
+
+pymnn_build/
+macosbuild

.travis.yml

@@ -8,20 +8,37 @@ matrix:
       osx_image: xcode11.2
       compiler: clang
       script:
-        - ./schema/generate.sh
-        - mkdir macosbuild
-        - cd macosbuild
-        - cmake ../ -DCMAKE_BUILD_TYPE=Release -DMNN_BUILD_TRAIN=ON -DMNN_BUILD_DEMO=ON -DMNN_BUILD_QUANTOOLS=ON -DMNN_EVALUATION=ON -DMNN_BUILD_CONVERTER=ON -DMNN_SUPPORT_TFLITE_QUAN=ON -DMNN_METAL=ON -DMNN_BUILD_TEST=ON -DMNN_BUILD_BENCHMARK=ON
-        - make -j8
+        - ./ciscripts/macOS/CPU_Metal.sh
       name: "macOS11.2 | CPU_Metal"
+      env:
+        - MNNCITARGET=MACOSCPUMETAL
     - os: osx
       language: cpp
       osx_image: xcode11.2
       compiler: clang
       script:
-        - ./schema/generate.sh
-        - xcodebuild -configuration Release -project project/ios/MNN.xcodeproj
-      name: "iOS | CPU_Metal"
+        - ./ciscripts/macOS/CPU.sh
+      name: "macOS11.2 | CPU"
+      env:
+        - MNNCITARGET=MACOSCPU
+    - os: osx
+      language: cpp
+      osx_image: xcode11.2
+      compiler: clang
+      script:
+        - ./ciscripts/iOS/Xcode.sh
+      name: "iOS | CPU_Metal | Xcode"
+      env:
+        - MNNCITARGET=IOSCPUMETALXCODE
+    - os: osx
+      language: cpp
+      osx_image: xcode11.2
+      compiler: clang
+      script:
+        - ./ciscripts/iOS/CMake.sh
+      name: "iOS | CPU_Metal | CMake"
+      env:
+        - MNNCITARGET=IOSCPUMETALCMAKE
     - os: linux
       sudo: required
       dist: bionic
@@ -30,13 +47,89 @@ matrix:
         - sudo apt-get install ant libprotobuf-dev libvulkan-dev libglew-dev freeglut3-dev protobuf-compiler ocl-icd-opencl-dev libglfw3-dev
       compiler: gcc
       script:
-        - ./schema/generate.sh
-        - mkdir linuxbuild
-        - cd linuxbuild
-        - cmake ../ -DCMAKE_BUILD_TYPE=Release -DMNN_BUILD_TRAIN=ON -DMNN_BUILD_DEMO=ON -DMNN_BUILD_QUANTOOLS=ON -DMNN_EVALUATION=ON -DMNN_BUILD_CONVERTER=ON -DMNN_SUPPORT_TFLITE_QUAN=ON -DMNN_BUILD_TEST=ON -DMNN_OPENCL=ON -DMNN_VULKAN=ON -DMNN_OPENMP=ON -DMNN_BUILD_BENCHMARK=ON
-        - make -j8
-
-      name: "Linux | CPU_CL_OpenMP_Vulkan"
+        - ./ciscripts/Linux/CL_ThreadPool_Vulkan.sh
+      name: "Linux | CPU_CL_ThreadPool_Vulkan"
+      env:
+        - MNNCITARGET=LINUXCLTHREADPOOLVULKAN
+    - os: linux
+      sudo: required
+      dist: trusty
+      language: android
+      compiler: clang
+      android:
+        components:
+          - tools
+          - build-tools
+          - platform-tools
+          - android-21
+        licenses:
+          - 'android-sdk-preview-license-.+'
+          - 'android-sdk-license-.+'
+          - 'google-gdk-license-.+'
+      before_script:
+        - sudo apt-get install ant libprotobuf-dev protobuf-compiler
+        - sudo apt-get remove cmake
+        - echo yes | sdkmanager "ndk-bundle"
+        - echo yes | sdkmanager "cmake;3.10.2.4988404"
+        - export ANDROID_NDK=$ANDROID_HOME/ndk-bundle
+        - export PATH=/usr/local/android-sdk/cmake/3.10.2.4988404/bin/:$PATH
+      script:
+        - ./ciscripts/Android/32.sh
+      name: "Android | AArch32_ThreadPool_Vulkan"
+      env:
+        - MNNCITARGET=ARM32THREADPOOLVULKAN
+    - os: linux
+      sudo: required
+      dist: trusty
+      language: android
+      compiler: clang
+      android:
+        components:
+          - tools
+          - build-tools
+          - platform-tools
+          - android-21
+        licenses:
+          - 'android-sdk-preview-license-.+'
+          - 'android-sdk-license-.+'
+          - 'google-gdk-license-.+'
+      before_script:
+        - sudo apt-get install ant libprotobuf-dev protobuf-compiler
+        - echo yes | sdkmanager "ndk-bundle"
+        - echo yes | sdkmanager "cmake;3.10.2.4988404"
+        - export ANDROID_NDK=$ANDROID_HOME/ndk-bundle
+        - export PATH=/usr/local/android-sdk/cmake/3.10.2.4988404/bin/:$PATH
+      script:
+        - ./ciscripts/Android/32OMP.sh
+      name: "Android | AArch32_OMP_Vulkan"
+      env:
+        - MNNCITARGET=ARM32OMPVULKAN
+    - os: linux
+      sudo: required
+      dist: trusty
+      language: android
+      compiler: clang
+      android:
+        components:
+          - tools
+          - build-tools
+          - platform-tools
+          - android-21
+        licenses:
+          - 'android-sdk-preview-license-.+'
+          - 'android-sdk-license-.+'
+          - 'google-gdk-license-.+'
+      before_script:
+        - sudo apt-get install ant libprotobuf-dev protobuf-compiler
+        - echo yes | sdkmanager "ndk-bundle"
+        - echo yes | sdkmanager "cmake;3.10.2.4988404"
+        - export ANDROID_NDK=$ANDROID_HOME/ndk-bundle
+        - export PATH=/usr/local/android-sdk/cmake/3.10.2.4988404/bin/:$PATH
+      script:
+        - ./ciscripts/Android/64.sh
+      name: "Android | AArch64_ThreadPool_Vulkan"
+      env:
+        - MNNCITARGET=ARM64THREADPOOLVULKAN
     - os: linux
       sudo: required
       dist: trusty
@@ -53,14 +146,41 @@ matrix:
           - 'android-sdk-license-.+'
           - 'google-gdk-license-.+'
       before_script:
-        - sudo apt-get install ant libprotobuf-dev protobuf-compiler tree
+        - sudo apt-get install ant libprotobuf-dev protobuf-compiler
         - echo yes | sdkmanager "ndk-bundle"
         - echo yes | sdkmanager "cmake;3.10.2.4988404"
         - export ANDROID_NDK=$ANDROID_HOME/ndk-bundle
+        - export PATH=/usr/local/android-sdk/cmake/3.10.2.4988404/bin/:$PATH
+      script:
+        - ./ciscripts/Android/64OMP.sh
+      name: "Android | AArch64_OMP_Vulkan"
+      env:
+        - MNNCITARGET=ARM64OMPVULKAN
+    - os: windows
+      language: cpp
+      install:
+        - PowerShell -Command 'Set-ExecutionPolicy -ExecutionPolicy RemoteSigned'
+        - choco install ninja
+      script:
+        - ciscripts/Windows/X64.bat
+      name: "Windows | x64 CPU"
+      env:
+        - MNNCITARGET=WINX64
+        - CXX=cl.exe
+        - CXX_FOR_BUILD=cl.exe
+        - CC=cl.exe
+        - CC_FOR_BUILD=cl.exe
+    - os: windows
+      language: cpp
+      install:
+        - PowerShell -Command 'Set-ExecutionPolicy -ExecutionPolicy RemoteSigned'
+        - choco install ninja
       script:
-        - cd project/android/
-        - mkdir build_32
-        - cd build_32
-        - /usr/local/android-sdk/cmake/3.10.2.4988404/bin/cmake ../../../ -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI="armeabi-v7a" -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release -DANDROID_NATIVE_API_LEVEL=android-21 -DANDROID_TOOLCHAIN=clang -DMNN_BUILD_FOR_ANDROID_COMMAND=true -DMNN_DEBUG=false -DNATIVE_LIBRARY_OUTPUT=.
-        - make -j4
-      name: "Android | AArch32"
+        - ciscripts/Windows/X86.bat
+      name: "Windows | x86 CPU"
+      env:
+        - MNNCITARGET=WINX86
+        - CXX=cl.exe
+        - CXX_FOR_BUILD=cl.exe
+        - CC=cl.exe
+        - CC_FOR_BUILD=cl.exe

3rd_party/flatbuffers/docs/source/CONTRIBUTING.md

@@ -0,0 +1 @@
+../../CONTRIBUTING.md