From c744b6d556248bd1b7092ddb1b6dd3dfffa00865 Mon Sep 17 00:00:00 2001
From: AravindanC <aravindan.cheruvally@amd.com>
Date: Fri, 3 Nov 2023 19:23:11 -0700
Subject: [PATCH 1/4] MIVisionX ASAN - Exclude additional files from ASAN
 packaging

---
 apps/bubble_pop/CMakeLists.txt                            | 5 ++++-
 apps/cloud_inference/server_app/CMakeLists.txt            | 7 +++++--
 apps/dg_test/CMakeLists.txt                               | 7 +++++--
 apps/image_augmentation/CMakeLists.txt                    | 7 +++++--
 apps/mivisionx_openvx_classifier/CMakeLists.txt           | 7 +++++--
 apps/optical_flow/CMakeLists.txt                          | 5 ++++-
 tests/openvx_api_tests/CMakeLists.txt                     | 4 +++-
 utilities/loom_shell/CMakeLists.txt                       | 7 +++++--
 utilities/rocAL/rocAL_basic_test/CMakeLists.txt           | 5 ++++-
 utilities/rocAL/rocAL_dataloader/CMakeLists.txt           | 5 ++++-
 utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt        | 5 ++++-
 utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt        | 7 +++++--
 utilities/rocAL/rocAL_performance_tests/CMakeLists.txt    | 5 ++++-
 .../rocAL_performance_tests_with_depth/CMakeLists.txt     | 5 ++++-
 utilities/rocAL/rocAL_unittests/CMakeLists.txt            | 5 ++++-
 utilities/rocAL/rocAL_video_unittests/CMakeLists.txt      | 5 ++++-
 utilities/runcl/CMakeLists.txt                            | 8 ++++++--
 17 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/apps/bubble_pop/CMakeLists.txt b/apps/bubble_pop/CMakeLists.txt
index 30fe9b153d..e19740f4a2 100644
--- a/apps/bubble_pop/CMakeLists.txt
+++ b/apps/bubble_pop/CMakeLists.txt
@@ -90,4 +90,7 @@ else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -std=gnu++14")
 endif()
 
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/apps/cloud_inference/server_app/CMakeLists.txt b/apps/cloud_inference/server_app/CMakeLists.txt
index 57647bce9d..635ae55b87 100644
--- a/apps/cloud_inference/server_app/CMakeLists.txt
+++ b/apps/cloud_inference/server_app/CMakeLists.txt
@@ -134,5 +134,8 @@ include_directories(${ROCM_PATH}/include/mivisionx/rocal)
 link_directories(${ROCM_PATH}/lib/)
 target_link_libraries(${PROJECT_NAME} rocal)
 
-# Install Application in ROCm Bin Directory
-install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+  # Install Application in ROCm Bin Directory
+  install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/apps/dg_test/CMakeLists.txt b/apps/dg_test/CMakeLists.txt
index 41c0d029d6..fdd0e450dc 100644
--- a/apps/dg_test/CMakeLists.txt
+++ b/apps/dg_test/CMakeLists.txt
@@ -64,5 +64,8 @@ else()
 	message(FATAL_ERROR "${PROJECT_NAME} -- OpenCV -- Version-${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.X Not Supported")
 endif()
 
-# Install Application in ROCm Bin Directory
-install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    # Install Application in ROCm Bin Directory
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/apps/image_augmentation/CMakeLists.txt b/apps/image_augmentation/CMakeLists.txt
index e1958d574a..d98f044ced 100644
--- a/apps/image_augmentation/CMakeLists.txt
+++ b/apps/image_augmentation/CMakeLists.txt
@@ -78,5 +78,8 @@ endif()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mf16c -Wall ")
 target_link_libraries(${PROJECT_NAME} rocal ${OpenCV_LIBRARIES} )
 
-# Install Application in ROCm Bin Directory
-install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    # Install Application in ROCm Bin Directory
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/apps/mivisionx_openvx_classifier/CMakeLists.txt b/apps/mivisionx_openvx_classifier/CMakeLists.txt
index e5878a14ed..07fa60d28e 100644
--- a/apps/mivisionx_openvx_classifier/CMakeLists.txt
+++ b/apps/mivisionx_openvx_classifier/CMakeLists.txt
@@ -70,5 +70,8 @@ else()
 	message(FATAL_ERROR "${PROJECT_NAME} -- OpenCV -- Version-${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.X Not Supported")
 endif()
 
