From 582ea371ce8286c19e9ee3d066b7b4671beee34d Mon Sep 17 00:00:00 2001
From: Gemfield <gemfield@civilnet.cn>
Date: Tue, 19 Mar 2019 18:39:24 +0800
Subject: [PATCH] Enhance upsample scale value retrieval with raw_data API
 (#839)

---
 tools/onnx/onnx2ncnn.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/onnx/onnx2ncnn.cpp b/tools/onnx/onnx2ncnn.cpp
index b2b2777f5..51be718fa 100644
--- a/tools/onnx/onnx2ncnn.cpp
+++ b/tools/onnx/onnx2ncnn.cpp
@@ -1562,8 +1562,15 @@ int main(int argc, char** argv)
             else
             {
                 const onnx::TensorProto& scales_tp = weights[node.input(1)];
-                const float* shape_data = scales_tp.float_data().data();
-                for (int j=0; j<scales_tp.float_data_size(); j++)
+                const float* shape_data = scales_tp.has_raw_data() ? (const float*)scales_tp.raw_data().data() : scales_tp.float_data().data();
+                
+                int float_data_size = scales_tp.float_data_size();
+                //float data is None, use raw data instead
+                if (float_data_size == 0) {
+                    float_data_size = scales_tp.dims().Get(0);
+                }
+
+                for (int j=0; j<float_data_size; j++)
                 {
                     scales.push_back(shape_data[j]);
                 }