From 1116cc37d915947ba8fd6dcbb549db79c24a073a Mon Sep 17 00:00:00 2001
From: jichang <jimmy.chang@amd.com>
Date: Mon, 23 Jun 2025 07:10:55 +0000
Subject: [PATCH] Deprecate HIPBLASLT_MATMUL_DESC_A_SCALE_POINTER_VEC_EXT and
 HIPBLASLT_MATMUL_DESC_B_SCALE_POINTER_VEC_EXT

---
 .../hipblaslt/library/include/hipblaslt/hipblaslt.h  |  7 +++++--
 .../amd_detail/rocblaslt/include/rocblaslt-types.h   |  2 --
 .../amd_detail/rocblaslt/src/rocblaslt_auxiliary.cpp | 12 ++----------
 .../library/src/amd_detail/rocblaslt/src/utility.cpp |  4 ----
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/projects/hipblaslt/library/include/hipblaslt/hipblaslt.h b/projects/hipblaslt/library/include/hipblaslt/hipblaslt.h
index 4dccce0a976..1e3daeed105 100644
--- a/projects/hipblaslt/library/include/hipblaslt/hipblaslt.h
+++ b/projects/hipblaslt/library/include/hipblaslt/hipblaslt.h
@@ -74,6 +74,11 @@
 #define HIPBLASLT_OPERATION_INVALID static_cast<hipblasOperation_t>(0)
 #define ROCBLASLT_COMPUTE_TYPE_INVALID static_cast<rocblaslt_compute_type>(255)
 
+#define HIPBLASLT_MATMUL_DESC_A_SCALE_POINTER_VEC_EXT \
+    static_assert(false, "HIPBLASLT_MATMUL_DESC_A_SCALE_POINTER_VEC_EXT is deprecated and not supported. Please set HIPBLASLT_MATMUL_DESC_A_SCALE_MODE as HIPBLASLT_MATMUL_MATRIX_SCALE_OUTER_VEC_32F instead.")
+#define HIPBLASLT_MATMUL_DESC_B_SCALE_POINTER_VEC_EXT \
+    static_assert(false, "HIPBLASLT_MATMUL_DESC_B_SCALE_POINTER_VEC_EXT is deprecated and not supported. Please set HIPBLASLT_MATMUL_DESC_B_SCALE_MODE as HIPBLASLT_MATMUL_MATRIX_SCALE_OUTER_VEC_32F instead.")
+
 /*! \ingroup types_module
  *  \brief Specify the enum type to set the postprocessing options for the epilogue.
  */
@@ -187,8 +192,6 @@ typedef enum {
   HIPBLASLT_MATMUL_DESC_B_SCALE_MODE = 32,                   /**<Scaling mode that defines how the matrix scaling factor for matrix B is interpreted. See hipblasLtMatmulMatrixScale_t */
   HIPBLASLT_MATMUL_DESC_COMPUTE_INPUT_TYPE_A_EXT = 100,     /**<Compute input A types. Defines the data type used for the input A of matrix multiply. */
   HIPBLASLT_MATMUL_DESC_COMPUTE_INPUT_TYPE_B_EXT,           /**<Compute input B types. Defines the data type used for the input B of matrix multiply. */
-  HIPBLASLT_MATMUL_DESC_A_SCALE_POINTER_VEC_EXT,        /**<Equivalent to HIPBLASLT_MATMUL_DESC_A_SCALE_POINTER but in vector. Default value: NULL Type: void* /const void* */
-  HIPBLASLT_MATMUL_DESC_B_SCALE_POINTER_VEC_EXT,        /**<Equivalent to HIPBLASLT_MATMUL_DESC_B_SCALE_POINTER but in vector. Default value: NULL Type: void* /const void* */
   HIPBLASLT_MATMUL_DESC_MAX,
 } hipblasLtMatmulDescAttributes_t;
 
diff --git a/projects/hipblaslt/library/src/amd_detail/rocblaslt/include/rocblaslt-types.h b/projects/hipblaslt/library/src/amd_detail/rocblaslt/include/rocblaslt-types.h
index 521cc45371b..c6004b0f3cb 100644
--- a/projects/hipblaslt/library/src/amd_detail/rocblaslt/include/rocblaslt-types.h
+++ b/projects/hipblaslt/library/src/amd_detail/rocblaslt/include/rocblaslt-types.h
@@ -364,8 +364,6 @@ typedef enum rocblaslt_matmul_desc_attributes_
     ROCBLASLT_MATMUL_DESC_B_SCALE_MODE               = 32,
     ROCBLASLT_MATMUL_DESC_COMPUTE_INPUT_TYPE_A_EXT   = 100,
     ROCBLASLT_MATMUL_DESC_COMPUTE_INPUT_TYPE_B_EXT,
-    ROCBLASLT_MATMUL_DESC_A_SCALE_POINTER_VEC_EXT,
-    ROCBLASLT_MATMUL_DESC_B_SCALE_POINTER_VEC_EXT,
     ROCBLASLT_MATMUL_DESC_MAX,
 } rocblaslt_matmul_desc_attributes;
 
