Merge branch 'alibaba:master' into master

Fix: Data Sorting Function Could Crash Application Due to Missing Checks in pymnn/test/playground/requirements.txt

.trivyignore

@@ -0,0 +1,15 @@
+**/*.md
+**/*.min.js
+**/*.min.css
+**/*.svg
+**/*.png
+**/*.jpg
+**/*.jpeg
+**/*.gif
+**/*.woff
+**/*.woff2
+**/*.map
+**/*.webp
+**/*.ico
+**/*.ttf
+**/*.eot

apps/Android/MnnTaoAvatar/gradle.properties

@@ -0,0 +1,23 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true

benchmark/scripts/tvm/ios_bert.py

@@ -1,3 +1,4 @@
+import ast
 import tvm
 from tvm import relay, autotvm
 from tvm import rpc, relay
@@ -60,7 +61,7 @@ def prepare_input():
     img_path = download_testdata(img_url, "cat.png", module="data")
     synset_path = download_testdata(synset_url, synset_name, module="data")
     with open(synset_path) as f:
-        synset = eval(f.read())
+        synset = ast.literal_eval(f.read())
         image = Image.open(img_path).resize((224, 224))
 
     image = np.array(image) - np.array([123.0, 117.0, 104.0])

pymnn/test/playground/requirements.txt

@@ -1,6 +1,6 @@
 jedi==0.17.2
 watchdog==0.10.6
-numpy==1.16.4
+numpy>=1.22.0
 flatbuffers==1.12
 validators==0.14.2
 opencv-python==4.8.1.78