Merge pull request PaddlePaddle#858 from graphcore/develop_to_develop-ipu_8845a1cf6a51b4fc3c80641ce03e049d3aadc487

[AUTO PR] Pulling [develop] into [develop-ipu] [2022-07-01 03:05:17+08:00]

Author: gglin001

SECURITY.md

@@ -24,7 +24,7 @@ PaddlePaddle security team attaches great importance to the security of the fram
 
 ### Reporting vulnerabilities
 
-We encourage responsible disclosure of security issues to PaddlePaddle and please email reports about any security issues you find to security@paddlepaddle.org.
+We encourage responsible disclosure of security issues to PaddlePaddle and please email reports about any security issues you find to paddle-security@baidu.com.
 
 
 

SECURITY_cn.md

@@ -20,7 +20,7 @@
 
 ### 报告安全问题
 
-我们鼓励向飞桨负责任地披露安全问题，请将所发现的安全问题发送电子邮件到 security@paddlepaddle.org。
+我们鼓励向飞桨负责任地披露安全问题，请将所发现的安全问题发送电子邮件到 paddle-security@baidu.com。
 
 在安全团队收到邮件后将会及时与您沟通并反馈问题修复进度。
 

paddle/fluid/eager/amp_auto_cast.h

@@ -15,6 +15,7 @@
 #pragma once
 
 #include "paddle/fluid/eager/api/generated/fluid_generated/dygraph_forward_api.h"
+#include "paddle/fluid/eager/api/manual/fluid_manual/dygraph_forward_api.h"
 #include "paddle/fluid/framework/convert_utils.h"
 
 namespace egr {

paddle/fluid/eager/api/CMakeLists.txt

@@ -1,3 +1,4 @@
+add_subdirectory(manual)
 add_subdirectory(utils)
 add_subdirectory(generated)
 

paddle/fluid/eager/api/manual/CMakeLists.txt

@@ -0,0 +1,9 @@
+if(NOT ((NOT WITH_PYTHON) AND ON_INFER))
+  add_subdirectory(fluid_manual)
+  set(fluid_manual_functions
+      ${fluid_manual_functions}
+      PARENT_SCOPE)
+  set(fluid_manual_nodes
+      ${fluid_manual_nodes}
+      PARENT_SCOPE)
+endif()

paddle/fluid/eager/api/manual/fluid_manual/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_subdirectory(forwards)
+add_subdirectory(nodes)
+set(fluid_manual_functions
+    ${fluid_manual_functions}
+    PARENT_SCOPE)
+set(fluid_manual_nodes
+    ${fluid_manual_nodes}
+    PARENT_SCOPE)

paddle/fluid/eager/api/manual/fluid_manual/dygraph_forward_api.h

@@ -0,0 +1,44 @@
+// 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.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+#include "glog/logging.h"
+#include "paddle/fluid/eager/autograd_meta.h"
+#include "paddle/fluid/eager/utils.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/imperative/tracer.h"
+#include "paddle/phi/api/all.h"
+
+std::tuple<paddle::experimental::Tensor,
+           paddle::experimental::Tensor,
+           paddle::experimental::Tensor,
+           paddle::experimental::Tensor,
+           paddle::experimental::Tensor,
+           paddle::experimental::Tensor,
+           paddle::experimental::Tensor,
+           paddle::experimental::Tensor>
+fused_gate_attention_dygraph_function(
+    const paddle::experimental::Tensor& Query,
+    const paddle::experimental::Tensor& Key,
+    const paddle::experimental::Tensor& QueryWeight,
+    const paddle::experimental::Tensor& KeyWeight,
+    const paddle::experimental::Tensor& ValueWeight,
+    const paddle::experimental::Tensor& QKVWeight,
+    const paddle::experimental::Tensor& NonbatchedBias,
+    const paddle::experimental::Tensor& SrcMask,
+    const paddle::experimental::Tensor& GateWeight,
+    const paddle::experimental::Tensor& GateBias,
+    const paddle::experimental::Tensor& OutLinearWeight,
+    const paddle::experimental::Tensor& OutLinearBias,
+    const paddle::framework::AttributeMap& attr_map);

paddle/fluid/eager/api/manual/fluid_manual/forwards/CMakeLists.txt

@@ -0,0 +1,10 @@
+cc_library(
+  fused_gate_attention_fwd_func
+  SRCS fused_gate_attention_fwd_func.cc
+  DEPS ${eager_deps} ${fluid_deps} ${GLOB_OP_LIB} ${GLOB_OPERATOR_DEPS})
+
+add_dependencies(fused_gate_attention_fwd_func eager_codegen)
+
+set(fluid_manual_functions
+    fused_gate_attention_fwd_func
+    PARENT_SCOPE)