blue-oil · bo-mergebot · Mar 12, 2020 · Mar 3, 2020 · Mar 4, 2020 · Mar 4, 2020
diff --git a/blueoil/converter/templates/include/dlk_test.h b/blueoil/converter/templates/include/dlk_test.h
@@ -23,7 +23,7 @@ limitations under the License.
 #include <sstream>
 #include <fstream>
 #include <vector>
-#include "global.h"
+#include "types.h"
 
 template <class T_SIZE, class T>
 struct Diff {

diff --git a/blueoil/converter/templates/include/func/add.h b/blueoil/converter/templates/include/func/add.h
@@ -17,7 +17,6 @@ limitations under the License.
 
 #include <functional>
 
-#include "global.h"
 #include "tensor_view.h"
 #include "func/impl/binary_op.h"
 #include "time_measurement.h"

diff --git a/blueoil/converter/templates/include/func/average_pool.h b/blueoil/converter/templates/include/func/average_pool.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef DLK_FUNC_AVERAGE_POOL_H_INCLUDED
 #define DLK_FUNC_AVERAGE_POOL_H_INCLUDED
 
-#include "global.h"
+#include "types.h"
 #include "tensor_view.h"
 
 struct avg_pooling_parameters {

diff --git a/blueoil/converter/templates/include/func/batch_normalization.h b/blueoil/converter/templates/include/func/batch_normalization.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef DLK_FUNC_BATCH_NORMALIZATION_H_INCLUDED
 #define DLK_FUNC_BATCH_NORMALIZATION_H_INCLUDED
 
-#include "global.h"
+#include "types.h"
 #include "tensor_view.h"
 
 void func_BatchNormalizationOptimized(const TensorView<T_FLOAT, MemoryLayout::NHWC>& input,

diff --git a/blueoil/converter/templates/include/func/concat_on_depth.h b/blueoil/converter/templates/include/func/concat_on_depth.h
@@ -19,7 +19,7 @@ limitations under the License.
 #include <tuple>
 #include <type_traits>
 
-#include "global.h"
+#include "types.h"
 #include "tensor_view.h"
 #include "time_measurement.h"
 

diff --git a/blueoil/converter/templates/include/func/depth_to_space.h b/blueoil/converter/templates/include/func/depth_to_space.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef DLK_FUNC_DEPTH_TO_SPACE_H_INCLUDED
 #define DLK_FUNC_DEPTH_TO_SPACE_H_INCLUDED
 
-#include "global.h"
+#include "types.h"
 #include "time_measurement.h"
 #include "tensor_view.h"
 
@@ -48,8 +48,9 @@ inline void func_DepthToSpace(const TensorView<float, MemoryLayout::NHWC>& input
   Measurement::Stop();
 }
 
-inline void func_DepthToSpace(const TensorView<QUANTIZED_PACKED, MemoryLayout::HWChBCl>& input,
-    const TensorView<QUANTIZED_PACKED, MemoryLayout::HWChBCl>& output,
+template <typename T>
+void func_DepthToSpace(const TensorView<QuantizedPacked<T>, MemoryLayout::HWChBCl>& input,
+    const TensorView<QuantizedPacked<T>, MemoryLayout::HWChBCl>& output,
     T_UINT a, T_UINT b, T_UINT kernel_size, T_UINT stride) {
   Measurement::Start("DepthToSpace");
 
@@ -79,8 +80,9 @@ inline void func_DepthToSpace(const TensorView<QUANTIZED_PACKED, MemoryLayout::H
   Measurement::Stop();
 }
 
-inline void func_DepthToSpace(const TensorView<QUANTIZED_PACKED, MemoryLayout::ChHWBCl>& input,
-    const TensorView<QUANTIZED_PACKED, MemoryLayout::ChHWBCl>& output,
+template <typename T>
+void func_DepthToSpace(const TensorView<QuantizedPacked<T>, MemoryLayout::ChHWBCl>& input,
+    const TensorView<QuantizedPacked<T>, MemoryLayout::ChHWBCl>& output,
     T_UINT a, T_UINT b, T_UINT kernel_size, T_UINT stride) {
   Measurement::Start("DepthToSpace");
 

diff --git a/blueoil/converter/templates/include/func/leaky_relu.h b/blueoil/converter/templates/include/func/leaky_relu.h
@@ -16,7 +16,6 @@ limitations under the License.
 #ifndef DLK_FUNC_LEAKY_RELU_H_INCLUDED
 #define DLK_FUNC_LEAKY_RELU_H_INCLUDED
 
-#include "global.h"
 #include "tensor_view.h"
 #include "func/impl/unary_op.h"
 

diff --git a/blueoil/converter/templates/include/func/matmul.h b/blueoil/converter/templates/include/func/matmul.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef DLK_FUNC_MATMUL_H_INCLUDED
 #define DLK_FUNC_MATMUL_H_INCLUDED
 
-#include "global.h"
+#include "types.h"
 #include "tensor_view.h"
 
 void func_Matmul(const TensorView<T_FLOAT, MemoryLayout::NC>& input,

diff --git a/blueoil/converter/templates/include/func/max.h b/blueoil/converter/templates/include/func/max.h
@@ -16,7 +16,6 @@ limitations under the License.
 #ifndef DLK_FUNC_MAX_H_INCLUDED
 #define DLK_FUNC_MAX_H_INCLUDED
 
-#include "global.h"
 #include "tensor_view.h"
 #include "func/impl/binary_op.h"
 #include "time_measurement.h"

diff --git a/blueoil/converter/templates/include/func/max_pool.h b/blueoil/converter/templates/include/func/max_pool.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef DLK_FUNC_MAX_POOLING_H_INCLUDED
 #define DLK_FUNC_MAX_POOLING_H_INCLUDED
 
-#include "global.h"
+#include "types.h"
 #include "tensor_view.h"
 
 struct max_pooling_parameters {

diff --git a/blueoil/converter/templates/include/func/minimum.h b/blueoil/converter/templates/include/func/minimum.h
@@ -16,7 +16,6 @@ limitations under the License.
 #ifndef DLK_FUNC_MINIMUM_H_INCLUDED
 #define DLK_FUNC_MINIMUM_H_INCLUDED
 
-#include "global.h"
 #include "tensor_view.h"
 #include "func/impl/binary_op.h"
 #include "time_measurement.h"

diff --git a/blueoil/converter/templates/include/func/mul.h b/blueoil/converter/templates/include/func/mul.h
@@ -16,7 +16,6 @@ limitations under the License.
 #ifndef DLK_FUNC_MUL_H_INCLUDED
 #define DLK_FUNC_MUL_H_INCLUDED
 
-#include "global.h"
 #include "tensor_view.h"
 #include "func/impl/binary_op.h"
 #include "time_measurement.h"

diff --git a/blueoil/converter/templates/include/func/pad.h b/blueoil/converter/templates/include/func/pad.h
@@ -1,7 +1,7 @@
 #ifndef DLK_FUNC_PAD_H_INCLUDED
 #define DLK_FUNC_PAD_H_INCLUDED
 
-#include "global.h"
+#include "types.h"
 #include "tensor_view.h"
 
 void func_Pad(const TensorView<T_FLOAT, MemoryLayout::NHWC>& input,

diff --git a/blueoil/converter/templates/include/func/real_div.h b/blueoil/converter/templates/include/func/real_div.h
@@ -16,7 +16,6 @@ limitations under the License.
 #ifndef DLK_FUNC_REAL_DIV_H
 #define DLK_FUNC_REAL_DIV_H
 
-#include "global.h"
 #include "tensor_view.h"
 #include "func/impl/binary_op.h"
 #include "time_measurement.h"

diff --git a/blueoil/converter/templates/include/func/relu.h b/blueoil/converter/templates/include/func/relu.h
@@ -16,7 +16,6 @@ limitations under the License.
 #ifndef DLK_FUNC_RELU_H_INCLUDED
 #define DLK_FUNC_RELU_H_INCLUDED
 
-#include "global.h"
 #include "tensor_view.h"
 #include "func/impl/unary_op.h"
 

diff --git a/blueoil/converter/templates/include/func/resize_nearest_neighbor.h b/blueoil/converter/templates/include/func/resize_nearest_neighbor.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef DLK_FUNC_RESIZE_NEAREST_NEIGHBOR_H_INCLUDED
 #define DLK_FUNC_RESIZE_NEAREST_NEIGHBOR_H_INCLUDED
 
-#include "global.h"
+#include "types.h"
 #include "time_measurement.h"
 #include "tensor_view.h"
 
@@ -51,8 +51,9 @@ inline void func_ResizeNearestNeighbor(const TensorView<float, MemoryLayout::NHW
 }
 
 
-inline void func_ResizeNearestNeighbor(const TensorView<QUANTIZED_PACKED, MemoryLayout::HWChBCl>& input,
-    const TensorView<QUANTIZED_PACKED, MemoryLayout::HWChBCl>& output) {
+template <typename T>
+void func_ResizeNearestNeighbor(const TensorView<QuantizedPacked<T>, MemoryLayout::HWChBCl>& input,
+    const TensorView<QuantizedPacked<T>, MemoryLayout::HWChBCl>& output) {
   Measurement::Start("ResizeNearestNeighbor");
 
   const auto in_shape = input.get_shape();
@@ -83,8 +84,9 @@ inline void func_ResizeNearestNeighbor(const TensorView<QUANTIZED_PACKED, Memory
 }
 
 
-inline void func_ResizeNearestNeighbor(const TensorView<QUANTIZED_PACKED, MemoryLayout::ChHWBCl>& input,
-    const TensorView<QUANTIZED_PACKED, MemoryLayout::ChHWBCl>& output) {
+template <typename T>
+void func_ResizeNearestNeighbor(const TensorView<QuantizedPacked<T>, MemoryLayout::ChHWBCl>& input,
+    const TensorView<QuantizedPacked<T>, MemoryLayout::ChHWBCl>& output) {
   Measurement::Start("ResizeNearestNeighbor");
 
   const auto in_shape = input.get_shape();

diff --git a/blueoil/converter/templates/include/func/softmax.h b/blueoil/converter/templates/include/func/softmax.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef DLK_FUNC_SOFTMAX_H_INCLUDED
 #define DLK_FUNC_SOFTMAX_H_INCLUDED
 
-#include "global.h"
+#include "types.h"
 #include "tensor_view.h"
 
 void func_Softmax(const TensorView<T_FLOAT, MemoryLayout::NC>& input,

diff --git a/blueoil/converter/templates/include/func/sub.h b/blueoil/converter/templates/include/func/sub.h
@@ -16,7 +16,6 @@ limitations under the License.
 #ifndef DLK_FUNC_SUB_H_INCLUDED
 #define DLK_FUNC_SUB_H_INCLUDED
 
-#include "global.h"
 #include "tensor_view.h"
 #include "func/impl/binary_op.h"
 #include "time_measurement.h"

diff --git a/blueoil/converter/templates/include/types.h b/blueoil/converter/templates/include/types.h
@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef TYPES_H
 #define TYPES_H
 
+#include <climits>
 #include <type_traits>
 #include "func/impl/pop_count.h"
 

diff --git a/blueoil/converter/templates/src/func/arm_neon/batch_normalization.cpp b/blueoil/converter/templates/src/func/arm_neon/batch_normalization.cpp
@@ -16,7 +16,7 @@ limitations under the License.
 #include <cmath>
 #include <memory>
 
-#include "global.h"
+#include "types.h"
 #include "func/batch_normalization.h"
 #include "time_measurement.h"
 

diff --git a/blueoil/converter/templates/src/func/generic/batch_normalization.cpp b/blueoil/converter/templates/src/func/generic/batch_normalization.cpp
@@ -16,7 +16,7 @@ limitations under the License.
 #include <cmath>
 #include <memory>
 
-#include "global.h"
+#include "types.h"
 #include "func/batch_normalization.h"
 #include "time_measurement.h"
 

diff --git a/blueoil/converter/templates/src/func/matmul.cpp b/blueoil/converter/templates/src/func/matmul.cpp
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "global.h"
+#include "types.h"
 #include "func/matmul.h"
 #include "time_measurement.h"
 

diff --git a/blueoil/converter/templates/src/func/max_pool.cpp b/blueoil/converter/templates/src/func/max_pool.cpp
@@ -14,7 +14,7 @@ limitations under the License.
 ==============================================================================*/
 #include <cassert>
 #include <cstring>
-#include "global.h"
+#include "types.h"
 #include "func/max_pool.h"
 #include "time_measurement.h"
 

diff --git a/blueoil/converter/templates/src/func/pad.cpp b/blueoil/converter/templates/src/func/pad.cpp
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-#include "global.h"
+#include "types.h"
 #include "func/pad.h"
 #include "time_measurement.h"
 

diff --git a/blueoil/converter/templates/src/func/softmax.cpp b/blueoil/converter/templates/src/func/softmax.cpp
@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <cmath>
 
-#include "global.h"
+#include "types.h"
 #include "func/softmax.h"
 #include "time_measurement.h"
 

diff --git a/blueoil/converter/templates/src/func/x86_avx/batch_normalization.cpp b/blueoil/converter/templates/src/func/x86_avx/batch_normalization.cpp
@@ -16,7 +16,7 @@ limitations under the License.
 #include <cmath>
 #include <memory>
 
-#include "global.h"
+#include "types.h"
 #include "func/batch_normalization.h"
 #include "time_measurement.h"
 

diff --git a/blueoil/converter/templates/src/write_to_file.cpp b/blueoil/converter/templates/src/write_to_file.cpp
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "types.h"
 #include <string>
 #include <fstream>