Merge branch 'PaddlePaddle:develop' into adapter_aoa

Author: xingmingyyj

.github/actions/check-bypass/action.yml

@@ -22,7 +22,7 @@ runs:
       uses: PFCCLab/ci-bypass@v1
       with:
         github-token: ${{ inputs.github-token }}
-        non-pull-request-event-strategy: 'always-skipped'
+        non-pull-request-event-strategy: 'never-skipped'
         type: 'composite'
         composite-rule: |
           {

.github/workflows/Api-Benchmark-baseline.yml

@@ -0,0 +1,111 @@
+name: Api-benchmark-baseline
+
+on:
+  workflow_dispatch:
+    inputs:
+      PR_ID:
+        required: false
+        type: string
+      COMMIT_ID:
+        required: false
+        type: string
+      job-name:
+        required: true
+        default: 'api-benchmark'
+        type: choice
+        options:
+          - api-benchmark
+          - others
+  schedule:
+    - cron: '0 21 * * *'
+    - cron: '0 22 * * 3'
+
+permissions: read-all
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  clone:
+    name: Api benchmark clone
+    uses: ./.github/workflows/_Clone-linux.yml
+    with:
+      clone_dir: Paddle-build
+      is_pr: 'false'
+
+  build-docker:
+    name: Api benchmark build docker
+    needs: clone
+    uses: ./.github/workflows/docker.yml
+    with:
+      clone_dir: Paddle-build
+      task: build
+
+  build:
+    name: Api benchmark build
+    if: github.event_name == 'schedule' && github.event.schedule == '0 21 * * *'
+    needs: [clone, build-docker]
+    uses: ./.github/workflows/_Linux-build.yml
+    with:
+      docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
+      is_pr: 'false'
+
+  api-benchmark-baseline-schedule:
+    name: Api benchmark baseline
+    strategy:
+      matrix:
+        run-labels: [api-bm-20, api-bm-27]
+    uses: ./.github/workflows/_Api-Benchmark.yml
+    needs: [clone, build-docker, build]
+    with:
+      docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
+      baseline: 'true'
+      run-labels: ${{ matrix.run-labels }}
+
+  api-benchmark-baseline-pr:
+    name: Api benchmark baseline
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.job-name == 'api-benchmark'
+    strategy:
+      matrix:
+        run-labels: [api-bm-20, api-bm-27]
+    uses: ./.github/workflows/_Api-Benchmark.yml
+    needs: [clone, build-docker]
+    with:
+      docker_build_image: ${{ needs.build-docker.outputs.docker_build_image }}
+      baseline: 'true'
+      MANUALLY_PR_ID: ${{ inputs.PR_ID }}
+      MANUALLY_COMMIT_ID: ${{ inputs.COMMIT_ID }}
+      run-labels: ${{ matrix.run-labels }}
+
+  test1:
+    runs-on: ubuntu-latest
+    if: github.event.schedule == '0 0 * * *'
+    steps:
+      - name: Test
+        run: |
+          echo "test1"
+
+  test2:
+    runs-on: ubuntu-latest
+    if: github.event.schedule == '0 21 * * *'
+    steps:
+      - name: Test
+        run: |
+          echo "test2"
+
+  test3:
+    runs-on: ubuntu-latest
+    if: github.event.schedule == '0 22 * * 3'
+    steps:
+      - name: Test
+        run: |
+          echo "test3"
+
+  test4:
+    runs-on: ubuntu-latest
+    if: github.event.schedule == '0 21 * * 1'
+    steps:
+      - name: Test
+        run: |
+          echo "test4"

.github/workflows/_Api-Benchmark.yml

@@ -9,10 +9,24 @@ on:
       can-skip:
         type: string
         required: false
+      baseline:
+        type: string
+        required: false
+        default: "false"
+      MANUALLY_PR_ID:
+        type: string
+        required: false
+      MANUALLY_COMMIT_ID:
+        type: string
+        required: false
+      run-labels:
+        type: string
+        required: false
+        default: "api-bm"
 
 env:
-  PR_ID: ${{ github.event.pull_request.number }}
-  COMMIT_ID: ${{ github.event.pull_request.head.sha }}
+  PR_ID: ${{ github.event.pull_request.number || '0' }}
+  COMMIT_ID: ${{ github.event.pull_request.head.sha || github.sha }}
   work_dir: /paddle
   PADDLE_ROOT: /paddle
   TASK: paddle-CI-${{ github.event.pull_request.number }}-api-benchmark
@@ -41,6 +55,7 @@ jobs:
     if: ${{ needs.check-bypass.outputs.can-skip != 'true' }}
     runs-on:
       group: Api-bm
+      labels: [self-hosted, "${{ inputs.run-labels }}"]
     steps:
       - name: Determine the runner
         run: |
@@ -118,7 +133,17 @@ jobs:
           cd ./PaddleTest/framework/e2e/api_benchmark_new
           cp /paddle/PTSTools/Uploader/apibm_config.yml .
           source ${{ github.workspace }}/../../../proxy
-          ${python} -m pip install https://paddle-github-action.bj.bcebos.com/PR/build/${PR_ID}/${COMMIT_ID}/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
+          if [[ "${{ inputs.baseline }}" == "true" ]];then
+            if [[ "${{ inputs.MANUALLY_PR_ID }}" == "" ]]; then
+              export pr_wheel_link=https://paddle-github-action.bj.bcebos.com/PR/build/${{ github.event.pull_request.number }}/${{ github.event.pull_request.head.sha }}/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
+            else
+              export pr_wheel_link=https://paddle-github-action.bj.bcebos.com/PR/build/${{ inputs.MANUALLY_PR_ID }}/${{ inputs.MANUALLY_COMMIT_ID }}/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
+            fi
+            ${python} -m pip install $pr_wheel_link
+            ${python} runner_ci_action.py --yaml ../yaml/api_benchmark_fp32.yml --baseline_whl_link $pr_wheel_link
+            exit 0
+          fi
+          ${python} -m pip install $wheel_link
           if [ ${core_index} -eq -1 ];then
             ${python} runner_ci_action.py --yaml ../yaml/api_benchmark_fp32.yml --core_index 2
           else

.github/workflows/check-bypass.yml

@@ -33,7 +33,7 @@ jobs:
         uses: PFCCLab/ci-bypass@v1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          non-pull-request-event-strategy: 'always-skipped'
+          non-pull-request-event-strategy: 'never-skipped'
           type: 'composite'
           composite-rule: |
             {

cmake/external/gtest.cmake

@@ -126,6 +126,7 @@ else()
                -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
                -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
                -DCMAKE_INSTALL_PREFIX=${GTEST_INSTALL_DIR}
+               -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
                -DCMAKE_POSITION_INDEPENDENT_CODE=ON
                -DBUILD_GMOCK=ON
                -Dgtest_disable_pthreads=ON

paddle/fluid/distributed/collective/deep_ep/deep_ep.cpp

@@ -1685,11 +1685,11 @@ Buffer::low_latency_dispatch(
   EP_HOST_ASSERT(!(async && return_recv_hook));
   if (!return_recv_hook) stream_wait(launch_stream, compute_stream);
 
-  EP_HOST_ASSERT(
-      !(expertwise_scale.has_value() && use_fp8) &&
-      "expertwise_scale and use_fp8 can not arise at the same time.");
   auto return_x_dtype = phi::DataType::BFLOAT16;
   if (use_fp8) {
+    if (expertwise_scale.has_value()) {
+      EP_HOST_ASSERT(expertwise_scale.value().size(0) == num_experts);
+    }
     return_x_dtype = phi::DataType::FLOAT8_E4M3FN;
   } else if (expertwise_scale.has_value()) {
     EP_HOST_ASSERT(expertwise_scale.value().size(0) == num_experts);
@@ -1721,7 +1721,7 @@ Buffer::low_latency_dispatch(
 
   float* packed_recv_x_scales_ptr = nullptr;
 
-  if (use_fp8) {
+  if (use_fp8 && !expertwise_scale.has_value()) {
     EP_HOST_ASSERT((num_ranks * num_max_dispatch_tokens_per_rank) % 4 == 0 &&
                    "TMA requires the number of tokens to be multiple of 4");
     packed_recv_x_scales =

paddle/fluid/distributed/collective/deep_ep/kernels/internode_ll.cu

@@ -23,14 +23,15 @@
 #include <infiniband/mlx5dv.h>
 #include <non_abi/device/threadgroup/nvshmemi_common_device_defines.cuh>
 #include <device_host_transport/nvshmem_common_ibgda.h>
+#ifdef __NVCC__
+#include <cub/cub.cuh>
+#endif
 // clang-format on
-
 #include "paddle/fluid/distributed/collective/deep_ep/kernels/configs.cuh"
 #include "paddle/fluid/distributed/collective/deep_ep/kernels/exception.cuh"
 #include "paddle/fluid/distributed/collective/deep_ep/kernels/ibgda_device.cuh"
 #include "paddle/fluid/distributed/collective/deep_ep/kernels/launch.cuh"
 #include "paddle/phi/kernels/funcs/aligned_vector.h"
-
 namespace deep_ep {
 
 namespace internode_ll {
@@ -189,7 +190,32 @@ __global__ __launch_bounds__(
       // Note(zkk)
       // create a run_deepep_loop, so I need not modify Deepep's code any more.
       int run_deepep_loop = 1;
-      if (use_expertwise_scale) {
+      if (use_expertwise_scale && kUseFP8) {  // w4afp8
+        run_deepep_loop = 0;
+        for (int ii = 0; ii < num_topk; ii++) {
+          int tmp_id = topk_idx[ii + token_idx * num_topk];
+          float scale = expertwise_scale[tmp_id];
+          for (int i = thread_id; i < hidden_bf16_int4; i += num_threads) {
+            auto int4_value = __ldg(x_int4 + i);
+            auto bf16_values = reinterpret_cast<nv_bfloat16*>(&int4_value);
+            int2 int2_value;
+            phi::AlignedVector<phi::dtype::float8_e4m3fn, 8> res_vec;
+            const float max_bound = 448.f;
+            const float min_bound = -448.f;
+            for (int j = 0; j < 8; j++) {
+              float quant_value =
+                  max_bound * scale * static_cast<float>(bf16_values[j]);
+              quant_value = quant_value > max_bound ? max_bound : quant_value;
+              quant_value = quant_value < min_bound ? min_bound : quant_value;
+              res_vec[j] = static_cast<phi::dtype::float8_e4m3fn>(quant_value);
+            }
+            phi::Store(res_vec,
+                       reinterpret_cast<phi::dtype::float8_e4m3fn*>(rdma_x) +
+                           (ii + token_idx * num_topk) * num_bytes_per_msg +
+                           sizeof(int4) + i * sizeof(res_vec));
+          }
+        }
+      } else if (use_expertwise_scale) {  // w4aint8
         run_deepep_loop = 0;
         for (int ii = 0; ii < num_topk; ii++) {
           int tmp_id = topk_idx[ii + token_idx * num_topk];
@@ -224,7 +250,7 @@ __global__ __launch_bounds__(
         // Read
         auto int4_value = __ldg(x_int4 + i);
 
-        if (kUseFP8) {
+        if (kUseFP8 && !use_expertwise_scale) {
           // Calculate local amax
           auto bf16_values = reinterpret_cast<nv_bfloat16*>(&int4_value);
           float fp32_values[kNumElemsPerRead];
@@ -502,7 +528,7 @@ LOW_LATENCY_DISPATCH_RECV:
                          st_na_global);
 
       // Copy scales
-      if (kUseFP8) {
+      if (kUseFP8 && !use_expertwise_scale) {
         const auto src_scales = reinterpret_cast<float*>(
             reinterpret_cast<uint8_t*>(src_data) + hidden_bytes);
         const auto dst_scales =

paddle/phi/backends/custom/custom_context.h

@@ -32,12 +32,6 @@ struct GpuDevice;
 
 namespace phi {
 
-// #ifndef BLAS_HANDLE_TYPE
-// #define BLAS_HANDLE_TYPE void*
-// // #else
-// // // using cublasHandle_t = struct cublasContext*;
-// #endif
-
 class CustomContext : public DeviceContext,
                       public TypeInfoTraits<DeviceContext, CustomContext> {
  public:

paddle/phi/infermeta/unary.cc

@@ -6333,7 +6333,7 @@ void WeightQuantizeInferMeta(const MetaTensor& x,
       common::errors::InvalidArgument(
           "The x tensor of quant op must be 2D, but got[%d]", x_dims.size()));
 
-  if (algo == "w4a8") {
+  if (algo == "w4a8" || algo == "w4afp8") {
     PADDLE_ENFORCE_EQ(
         x_dims[0] % 32,
         0,
@@ -6379,10 +6379,12 @@ void WeightQuantizeInferMeta(const MetaTensor& x,
     dim_out = std::vector<int64_t>({x_dims[1] / 2, x_dims[0]});
   } else if (algo == "w4a8") {
     dim_out = vectorize(x_dims);
+  } else if (algo == "w4afp8") {
+    dim_out = vectorize(x_dims);
   } else {
     PADDLE_THROW(common::errors::InvalidArgument(
         "The algo must be in ['weight_only_int8', 'weight_only_int4', "
-        "'llm.int8', 'w4a8'], but got[%s]",
+        "'llm.int8', 'w4a8', 'w4afp8'], but got[%s]",
         algo));
   }
   out->set_dims(common::make_ddim(dim_out));

paddle/phi/kernels/gpu/weight_quantize_kernel.cu

@@ -147,10 +147,17 @@ void WeightQuantizeKernel(const Context& dev_ctx,
                                      weight_shape,
                                      arch,
                                      algo);
+  } else if (algo == "w4afp8") {
+    weight_permute_gpu_w4afp8<Context>(dev_ctx,
+                                       x.data<int8_t>(),
+                                       out->data<int8_t>(),
+                                       weight_shape,
+                                       arch,
+                                       algo);
   } else {
     PADDLE_FATAL(
         "The algo must be in ['weight_only_int8', 'weight_only_int4', "
-        "'llm.int8', 'w4a8'], but got[%s]",
+        "'llm.int8', 'w4a8', 'w4afp8'], but got[%s]",
         algo);
   }
 }