fix the issue of build libappbuilder.so

Author: tim202503

src/LibAppBuilder.cpp

@@ -34,6 +34,10 @@
 #include "Utils/Utils.hpp"
 #endif
 
+#if !defined(__ANDROID__)
+  #include <execution>
+#endif
+
 using namespace qnn;
 using namespace qnn::log;
 using namespace qnn::tools;
@@ -63,7 +67,7 @@ std::string getFileNameFromPath(const std::string& path) {
     return path.substr(pos + 1);
 }
 
-
+#if !defined(__ANDROID__)
 void warmup_parallel_stl()
 {
     static std::once_flag once;
@@ -75,7 +79,7 @@ void warmup_parallel_stl()
     });
     QNN_WAR("warmup_parallel_stl");
 }
-
+#endif
 
 std::unique_ptr<sample_app::QnnSampleApp> initQnnSampleApp(std::string cachedBinaryPath, std::string backEndPath, std::string systemLibraryPath,
                                                            bool loadFromCachedBinary, std::vector<LoraAdapter>& lora_adapters,
@@ -132,8 +136,10 @@ std::unique_ptr<sample_app::QnnSampleApp> initQnnSampleApp(std::string cachedBin
     }
   }
 
-  if ((input_data_type == "float") || (output_data_type == "float")) // We need 'std::transform' only for ‘float’ mode. It need data conversation.
+#if !defined(__ANDROID__)
+  if ((input_data_type == "float") || (output_data_type == "float")) // We need 'std::transform' only for �float� mode. It need data conversation.
       warmup_parallel_stl();
+#endif
 
   sg_qnnInterface = qnnFunctionPointers.qnnInterface;
   std::unique_ptr<sample_app::QnnSampleApp> app(new sample_app::QnnSampleApp(qnnFunctionPointers, "null", opPackagePaths, sg_backendHandle, "null",

src/Utils/DataUtil.cpp

@@ -24,7 +24,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#if defined(__aarch64__) || defined(_M_ARM64)
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(__ANDROID__)
   #include <arm_neon.h>
 #endif
 #ifdef _WIN32
@@ -396,6 +396,7 @@ static inline uint32_t datautil::fp32_to_bits(float f) {
 #endif
 }
 
+#if !defined(__ANDROID__)
 // Enabling fp16 execution
 static inline uint16_t datautil::fp16_ieee_from_fp32_value(float f) {
  #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) || defined(__GNUC__) && !defined(__STRICT_ANSI__)
@@ -422,7 +423,22 @@ static inline uint16_t datautil::fp16_ieee_from_fp32_value(float f) {
      const uint32_t nonsign = exp_bits + mantissa_bits;
      return (sign >> 16) | (shl1_w > UINT32_C(0xFF000000) ? UINT16_C(0x7E00) : nonsign);
  }
+#endif
 
+#if defined(__ANDROID__)
+static inline uint16_t datautil::fp16_ieee_from_fp32_hw(float f)
+{
+    float32x4_t v32 = vdupq_n_f32(f);
+    //VCVT F16.F32
+    float16x4_t v16 = vcvt_f16_f32(v32);
+    __fp16 h = v16[0];
+    uint16_t out;
+    memcpy(&out, &h, sizeof(out));
+    return out;
+}
+#endif
+
+#if !defined(__ANDROID__)
 static inline uint16_t datautil::fp16_ieee_from_fp32_value_v2(float f) noexcept {
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) || defined(__GNUC__) && !defined(__STRICT_ANSI__)
     constexpr float scale_to_inf  = 0x1.0p+112f;
@@ -523,6 +539,7 @@ void datautil::float32_to_float16_parallel(uint16_t* __restrict dst,
                    [](float x) noexcept -> uint16_t { return fp16_ieee_from_fp32_value_v2(x); });
 
 }
+#endif
 
 // Enabling fp16 execution
 bool datautil::float32ToFloatN(uint8_t* out,
@@ -535,13 +552,17 @@ bool datautil::float32ToFloatN(uint8_t* out,
       }
 
       if(bitWidth == 16){
-  #ifdef PARALLEL   // wd. Improve performance through std::transform and NEON.
+  #if defined(PARALLEL) && !defined(__ANDROID__)// wd. Improve performance through std::transform and NEON.
         auto* dst = reinterpret_cast<uint16_t*>(out);  
         float32_to_float16_parallel(dst, in, numElements);
   #else
           uint16_t *temp = (uint16_t *)out;
           for(size_t i = 0; i < numElements; i++){
-              temp[i] = fp16_ieee_from_fp32_value(in[i]);
+              #if defined(__ANDROID__)
+                  temp[i] = fp16_ieee_from_fp32_hw(in[i]);
+              #else
+                  temp[i] = fp16_ieee_from_fp32_value(in[i]);
+              #endif
           }
   #endif //__hexagon__
       }

src/Utils/DataUtil.hpp

@@ -88,6 +88,7 @@ StatusCode writeBinaryToFile(std::string fileDir,
                              size_t bufferSize);
 #endif
 
+#if !defined(__ANDROID__)
 // Enabling fp16 execution
 static inline uint16_t fp16_ieee_from_fp32_value(float f);
 
@@ -108,6 +109,10 @@ void float32_to_float16_dispatch(uint16_t* __restrict dst,
 void float32_to_float16_parallel(uint16_t* __restrict dst,
                                  const float*   __restrict src,
                                  size_t n) noexcept;
+#endif
+#if defined(__ANDROID__)
+static inline uint16_t fp16_ieee_from_fp32_hw(float f);
+#endif
 
 static inline float fp16_ieee_to_fp32_value(uint16_t h);
 static inline uint32_t fp32_to_bits(float f);