From f808e833b184224066c1c89a43bca595433541b5 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 15 Mar 2024 11:18:40 -0400 Subject: [PATCH 1/7] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a78ec5..63beb12 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,8 +18,10 @@ jobs: include: - build-type: Release publish-type: "" + extra-cmake-args: "" - build-type: Debug publish-type: "debug" + extra-cmake-args: "-DENABLE_ASAN=ON" steps: - uses: actions/checkout@v3 From c59b863a5bc37ab736187f22b2b2de222394a7a7 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 15 Mar 2024 11:19:34 -0400 Subject: [PATCH 2/7] Update main.yml --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 63beb12..611c07d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,9 @@ jobs: publish-type: "" extra-cmake-args: "" - build-type: Debug + publish-type: "debug" + extra-cmake-args: "" + - build-type: Debug with ASAN publish-type: "debug" extra-cmake-args: "-DENABLE_ASAN=ON" @@ -50,7 +53,7 @@ jobs: ls find . pwd - cmake -B cmake_build -S . -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DCMAKE_INSTALL_PREFIX=cmake_build -DOPENCV_ARCH=linuxarm64 + cmake -B cmake_build -S . -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DCMAKE_INSTALL_PREFIX=cmake_build -DOPENCV_ARCH=linuxarm64 ${{ matrix.extra-cmake-args }} cmake --build cmake_build --target install -- -j 4 - run: find . From af6e641814b733264ab43403046de59ff5691312 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 15 Mar 2024 11:20:38 -0400 Subject: [PATCH 3/7] Update CMakeLists.txt --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ea5e3b..a3d71bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,9 @@ set(CMAKE_CXX_FLAGS "-pthread") if (ENABLE_ASAN) message(STATUS "BUILD WITH ADDRESS SANITIZER") - set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") - set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") + set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined") + set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined") + set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined") endif () set(BUILD_SHARED_LIBS ON) From 09a36700992821433c46f445e15a6522c779582b Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 15 Mar 2024 11:31:19 -0400 Subject: [PATCH 4/7] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 611c07d..171917f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: - build-type: Debug publish-type: "debug" extra-cmake-args: "" - - build-type: Debug with ASAN + - build-type: Debug publish-type: "debug" extra-cmake-args: "-DENABLE_ASAN=ON" From d2c95ceeed777ed3b2cf21227d54d6f316b75abc Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 15 Mar 2024 11:42:47 -0400 Subject: [PATCH 5/7] Update main.yml --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 171917f..e70165f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,12 +19,15 @@ jobs: - build-type: Release publish-type: "" extra-cmake-args: "" + jar-name: "Release" - build-type: Debug publish-type: "debug" extra-cmake-args: "" + jar-name: "Debug" - build-type: Debug publish-type: "debug" extra-cmake-args: "-DENABLE_ASAN=ON" + jar-name: "DebugWithAsan" steps: - uses: actions/checkout@v3 @@ -67,7 +70,7 @@ jobs: - uses: actions/upload-artifact@v4 name: Upload jar with: - name: librknn-jar-pi-${{matrix.build-type}} + name: librknn-jar-pi-${{matrix.jar-name}} path: ${{ github.workspace }}/build/libs/*.jar - uses: actions/upload-artifact@v4 with: From 089db022151131af784f63e319b8b16412a149f2 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 15 Mar 2024 11:43:39 -0400 Subject: [PATCH 6/7] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e70165f..6d0552b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,7 +74,7 @@ jobs: path: ${{ github.workspace }}/build/libs/*.jar - uses: actions/upload-artifact@v4 with: - name: librknn-${{ matrix.build-type }} + name: librknn-${{ matrix.jar-name }} path: cmake_build/*.so # Push to dev release on pushes to master From f8d702b307dbadeee9b3f08f931df0c4224de766 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 15 Mar 2024 11:53:44 -0400 Subject: [PATCH 7/7] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6d0552b..8207df8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: extra-cmake-args: "" jar-name: "Debug" - build-type: Debug - publish-type: "debug" + publish-type: "debugwithasan" extra-cmake-args: "-DENABLE_ASAN=ON" jar-name: "DebugWithAsan"