experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace std::array with std::vector to address Mac build issues

Browse Source 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2018-03-08 23:27:19 +00:00
parent 2d67d32e58
commit a513929490
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tensorflow/core/kernels/draw_bounding_box_op.cc
View File

@ -52,6 +52,7 @@ class DrawBoundingBoxesOp : public OpKernel {
const int64 batch_size = images.dim_size(0); const int64 batch_size = images.dim_size(0);
const int64 height = images.dim_size(1); const int64 height = images.dim_size(1);
const int64 width = images.dim_size(2); const int64 width = images.dim_size(2);
const int64 default_color_table_length = 10;
// 0: yellow // 0: yellow
// 1: blue // 1: blue
@ -63,12 +64,21 @@ class DrawBoundingBoxesOp : public OpKernel {
// 7: navy blue // 7: navy blue
// 8: aqua // 8: aqua
// 9: fuchsia // 9: fuchsia
std::vector<std::array<float, 4>> color_table = { float default_color_table[default_color_table_length][4] = {
{1, 1, 0, 1}, {0, 0, 1, 1}, {1, 0, 0, 1}, {0, 1, 0, 1}, {1, 1, 0, 1}, {0, 0, 1, 1}, {1, 0, 0, 1}, {0, 1, 0, 1},
{0.5, 0, 0.5, 1}, {0.5, 0.5, 0, 1}, {0.5, 0, 0, 1}, {0, 0, 0.5, 1}, {0.5, 0, 0.5, 1}, {0.5, 0.5, 0, 1}, {0.5, 0, 0, 1}, {0, 0, 0.5, 1},
{0, 1, 1, 1}, {1, 0, 1, 1}, {0, 1, 1, 1}, {1, 0, 1, 1},
}; };
std::vector<std::vector<float>> color_table;
for (int64 i = 0; i < default_color_table_length; i++) {
std::vector<float> color_value(4);
for (int64 j = 0; j < 4; j++) {
color_value[j] = default_color_table[i][j];
}
color_table.emplace_back(color_value);
}
// Reset first color channel to 1 if image is GRY. // Reset first color channel to 1 if image is GRY.
// For GRY images, this means all bounding boxes will be white. // For GRY images, this means all bounding boxes will be white.
if (depth == 1) { if (depth == 1) {
@ -89,8 +99,11 @@ class DrawBoundingBoxesOp : public OpKernel {
auto colors = colors_tensor.matrix<float>(); auto colors = colors_tensor.matrix<float>();
for (int64 i = 0; i < colors.dimension(0); i++) { for (int64 i = 0; i < colors.dimension(0); i++) {
color_table.emplace_back(std::array<float, 4>{ std::vector<float> color_value(4);
colors(i, 0), colors(i, 1), colors(i, 2), colors(i, 3)}); for (int64 j = 0; j < 4; j++) {
color_value[j] = colors(i, j);
}
color_table.emplace_back(color_value);
} }
} }
} }