From 23ea2cbf890ac2c22da194d60dbc40a9360620c4 Mon Sep 17 00:00:00 2001 From: liuqi Date: Fri, 14 Jun 2019 19:56:02 +0800 Subject: [PATCH] Fix bug of generating OpenCL kernel source file. --- .../opencl-kernel/opencl_kernel_configure.bzl | 83 +++++++++---------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/repository/opencl-kernel/opencl_kernel_configure.bzl b/repository/opencl-kernel/opencl_kernel_configure.bzl index 545af54d..a39a1703 100644 --- a/repository/opencl-kernel/opencl_kernel_configure.bzl +++ b/repository/opencl-kernel/opencl_kernel_configure.bzl @@ -21,49 +21,48 @@ def _opencl_encrypt_kernel_impl(repository_ctx): if ret.return_code == 0: unused_var = repository_ctx.path(Label("//:.git/refs/heads/master")) - ret = repository_ctx.execute( - ["test", "-f", "%s/mace/ops/opencl/cl/common.cl" % mace_root_path], + repository_ctx.execute( + ["test", "-f", "%s/mace/ops/opencl/cl/common.h" % mace_root_path], ) - if ret.return_code == 0: - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/activation.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/addn.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/batch_norm.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/batch_to_space.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/bias_add.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/buffer_to_image.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/buffer_transform.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/channel_shuffle.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/common.h")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/concat.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d_1x1.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d_1x1_buffer.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d_3x3.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d_buffer.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/crop.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/deconv_2d.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/depthwise_deconv2d.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/depth_to_space.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/depthwise_conv2d.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/depthwise_conv2d_buffer.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/eltwise.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/fully_connected.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/lstmcell.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/matmul.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/pad.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/pooling.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/pooling_buffer.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/reduce.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/resize_bicubic.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/resize_bilinear.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/resize_nearest_neighbor.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/split.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/softmax.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/softmax_buffer.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/space_to_batch.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/space_to_depth.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/sqrdiff_mean.cl")) - unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/winograd_transform.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/activation.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/addn.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/batch_norm.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/batch_to_space.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/bias_add.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/buffer_to_image.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/buffer_transform.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/channel_shuffle.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/common.h")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/concat.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d_1x1.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d_1x1_buffer.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d_3x3.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/conv_2d_buffer.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/crop.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/deconv_2d.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/depthwise_deconv2d.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/depth_to_space.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/depthwise_conv2d.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/depthwise_conv2d_buffer.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/eltwise.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/fully_connected.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/lstmcell.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/matmul.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/pad.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/pooling.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/pooling_buffer.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/reduce.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/resize_bicubic.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/resize_bilinear.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/resize_nearest_neighbor.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/split.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/softmax.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/softmax_buffer.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/space_to_batch.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/space_to_depth.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/sqrdiff_mean.cl")) + unused_var = repository_ctx.path(Label("//:mace/ops/opencl/cl/winograd_transform.cl")) python_bin_path = repository_ctx.which("python") -- GitLab