diff --git a/cmake/external/xpu.cmake b/cmake/external/xpu.cmake index ad4471071e1fc113fadebdd033a0ca9cebe73083..8021d2a6f80c6c9eb4ee1a5ede8b73cfce508079 100644 --- a/cmake/external/xpu.cmake +++ b/cmake/external/xpu.cmake @@ -10,7 +10,7 @@ set(XPU_RT_LIB_NAME "libxpurt.so") if(NOT DEFINED XPU_BASE_URL) set(XPU_BASE_URL_WITHOUT_DATE "https://baidu-kunlun-product.cdn.bcebos.com/KL-SDK/klsdk-dev") - set(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20220719") + set(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20220722") else() set(XPU_BASE_URL "${XPU_BASE_URL}") endif() @@ -19,7 +19,7 @@ endif() if(NOT DEFINED XPU_XDNN_BASE_URL) set(XPU_XDNN_BASE_URL_WITHOUT_DATE "https://klx-sdk-release-public.su.bcebos.com/xdnn/dev") - set(XPU_XDNN_BASE_URL "${XPU_XDNN_BASE_URL_WITHOUT_DATE}/20220719") + set(XPU_XDNN_BASE_URL "${XPU_XDNN_BASE_URL_WITHOUT_DATE}/20220722") else() set(XPU_XDNN_BASE_URL "${XPU_XDNN_BASE_URL}") endif() diff --git a/paddle/fluid/operators/elementwise/elementwise_add_op_xpu.cc b/paddle/fluid/operators/elementwise/elementwise_add_op_xpu.cc index 74dca5b57481f2d259f251b6aec03aadfd4f97b4..7b2c72d081262210c8b1cb5222623efdd7a4e695 100644 --- a/paddle/fluid/operators/elementwise/elementwise_add_op_xpu.cc +++ b/paddle/fluid/operators/elementwise/elementwise_add_op_xpu.cc @@ -1,11 +1,8 @@ -/* Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. - +/* Copyright (c) 2022 PaddlePaddle Authors. 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. @@ -74,7 +71,7 @@ class ElementwiseAddGradXPUKernel : public ElemwiseGradKernel { int ret = xpu::reduce_sum(dev_ctx.x_context(), reinterpret_cast(dz_data), - reinterpret_cast(dx_data), + reinterpret_cast(dx->data()), dz_vector, reduce_dims); PADDLE_ENFORCE_XDNN_SUCCESS(ret, "reduce_sum"); diff --git a/paddle/fluid/operators/pool_op_xpu.cc b/paddle/fluid/operators/pool_op_xpu.cc index 591559001309aa5fbf7932c53aed15e3bc062407..bfa638e5bde5dcfc5f40741945b8f9adb75c4308 100644 --- a/paddle/fluid/operators/pool_op_xpu.cc +++ b/paddle/fluid/operators/pool_op_xpu.cc @@ -21,23 +21,6 @@ namespace operators { using framework::Tensor; -xpu::Pooling_t XPUPoolingType(const std::string& pooltype, - bool exclusive, - bool is_test) { - if (pooltype == "max") { - return xpu::Pooling_t::MAX_WITHOUT_INDEX; - } else if (pooltype == "avg") { - if (exclusive) { - return xpu::Pooling_t::AVG_WITHOUT_PAD; - } else { - return xpu::Pooling_t::AVG_WITH_PAD; - } - } else { - PADDLE_THROW(platform::errors::InvalidArgument( - "Pool op only supports 2D and 3D input.")); - } -} - template class PoolXPUKernel : public framework::OpKernel { using XPUType = typename XPUTypeTrait::Type;