-# Install Application in ROCm Bin Directory
-install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    # Install Application in ROCm Bin Directory
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/apps/optical_flow/CMakeLists.txt b/apps/optical_flow/CMakeLists.txt
index 9b3f4c3ab4..708c96754e 100644
--- a/apps/optical_flow/CMakeLists.txt
+++ b/apps/optical_flow/CMakeLists.txt
@@ -70,4 +70,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} ${OPENVX_LIBRARIES} ${OpenCV_LIBRARIES})
 
 
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/tests/openvx_api_tests/CMakeLists.txt b/tests/openvx_api_tests/CMakeLists.txt
index 2072b7c27e..78e827f850 100644
--- a/tests/openvx_api_tests/CMakeLists.txt
+++ b/tests/openvx_api_tests/CMakeLists.txt
@@ -26,7 +26,9 @@
 cmake_minimum_required(VERSION 3.5)
 
 # TBD - Install additional data indepedent tests
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../library_tests DESTINATION ${CMAKE_INSTALL_DATADIR}/mivisionx/tests)
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../library_tests DESTINATION ${CMAKE_INSTALL_DATADIR}/mivisionx/tests)
+endif()
 
 # default run
 # canny
diff --git a/utilities/loom_shell/CMakeLists.txt b/utilities/loom_shell/CMakeLists.txt
index 904e1b16c2..44a4f390cf 100644
--- a/utilities/loom_shell/CMakeLists.txt
+++ b/utilities/loom_shell/CMakeLists.txt
@@ -32,8 +32,11 @@ include_directories(../../amd_openvx/openvx/include
 list(APPEND SOURCES loom_shell_util.cpp loom_shell.cpp help.cpp)
 
 add_executable(loom_shell ${SOURCES})
-# install MIVisionX executables -- {ROCM_PATH}/bin
-install(TARGETS loom_shell DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    # install MIVisionX executables -- {ROCM_PATH}/bin
+    install(TARGETS loom_shell DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 target_link_libraries(loom_shell vx_loomsl openvx)
 
diff --git a/utilities/rocAL/rocAL_basic_test/CMakeLists.txt b/utilities/rocAL/rocAL_basic_test/CMakeLists.txt
index a41ade577d..7b1ab9c21c 100644
--- a/utilities/rocAL/rocAL_basic_test/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_basic_test/CMakeLists.txt
@@ -73,7 +73,10 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 
 
diff --git a/utilities/rocAL/rocAL_dataloader/CMakeLists.txt b/utilities/rocAL/rocAL_dataloader/CMakeLists.txt
index 42592ebed9..df2349049c 100644
--- a/utilities/rocAL/rocAL_dataloader/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_dataloader/CMakeLists.txt
@@ -73,7 +73,10 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 
 
diff --git a/utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt b/utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt
index 4983d497c2..d41cd9b1ac 100644
--- a/utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt
@@ -106,7 +106,10 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall -pthread")
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 
 
diff --git a/utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt b/utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt
index 551e8b337d..e0f3cca869 100644
--- a/utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt
@@ -73,5 +73,8 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-# install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+    # install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/utilities/rocAL/rocAL_performance_tests/CMakeLists.txt b/utilities/rocAL/rocAL_performance_tests/CMakeLists.txt
index 4443b62c15..c64ad8084e 100644
--- a/utilities/rocAL/rocAL_performance_tests/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_performance_tests/CMakeLists.txt
@@ -73,7 +73,10 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 
 
diff --git a/utilities/rocAL/rocAL_performance_tests_with_depth/CMakeLists.txt b/utilities/rocAL/rocAL_performance_tests_with_depth/CMakeLists.txt
index 68422017a1..8a1f796998 100644
--- a/utilities/rocAL/rocAL_performance_tests_with_depth/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_performance_tests_with_depth/CMakeLists.txt
@@ -74,4 +74,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/utilities/rocAL/rocAL_unittests/CMakeLists.txt b/utilities/rocAL/rocAL_unittests/CMakeLists.txt
index 881212f8fe..5c252ca402 100644
--- a/utilities/rocAL/rocAL_unittests/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_unittests/CMakeLists.txt
@@ -72,4 +72,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt b/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt
index bdff677dc6..66196af9d4 100644
--- a/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt
@@ -73,4 +73,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
diff --git a/utilities/runcl/CMakeLists.txt b/utilities/runcl/CMakeLists.txt
index ca5ea6a185..2a07d85651 100644
--- a/utilities/runcl/CMakeLists.txt
+++ b/utilities/runcl/CMakeLists.txt
@@ -28,8 +28,12 @@ find_package(OpenCL QUIET)
 list(APPEND SOURCES runcl.cpp)
 
 add_executable(runcl ${SOURCES})
-# install MIVisionX executables -- {ROCM_PATH}/bin
-install (TARGETS runcl DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+# Binary files not required for ASAN package
+if(NOT ENABLE_ASAN_PACKAGING)
+  # install MIVisionX executables -- {ROCM_PATH}/bin
+  install (TARGETS runcl DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 if(OpenCL_FOUND)
 	target_compile_definitions(runcl PUBLIC ENABLE_OPENCL=1)

From e268f01d0e0236605381c164d8272458a181c720 Mon Sep 17 00:00:00 2001
From: AravindanC <aravindan.cheruvally@amd.com>
Date: Sat, 4 Nov 2023 10:46:28 -0700
Subject: [PATCH 2/4] Review Comments Updated

---
 apps/bubble_pop/CMakeLists.txt   | 5 +----
 apps/optical_flow/CMakeLists.txt | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/apps/bubble_pop/CMakeLists.txt b/apps/bubble_pop/CMakeLists.txt
index e19740f4a2..30fe9b153d 100644
--- a/apps/bubble_pop/CMakeLists.txt
+++ b/apps/bubble_pop/CMakeLists.txt
@@ -90,7 +90,4 @@ else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -std=gnu++14")
 endif()
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
diff --git a/apps/optical_flow/CMakeLists.txt b/apps/optical_flow/CMakeLists.txt
index 708c96754e..9b3f4c3ab4 100644
--- a/apps/optical_flow/CMakeLists.txt
+++ b/apps/optical_flow/CMakeLists.txt
@@ -70,7 +70,4 @@ endif()
 target_link_libraries(${PROJECT_NAME} ${OPENVX_LIBRARIES} ${OpenCV_LIBRARIES})
 
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})

From 142083dcfeafbf6263ffee3a7752ec30e9a961c7 Mon Sep 17 00:00:00 2001
From: AravindanC <aravindan.cheruvally@amd.com>
Date: Wed, 8 Nov 2023 12:55:50 -0800
Subject: [PATCH 3/4] Revert "MIVisionX ASAN - Exclude additional files from
 ASAN packaging"

This reverts commit c744b6d556248bd1b7092ddb1b6dd3dfffa00865.
---
 apps/cloud_inference/server_app/CMakeLists.txt            | 7 ++-----
 apps/dg_test/CMakeLists.txt                               | 7 ++-----
 apps/image_augmentation/CMakeLists.txt                    | 7 ++-----
 apps/mivisionx_openvx_classifier/CMakeLists.txt           | 7 ++-----
 tests/openvx_api_tests/CMakeLists.txt                     | 4 +---
 utilities/loom_shell/CMakeLists.txt                       | 7 ++-----
 utilities/rocAL/rocAL_basic_test/CMakeLists.txt           | 5 +----
 utilities/rocAL/rocAL_dataloader/CMakeLists.txt           | 5 +----
 utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt        | 5 +----
 utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt        | 7 ++-----
 utilities/rocAL/rocAL_performance_tests/CMakeLists.txt    | 5 +----
 .../rocAL_performance_tests_with_depth/CMakeLists.txt     | 5 +----
 utilities/rocAL/rocAL_unittests/CMakeLists.txt            | 5 +----
 utilities/rocAL/rocAL_video_unittests/CMakeLists.txt      | 5 +----
 utilities/runcl/CMakeLists.txt                            | 8 ++------
 15 files changed, 22 insertions(+), 67 deletions(-)

diff --git a/apps/cloud_inference/server_app/CMakeLists.txt b/apps/cloud_inference/server_app/CMakeLists.txt
index 635ae55b87..57647bce9d 100644
--- a/apps/cloud_inference/server_app/CMakeLists.txt
+++ b/apps/cloud_inference/server_app/CMakeLists.txt
@@ -134,8 +134,5 @@ include_directories(${ROCM_PATH}/include/mivisionx/rocal)
 link_directories(${ROCM_PATH}/lib/)
 target_link_libraries(${PROJECT_NAME} rocal)
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-  # Install Application in ROCm Bin Directory
-  install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
-endif()
+# Install Application in ROCm Bin Directory
+install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
diff --git a/apps/dg_test/CMakeLists.txt b/apps/dg_test/CMakeLists.txt
index fdd0e450dc..41c0d029d6 100644
--- a/apps/dg_test/CMakeLists.txt
+++ b/apps/dg_test/CMakeLists.txt
@@ -64,8 +64,5 @@ else()
 	message(FATAL_ERROR "${PROJECT_NAME} -- OpenCV -- Version-${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.X Not Supported")
 endif()
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    # Install Application in ROCm Bin Directory
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
-endif()
+# Install Application in ROCm Bin Directory
+install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
diff --git a/apps/image_augmentation/CMakeLists.txt b/apps/image_augmentation/CMakeLists.txt
index d98f044ced..e1958d574a 100644
--- a/apps/image_augmentation/CMakeLists.txt
+++ b/apps/image_augmentation/CMakeLists.txt
@@ -78,8 +78,5 @@ endif()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mf16c -Wall ")
 target_link_libraries(${PROJECT_NAME} rocal ${OpenCV_LIBRARIES} )
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    # Install Application in ROCm Bin Directory
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
-endif()
+# Install Application in ROCm Bin Directory
+install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
diff --git a/apps/mivisionx_openvx_classifier/CMakeLists.txt b/apps/mivisionx_openvx_classifier/CMakeLists.txt
index 07fa60d28e..e5878a14ed 100644
--- a/apps/mivisionx_openvx_classifier/CMakeLists.txt
+++ b/apps/mivisionx_openvx_classifier/CMakeLists.txt
@@ -70,8 +70,5 @@ else()
 	message(FATAL_ERROR "${PROJECT_NAME} -- OpenCV -- Version-${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.X Not Supported")
 endif()
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    # Install Application in ROCm Bin Directory
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
-endif()
+# Install Application in ROCm Bin Directory
+install(TARGETS ${PROJECT_NAME} DESTINATION ${ROCM_PATH}/${CMAKE_INSTALL_BINDIR})
diff --git a/tests/openvx_api_tests/CMakeLists.txt b/tests/openvx_api_tests/CMakeLists.txt
index 78e827f850..2072b7c27e 100644
--- a/tests/openvx_api_tests/CMakeLists.txt
+++ b/tests/openvx_api_tests/CMakeLists.txt
@@ -26,9 +26,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 # TBD - Install additional data indepedent tests
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../library_tests DESTINATION ${CMAKE_INSTALL_DATADIR}/mivisionx/tests)
-endif()
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../library_tests DESTINATION ${CMAKE_INSTALL_DATADIR}/mivisionx/tests)
 
 # default run
 # canny
diff --git a/utilities/loom_shell/CMakeLists.txt b/utilities/loom_shell/CMakeLists.txt
index 44a4f390cf..904e1b16c2 100644
--- a/utilities/loom_shell/CMakeLists.txt
+++ b/utilities/loom_shell/CMakeLists.txt
@@ -32,11 +32,8 @@ include_directories(../../amd_openvx/openvx/include
 list(APPEND SOURCES loom_shell_util.cpp loom_shell.cpp help.cpp)
 
 add_executable(loom_shell ${SOURCES})
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    # install MIVisionX executables -- {ROCM_PATH}/bin
-    install(TARGETS loom_shell DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+# install MIVisionX executables -- {ROCM_PATH}/bin
+install(TARGETS loom_shell DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 target_link_libraries(loom_shell vx_loomsl openvx)
 
diff --git a/utilities/rocAL/rocAL_basic_test/CMakeLists.txt b/utilities/rocAL/rocAL_basic_test/CMakeLists.txt
index 7b1ab9c21c..a41ade577d 100644
--- a/utilities/rocAL/rocAL_basic_test/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_basic_test/CMakeLists.txt
@@ -73,10 +73,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 
 
diff --git a/utilities/rocAL/rocAL_dataloader/CMakeLists.txt b/utilities/rocAL/rocAL_dataloader/CMakeLists.txt
index df2349049c..42592ebed9 100644
--- a/utilities/rocAL/rocAL_dataloader/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_dataloader/CMakeLists.txt
@@ -73,10 +73,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 
 
diff --git a/utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt b/utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt
index d41cd9b1ac..4983d497c2 100644
--- a/utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt
@@ -106,10 +106,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall -pthread")
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 
 
diff --git a/utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt b/utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt
index e0f3cca869..551e8b337d 100644
--- a/utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt
@@ -73,8 +73,5 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-    # install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+# install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/utilities/rocAL/rocAL_performance_tests/CMakeLists.txt b/utilities/rocAL/rocAL_performance_tests/CMakeLists.txt
index c64ad8084e..4443b62c15 100644
--- a/utilities/rocAL/rocAL_performance_tests/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_performance_tests/CMakeLists.txt
@@ -73,10 +73,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 
 
diff --git a/utilities/rocAL/rocAL_performance_tests_with_depth/CMakeLists.txt b/utilities/rocAL/rocAL_performance_tests_with_depth/CMakeLists.txt
index 8a1f796998..68422017a1 100644
--- a/utilities/rocAL/rocAL_performance_tests_with_depth/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_performance_tests_with_depth/CMakeLists.txt
@@ -74,7 +74,4 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/utilities/rocAL/rocAL_unittests/CMakeLists.txt b/utilities/rocAL/rocAL_unittests/CMakeLists.txt
index 5c252ca402..881212f8fe 100644
--- a/utilities/rocAL/rocAL_unittests/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_unittests/CMakeLists.txt
@@ -72,7 +72,4 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt b/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt
index 66196af9d4..bdff677dc6 100644
--- a/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt
+++ b/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt
@@ -73,7 +73,4 @@ endif()
 target_link_libraries(${PROJECT_NAME} rocal)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mf16c -Wall ")
 
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/utilities/runcl/CMakeLists.txt b/utilities/runcl/CMakeLists.txt
index 2a07d85651..ca5ea6a185 100644
--- a/utilities/runcl/CMakeLists.txt
+++ b/utilities/runcl/CMakeLists.txt
@@ -28,12 +28,8 @@ find_package(OpenCL QUIET)
 list(APPEND SOURCES runcl.cpp)
 
 add_executable(runcl ${SOURCES})
-
-# Binary files not required for ASAN package
-if(NOT ENABLE_ASAN_PACKAGING)
-  # install MIVisionX executables -- {ROCM_PATH}/bin
-  install (TARGETS runcl DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+# install MIVisionX executables -- {ROCM_PATH}/bin
+install (TARGETS runcl DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 if(OpenCL_FOUND)
 	target_compile_definitions(runcl PUBLIC ENABLE_OPENCL=1)

From 88950e878b7c7bcfc82cd0040dd5e8ba1a1e85b5 Mon Sep 17 00:00:00 2001
From: AravindanC <aravindan.cheruvally@amd.com>
Date: Wed, 8 Nov 2023 13:02:01 -0800
Subject: [PATCH 4/4] MIVisionX ASAN - Exclude library_tests from ASAN pkg

---
 tests/openvx_api_tests/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/openvx_api_tests/CMakeLists.txt b/tests/openvx_api_tests/CMakeLists.txt
index 2072b7c27e..78e827f850 100644
--- a/tests/openvx_api_tests/CMakeLists.txt
+++ b/tests/openvx_api_tests/CMakeLists.txt
@@ -26,7 +26,9 @@
 cmake_minimum_required(VERSION 3.5)
 
 # TBD - Install additional data indepedent tests
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../library_tests DESTINATION ${CMAKE_INSTALL_DATADIR}/mivisionx/tests)
+if(NOT ENABLE_ASAN_PACKAGING)
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../library_tests DESTINATION ${CMAKE_INSTALL_DATADIR}/mivisionx/tests)
+endif()
 
 # default run
 # canny