From 931555e20adba9cd98eadb0914f00771833a47ea Mon Sep 17 00:00:00 2001
From: chenmingkai <chenmingkai1@huawei.com>
Date: Mon, 25 Mar 2024 07:05:45 +0000
Subject: [PATCH 1/2] =?UTF-8?q?!106=20[Sec]=E5=A2=9E=E5=8A=A0=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E7=BC=96=E8=AF=91=E9=80=89=E9=A1=B9=20Merge=20pull=20?=
 =?UTF-8?q?request=20!106=20from=20chenmingkai/cmake?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmake/config.cmake | 2 +-
 setup.py           | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cmake/config.cmake b/cmake/config.cmake
index ef0e1cc0..2105c2cc 100644
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -8,7 +8,7 @@ if(NOT DEFINED vendor_name)
 endif()
 # read ASCEND_HOME_PATH from environment variable, change ASCEND_CANN_PACKAGE_PATH to ASCEND_HOME_PATH
 if (DEFINED ENV{ASCEND_AICPU_PATH})
-  set(ASCEND_CANN_PACKAGE_PATH $ENV{ASCEND_HOME_PATH})
+  set(ASCEND_CANN_PACKAGE_PATH $ENV{ASCEND_AICPU_PATH})
 endif()
 if(NOT DEFINED ASCEND_CANN_PACKAGE_PATH)
   set(ASCEND_CANN_PACKAGE_PATH
diff --git a/setup.py b/setup.py
index 585b7cee..5a1b35d6 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,13 @@ ext1 = extension.NpuExtension(
         '-D__FILENAME__="$$(notdir $$(abspath $$<))"',
         "-fprofile-arcs",
         "-ftest-coverage",
+        "-fPIC",
+        "-fstack-protector-all",
+    ],
+    extra_link_args=[
+        "-Wl,-z,relro",
+        "-Wl,-z,now",
+        "-s"
     ],
     libraries=["gcov"],
 )
-- 
Gitee


From bd5133791c3edd1ea8866bf0fb340cd857eadc06 Mon Sep 17 00:00:00 2001
From: chenmingkai <chenmingkai1@huawei.com>
Date: Mon, 25 Mar 2024 17:01:03 +0800
Subject: [PATCH 2/2] modify nms3d, fix SCA problem

---
 ads/common/ops/kernels/op_kernel/nms3d.cpp | 21 ++++++++++-----------
 cmake/config.cmake                         | 10 +++++-----
 cmake/func.cmake                           |  4 ++--
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/ads/common/ops/kernels/op_kernel/nms3d.cpp b/ads/common/ops/kernels/op_kernel/nms3d.cpp
index f52853a7..35e32fdd 100644
--- a/ads/common/ops/kernels/op_kernel/nms3d.cpp
+++ b/ads/common/ops/kernels/op_kernel/nms3d.cpp
@@ -328,17 +328,16 @@ private:
         Point center_a(boxATensor.GetValue(0), boxATensor.GetValue(1));
         Point center_b(boxBTensor.GetValue(0), boxBTensor.GetValue(1));
 
-        Point box_a_corners[5];
-        box_a_corners[0].set(a_x1, a_y1);
-        box_a_corners[1].set(a_x2, a_y1);
-        box_a_corners[2].set(a_x2, a_y2);
-        box_a_corners[3].set(a_x1, a_y2);
-
-        Point box_b_corners[5];
-        box_b_corners[0].set(b_x1, b_y1);
-        box_b_corners[1].set(b_x2, b_y1);
-        box_b_corners[2].set(b_x2, b_y2);
-        box_b_corners[3].set(b_x1, b_y2);
+        Point box_a_corners[5] = {{a_x1, a_y1},
+                                  {a_x2, a_y1},
+                                  {a_x2, a_y2},
+                                  {a_x1, a_y2},
+                                  {a_x1, a_y1}};
+        Point box_b_corners[5] = {{b_x1, b_y1},
+                                  {b_x2, b_y1},
+                                  {b_x2, b_y2},
+                                  {b_x1, b_y2},
+                                  {b_x1, b_y1}};
 
         // get oriented corners
         LocalTensor<float> angleLocal = angleBuf.Get<float>();
diff --git a/cmake/config.cmake b/cmake/config.cmake
index 2105c2cc..aab24346 100644
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -19,12 +19,12 @@ endif()
 get_filename_component(ASCEND_PATH ${ASCEND_CANN_PACKAGE_PATH}
         DIRECTORY)
 ## find the target pointed by the soft link
-if(EXISTS ${ASCEND_PATH}/latest/compiler)
-  file(READ_SYMLINK ${ASCEND_PATH}/latest/compiler ASCEND_COMPILER_PATH)
-  if(NOT IS_ABSOLUTE ${ASCEND_COMPILER_PATH})
-    set(ASCEND_COMPILER_PATH ${ASCEND_PATH}/latest/${ASCEND_COMPILER_PATH})
+if(EXISTS ${ASCEND_PATH}/latest/opp)
+  file(READ_SYMLINK ${ASCEND_PATH}/latest/opp ASCEND_OPP_PATH)
+  if(NOT IS_ABSOLUTE ${ASCEND_OPP_PATH})
+    set(ASCEND_OPP_PATH ${ASCEND_PATH}/latest/${ASCEND_OPP_PATH})
   endif ()
-  get_filename_component(CANN_PATHS ${ASCEND_COMPILER_PATH}
+  get_filename_component(CANN_PATHS ${ASCEND_OPP_PATH}
           DIRECTORY)
 endif()
 
diff --git a/cmake/func.cmake b/cmake/func.cmake
index e37977f3..865f7654 100644
--- a/cmake/func.cmake
+++ b/cmake/func.cmake
@@ -53,10 +53,10 @@ function(opbuild)
     endif()
   endif()
   if(NOT EXISTS ${CANN_INCLUDE_PATH})
-      message(FATAL_ERROR "CANN include path not found: ${CANN_INCLUDE_PATH}")
+      message(FATAL_ERROR "CANN include path not found: ${CANN_PATHS}")
   endif()
     if(NOT EXISTS ${CANN_LIB_PATH})
-        message(FATAL_ERROR "CANN lib path not found: ${CANN_LIB_PATH}")
+        message(FATAL_ERROR "CANN lib path not found: ${CANN_PATHS}")
   endif ()
   execute_process(
     COMMAND
-- 
Gitee