diff --git a/projects/hipblaslt/library/src/amd_detail/rocblaslt/src/rocblaslt_auxiliary.cpp b/projects/hipblaslt/library/src/amd_detail/rocblaslt/src/rocblaslt_auxiliary.cpp
index 9b125641636..691f716566d 100644
--- a/projects/hipblaslt/library/src/amd_detail/rocblaslt/src/rocblaslt_auxiliary.cpp
+++ b/projects/hipblaslt/library/src/amd_detail/rocblaslt/src/rocblaslt_auxiliary.cpp
@@ -1035,11 +1035,8 @@ rocblaslt_status rocblaslt_matmul_desc_set_attribute(rocblaslt_matmul_desc
                     return rocblaslt_status_invalid_value;
                 }
                 break;
-            case ROCBLASLT_MATMUL_DESC_A_SCALE_POINTER_VEC_EXT:
-                matmulDesc->scaleAType = RocblasltContractionProblem::ScalingFormat::Vector;
             case ROCBLASLT_MATMUL_DESC_A_SCALE_POINTER:
-                if(matmulAttr == ROCBLASLT_MATMUL_DESC_A_SCALE_POINTER
-                   && matmulDesc->scaleAType == RocblasltContractionProblem::ScalingFormat::None)
+                if(matmulDesc->scaleAType == RocblasltContractionProblem::ScalingFormat::None)
                 {
                     matmulDesc->scaleAType = RocblasltContractionProblem::ScalingFormat::Scalar;
                 }
@@ -1087,11 +1084,8 @@ rocblaslt_status rocblaslt_matmul_desc_set_attribute(rocblaslt_matmul_desc
                     return rocblaslt_status_invalid_value;
                 }
                 break;
-            case ROCBLASLT_MATMUL_DESC_B_SCALE_POINTER_VEC_EXT:
-                matmulDesc->scaleBType = RocblasltContractionProblem::ScalingFormat::Vector;
             case ROCBLASLT_MATMUL_DESC_B_SCALE_POINTER:
-                if(matmulAttr == ROCBLASLT_MATMUL_DESC_B_SCALE_POINTER
-                   && matmulDesc->scaleBType == RocblasltContractionProblem::ScalingFormat::None)
+                if(matmulDesc->scaleBType == RocblasltContractionProblem::ScalingFormat::None)
                 {
                     matmulDesc->scaleBType = RocblasltContractionProblem::ScalingFormat::Scalar;
                 }
@@ -1351,7 +1345,6 @@ rocblaslt_status rocblaslt_matmul_desc_get_attribute(rocblaslt_matmul_desc
                 memcpy(buf, &matmulDesc->bias, sizeof(void*));
                 break;
             case ROCBLASLT_MATMUL_DESC_A_SCALE_POINTER:
-            case ROCBLASLT_MATMUL_DESC_A_SCALE_POINTER_VEC_EXT:
                 if(sizeWritten)
                     *sizeWritten = sizeof(void*);
                 if(sizeInBytes < sizeof(void*))
@@ -1397,7 +1390,6 @@ rocblaslt_status rocblaslt_matmul_desc_get_attribute(rocblaslt_matmul_desc
                 }
                 break;
             case ROCBLASLT_MATMUL_DESC_B_SCALE_POINTER:
-            case ROCBLASLT_MATMUL_DESC_B_SCALE_POINTER_VEC_EXT:
                 if(sizeWritten)
                     *sizeWritten = sizeof(void*);
                 if(sizeInBytes < sizeof(void*))
diff --git a/projects/hipblaslt/library/src/amd_detail/rocblaslt/src/utility.cpp b/projects/hipblaslt/library/src/amd_detail/rocblaslt/src/utility.cpp
index f8360364a88..04116234a20 100644
--- a/projects/hipblaslt/library/src/amd_detail/rocblaslt/src/utility.cpp
+++ b/projects/hipblaslt/library/src/amd_detail/rocblaslt/src/utility.cpp
@@ -228,10 +228,6 @@ const char* rocblaslt_matmul_desc_attributes_to_string(rocblaslt_matmul_desc_att
         return "MATMUL_DESC_AMAX_D_POINTER";
     case ROCBLASLT_MATMUL_DESC_EPILOGUE_AUX_DATA_TYPE:
         return "MATMUL_DESC_EPILOGUE_AUX_DATA_TYPE";
-    case ROCBLASLT_MATMUL_DESC_A_SCALE_POINTER_VEC_EXT:
-        return "MATMUL_DESC_A_SCALE_POINTER_VEC";
-    case ROCBLASLT_MATMUL_DESC_B_SCALE_POINTER_VEC_EXT:
-        return "MATMUL_DESC_B_SCALE_POINTER_VEC";
     case ROCBLASLT_MATMUL_DESC_COMPUTE_INPUT_TYPE_A_EXT:
         return "MATMUL_DESC_COMPUTE_INPUT_TYPE_A_EXT";
     case ROCBLASLT_MATMUL_DESC_COMPUTE_INPUT_TYPE_B_EXT: