project: sync with upstream

Author: jeffzhou2000

ggml/src/ggml-hexagon/ggml-hexagon.cpp

@@ -645,6 +645,7 @@ static constexpr const qnn_op_caps ggmlqnn_k_op_caps[] = {
         {false, GGML_OP_UPSCALE, 0, nullptr},
         {false, GGML_OP_PAD, 0, nullptr},
         {false, GGML_OP_PAD_REFLECT_1D, 0, nullptr},
+        {false, GGML_OP_ROLL, 0, nullptr},
         {false, GGML_OP_ARANGE, 0, nullptr},
         {false, GGML_OP_TIMESTEP_EMBEDDING, 0, nullptr},
         {false, GGML_OP_ARGSORT, 0, nullptr},
@@ -753,6 +754,7 @@ static constexpr const hexagon_op_caps ggmlhexagon_k_op_caps[] = {
         {false, GGML_OP_UPSCALE, 0, nullptr, nullptr},
         {false, GGML_OP_PAD, 0, nullptr, nullptr},
         {false, GGML_OP_PAD_REFLECT_1D, 0, nullptr, nullptr},
+        {false, GGML_OP_ROLL, 0, nullptr, nullptr},
         {false, GGML_OP_ARANGE, 0, nullptr, nullptr},
         {false, GGML_OP_TIMESTEP_EMBEDDING, 0, nullptr, nullptr},
         {false, GGML_OP_ARGSORT, 0, nullptr, nullptr},

scripts/build-run-android.sh

@@ -16,6 +16,7 @@ set -e
 PWD=`pwd`
 PROJECT_HOME_PATH=`pwd`
 PROJECT_ROOT_PATH=${PROJECT_HOME_PATH}
+HOST_CPU_COUNTS=`cat /proc/cpuinfo | grep "processor" | wc | awk '{print int($1)}'`
 
 #running path on Android phone
 REMOTE_PATH=/data/local/tmp/
@@ -239,7 +240,7 @@ function build_arm64
 {
     cmake -H. -B./out/android -DCMAKE_BUILD_TYPE=Release -DGGML_OPENMP=OFF -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=latest -DCMAKE_C_FLAGS=-march=armv8.7-a -DGGML_HEXAGON=ON -DLLAMA_CURL=OFF -DQNN_SDK_PATH=${QNN_SDK_PATH} -DHEXAGON_SDK_PATH=${HEXAGON_SDK_PATH} -DHTP_ARCH_VERSION=${HTP_ARCH_VERSION}
     cd out/android
-    make -j16
+    make -j${HOST_CPU_COUNTS}
     show_pwd
 
     cd -
@@ -250,7 +251,7 @@ function build_arm64_debug
 {
     cmake -H. -B./out/android -DCMAKE_BUILD_TYPE=Debug -DGGML_OPENMP=OFF -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=latest -DCMAKE_C_FLAGS=-march=armv8.7-a -DGGML_HEXAGON=ON -DLLAMA_CURL=OFF -DQNN_SDK_PATH=${QNN_SDK_PATH} -DHEXAGON_SDK_PATH=${HEXAGON_SDK_PATH} -DHTP_ARCH_VERSION=${HTP_ARCH_VERSION}
     cd out/android
-    make -j16
+    make -j${HOST_CPU_COUNTS}
     show_pwd
 
     cd -