From 40ab64a2debfae8a0b6160d39fd0e4934ad1b60c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Wed, 5 Dec 2018 09:48:32 +0900 Subject: [PATCH] Remove deperecated kernel header (#3860) Remove deperecated kernel header in include/kernel/acl Signed-off-by: Hyeongseok Oh --- include/kernel/acl/Add.h | 44 ------------------------ include/kernel/acl/Concatenation.h | 42 ----------------------- include/kernel/acl/Conv2D.h | 52 ---------------------------- include/kernel/acl/DepthwiseConv2D.h | 52 ---------------------------- include/kernel/acl/FullyConnected.h | 45 ------------------------ include/kernel/acl/Mul.h | 43 ----------------------- include/kernel/acl/Pooling.h | 66 ------------------------------------ include/kernel/acl/ReLU.h | 40 ---------------------- include/kernel/acl/ReLU6.h | 45 ------------------------ include/kernel/acl/Reshape.h | 37 -------------------- include/kernel/acl/Softmax.h | 42 ----------------------- include/kernel/acl/nnfw_kernel_acl.h | 30 ---------------- 12 files changed, 538 deletions(-) delete mode 100644 include/kernel/acl/Add.h delete mode 100644 include/kernel/acl/Concatenation.h delete mode 100644 include/kernel/acl/Conv2D.h delete mode 100644 include/kernel/acl/DepthwiseConv2D.h delete mode 100644 include/kernel/acl/FullyConnected.h delete mode 100644 include/kernel/acl/Mul.h delete mode 100644 include/kernel/acl/Pooling.h delete mode 100644 include/kernel/acl/ReLU.h delete mode 100644 include/kernel/acl/ReLU6.h delete mode 100644 include/kernel/acl/Reshape.h delete mode 100644 include/kernel/acl/Softmax.h delete mode 100644 include/kernel/acl/nnfw_kernel_acl.h diff --git a/include/kernel/acl/Add.h b/include/kernel/acl/Add.h deleted file mode 100644 index 73a7d75..0000000 --- a/include/kernel/acl/Add.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_ADD_H__ -#define __NNFW_KERNEL_ACL_ADD_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool addFloat32(const float* inputData1, const nnfw::rt::Shape& inputShape1, - const float* inputData2, const nnfw::rt::Shape& inputShape2, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -namespace neon { - -bool addFloat32(const float* inputData1, const nnfw::rt::Shape& inputShape1, - const float* inputData2, const nnfw::rt::Shape& inputShape2, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -} // namespace neon - -} // namespace acl -} // namespace kernal -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_ADD_H__ diff --git a/include/kernel/acl/Concatenation.h b/include/kernel/acl/Concatenation.h deleted file mode 100644 index 3e51851..0000000 --- a/include/kernel/acl/Concatenation.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_CONCATENATION_H__ -#define __NNFW_KERNEL_ACL_CONCATENATION_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool concatenationFloat32(const std::vector& inputDataPtrs, - const std::vector& inputShapes, int32_t axis, - float* outputData, const nnfw::rt::Shape& outputShape); - -namespace neon { - -bool concatenationFloat32(const std::vector& inputDataPtrs, - const std::vector& inputShapes, int32_t axis, - float* outputData, const nnfw::rt::Shape& outputShape); - -} // namespace neon - -} // namespace acl -} // namespace kernal -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_CONCATENATION_H__ diff --git a/include/kernel/acl/Conv2D.h b/include/kernel/acl/Conv2D.h deleted file mode 100644 index 5f2cd4d..0000000 --- a/include/kernel/acl/Conv2D.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_CONV2D_H__ -#define __NNFW_KERNEL_ACL_CONV2D_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool convFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - const float* filterData, const nnfw::rt::Shape& filterShape, - const float* biasData, const nnfw::rt::Shape& biasShape, - int32_t padding_left, int32_t padding_right, - int32_t padding_top, int32_t padding_bottom, - int32_t stride_width, int32_t stride_height, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -namespace neon { - -bool convFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - const float* filterData, const nnfw::rt::Shape& filterShape, - const float* biasData, const nnfw::rt::Shape& biasShape, - int32_t padding_left, int32_t padding_right, - int32_t padding_top, int32_t padding_bottom, - int32_t stride_width, int32_t stride_height, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -} // namespace neon - -} // namespace acl -} // namespace kernal -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_CONV2D_H__ diff --git a/include/kernel/acl/DepthwiseConv2D.h b/include/kernel/acl/DepthwiseConv2D.h deleted file mode 100644 index b6576d2..0000000 --- a/include/kernel/acl/DepthwiseConv2D.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_DEPTHWISECONV2D_H__ -#define __NNFW_KERNEL_ACL_DEPTHWISECONV2D_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool depthwiseConvFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - const float* filterData, const nnfw::rt::Shape& filterShape, - const float* biasData, const nnfw::rt::Shape& biasShape, - int32_t padding_left, int32_t padding_right, - int32_t padding_top, int32_t padding_bottom, - int32_t stride_width, int32_t stride_height, - int32_t depth_multiplier, int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -namespace neon { - -bool depthwiseConvFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - const float* filterData, const nnfw::rt::Shape& filterShape, - const float* biasData, const nnfw::rt::Shape& biasShape, - int32_t padding_left, int32_t padding_right, - int32_t padding_top, int32_t padding_bottom, - int32_t stride_width, int32_t stride_height, - int32_t depth_multiplier, int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -} // namespace neon - -} // namespace acl -} // namespace kernel -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_DEPTHWISECONV2D_H__ diff --git a/include/kernel/acl/FullyConnected.h b/include/kernel/acl/FullyConnected.h deleted file mode 100644 index 9695d63..0000000 --- a/include/kernel/acl/FullyConnected.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_FULLYCONNECTED_H__ -#define __NNFW_KERNEL_ACL_FULLYCONNECTED_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool fullyConnectedFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - const float* weightsData, const nnfw::rt::Shape& weightsShape, - const float* biasData, const nnfw::rt::Shape& biasShape, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -namespace neon { - -bool fullyConnectedFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - const float* weightsData, const nnfw::rt::Shape& weightsShape, - const float* biasData, const nnfw::rt::Shape& biasShape, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); -} // namespace neon - -} // namespace acl -} // namespace kernel -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_FULLYCONNECTED_H__ diff --git a/include/kernel/acl/Mul.h b/include/kernel/acl/Mul.h deleted file mode 100644 index 7e0c15c..0000000 --- a/include/kernel/acl/Mul.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_MUL_H__ -#define __NNFW_KERNEL_ACL_MUL_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool mulFloat32(const float* inputData1, const nnfw::rt::Shape& inputShape1, - const float* inputData2, const nnfw::rt::Shape& inputShape2, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -namespace neon { - -bool mulFloat32(const float* inputData1, const nnfw::rt::Shape& inputShape1, - const float* inputData2, const nnfw::rt::Shape& inputShape2, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -} // namespace neon -} // namespace acl -} // namespace kernal -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_MUL_H__ diff --git a/include/kernel/acl/Pooling.h b/include/kernel/acl/Pooling.h deleted file mode 100644 index 0205f99..0000000 --- a/include/kernel/acl/Pooling.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_POOLING_H__ -#define __NNFW_KERNEL_ACL_POOLING_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool maxPoolFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - int32_t padding_left, int32_t padding_right, - int32_t padding_top, int32_t padding_bottom, - int32_t stride_width, int32_t stride_height, - int32_t filter_width, int32_t filter_height, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -bool averagePoolFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - int32_t padding_left, int32_t padding_right, - int32_t padding_top, int32_t padding_bottom, - int32_t stride_width, int32_t stride_height, - int32_t filter_width, int32_t filter_height, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -namespace neon { - -bool maxPoolFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - int32_t padding_left, int32_t padding_right, - int32_t padding_top, int32_t padding_bottom, - int32_t stride_width, int32_t stride_height, - int32_t filter_width, int32_t filter_height, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -bool averagePoolFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - int32_t padding_left, int32_t padding_right, - int32_t padding_top, int32_t padding_bottom, - int32_t stride_width, int32_t stride_height, - int32_t filter_width, int32_t filter_height, - int32_t activation, - float* outputData, const nnfw::rt::Shape& outputShape); - -} // namespace neon - -} // namespace acl -} // namespace kernel -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_POOLING_H__ diff --git a/include/kernel/acl/ReLU.h b/include/kernel/acl/ReLU.h deleted file mode 100644 index 20278bf..0000000 --- a/include/kernel/acl/ReLU.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_RELU_H__ -#define __NNFW_KERNEL_ACL_RELU_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool reluFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - float* outputData, const nnfw::rt::Shape& outputShape); - -namespace neon { - - bool reluFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - float* outputData, const nnfw::rt::Shape& outputShape); - -} // namespace neon - -} // namespace acl -} // namespace kernel -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_RELU_H__ diff --git a/include/kernel/acl/ReLU6.h b/include/kernel/acl/ReLU6.h deleted file mode 100644 index d68c792..0000000 --- a/include/kernel/acl/ReLU6.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_RELU6H__ -#define __NNFW_KERNEL_ACL_RELU6H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool relu6Float32(const float* inputData, const nnfw::rt::Shape& inputShape, - float* outputData, const nnfw::rt::Shape& outputShape); - -bool relu6LUFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - float* outputData, const nnfw::rt::Shape& outputShape); -namespace neon { - - bool relu6Float32(const float* inputData, const nnfw::rt::Shape& inputShape, - float* outputData, const nnfw::rt::Shape& outputShape); - - bool relu6LUFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - float* outputData, const nnfw::rt::Shape& outputShape); - -} // namespace neon - -} // namespace acl -} // namespace kernel -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_RELU6H__ diff --git a/include/kernel/acl/Reshape.h b/include/kernel/acl/Reshape.h deleted file mode 100644 index 418db73..0000000 --- a/include/kernel/acl/Reshape.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_RESHAPE_H__ -#define __NNFW_KERNEL_ACL_RESHAPE_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool reshapeGeneric(const void* inputData, const nnfw::rt::Shape& inputShape, - void* outputData, const nnfw::rt::Shape& outputShape); -namespace neon { -bool reshapeGeneric(const void* inputData, const nnfw::rt::Shape& inputShape, - void* outputData, const nnfw::rt::Shape& outputShape); -} // namespace neon - -} // namespace acl -} // namespace kernel -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_RESHAPE_H__ diff --git a/include/kernel/acl/Softmax.h b/include/kernel/acl/Softmax.h deleted file mode 100644 index d1f7daf..0000000 --- a/include/kernel/acl/Softmax.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_SOFTMAX_H__ -#define __NNFW_KERNEL_ACL_SOFTMAX_H__ - -#include - -namespace nnfw { -namespace kernel { -namespace acl { - -bool softmaxFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - const float beta, - float* outputData, const nnfw::rt::Shape& outputShape); - -namespace neon { - -bool softmaxFloat32(const float* inputData, const nnfw::rt::Shape& inputShape, - const float beta, - float* outputData, const nnfw::rt::Shape& outputShape); - -} // namespace neon - -} // namespace acl -} // namespace kernel -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_SOFTMAX_H__ diff --git a/include/kernel/acl/nnfw_kernel_acl.h b/include/kernel/acl/nnfw_kernel_acl.h deleted file mode 100644 index 7197502..0000000 --- a/include/kernel/acl/nnfw_kernel_acl.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -#ifndef __NNFW_KERNEL_ACL_H__ -#define __NNFW_KERNEL_ACL_H__ - -namespace nnfw { -namespace kernel { -namespace acl { - -void Initialize(void); - -} // namespace acl -} // namespace kernel -} // namespace nnfw - -#endif // __NNFW_KERNEL_ACL_H__ -- 2.7.4