diff --git a/cmake/deps.txt b/cmake/deps.txt index 5feb12587c196..7a83c108cebda 100644 --- a/cmake/deps.txt +++ b/cmake/deps.txt @@ -33,7 +33,7 @@ googlexnnpack;https://github.com/google/XNNPACK/archive/309b75c9e56e0a674bf78d59 json;https://github.com/nlohmann/json/archive/refs/tags/v3.10.5.zip;f257f8dc27c5b8c085dc887b40cddd18ae1f725c microsoft_gsl;https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.zip;cf368104cd22a87b4dd0c80228919bb2df3e2a14 microsoft_wil;https://github.com/microsoft/wil/archive/refs/tags/v1.0.230629.1.zip;e4a542a323c070376f7c2d1973d0f7ddbc1d2fa5 -microsoft_mlas;https://github.com/microsoft/mlas/archive/5fd3e08b32fd8d9f0b70e32c935c5765f11fc9dc.zip;de2dcaeead11d41a7375d34f0753783991f1d422 +microsoft_mlas;https://github.com/microsoft/mlas/archive/d5c15efa68a47fc2db4333f2c0b3a18d8f2729bf.zip;c45922af0f7422e364cdf4192c0c8eb45600659f mimalloc;https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.1.zip;d5ee7d34223d0567892db5179849939c8769dc41 mp11;https://github.com/boostorg/mp11/archive/refs/tags/boost-1.82.0.zip;9bc9e01dffb64d9e0773b2e44d2f22c51aace063 onnx;https://github.com/onnx/onnx/archive/refs/tags/v1.16.1.zip;2eb9198bb352757d5ff13977cbe0634898e0837c diff --git a/cmake/linux_arm32_crosscompile_toolchain.cmake b/cmake/linux_arm32_crosscompile_toolchain.cmake index 0183262a8875e..1184efd4a5fa3 100644 --- a/cmake/linux_arm32_crosscompile_toolchain.cmake +++ b/cmake/linux_arm32_crosscompile_toolchain.cmake @@ -1,6 +1,7 @@ #This file is just a sample. You may need to modify it before using. SET(CMAKE_SYSTEM_NAME Linux) SET(CMAKE_SYSTEM_VERSION 1) + SET(CMAKE_SYSTEM_PROCESSOR armv7l) SET(CMAKE_C_COMPILER arm-none-linux-gnueabihf-gcc) SET(CMAKE_CXX_COMPILER arm-none-linux-gnueabihf-g++) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) diff --git a/cmake/linux_arm64_crosscompile_toolchain.cmake b/cmake/linux_arm64_crosscompile_toolchain.cmake index 1a492bbc269e7..fd37ca1bf1689 100644 --- a/cmake/linux_arm64_crosscompile_toolchain.cmake +++ b/cmake/linux_arm64_crosscompile_toolchain.cmake @@ -1,6 +1,7 @@ #This file is just a sample. You may need to modify it before using. SET(CMAKE_SYSTEM_NAME Linux) SET(CMAKE_SYSTEM_VERSION 1) + SET(CMAKE_SYSTEM_PROCESSOR aarch64) SET(CMAKE_C_COMPILER aarch64-none-linux-gnu-gcc) SET(CMAKE_CXX_COMPILER aarch64-none-linux-gnu-g++) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index 9624f9112c49f..655a1f24fd05a 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -2066,7 +2066,6 @@ def run_onnxruntime_tests(args, source_dir, ctest_path, build_dir, configs): dll_path = os.pathsep.join(dll_path_list) if not ctest_path and not is_windows(): - executables = ["onnxruntime_test_all", "onnxruntime_mlas_test"] if args.build_shared_lib: executables.append("onnxruntime_shared_lib_test") executables.append("onnxruntime_global_thread_pools_test") diff --git a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml index 7f131590c900b..61ea555d8b48d 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -335,13 +335,12 @@ stages: LLVM_PROFILE_FILE="%p.profraw" CFLAGS="-g -fprofile-instr-generate -fcoverage-mapping" CXXFLAGS="-g -fprofile-instr-generate -fcoverage-mapping" CC=clang CXX=clang++ python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --build_dir=$(Build.BinariesDirectory) --config Debug --parallel --skip_submodule_sync --build_shared_lib --enable_onnx_tests --cmake_extra_defines RUN_MODELTEST_IN_DEBUG_MODE=ON cd Debug - ./onnxruntime_mlas_test #Merge the multiple prof data into a single indexed profile data file llvm-profdata merge -sparse -o ort.profdata *.profraw #Create coverage report, output the result to 'report.json' - llvm-cov export -summary-only -instr-profile=ort.profdata onnxruntime_test_all -object onnxruntime_mlas_test -object onnx_test_runner -object onnxruntime_shared_lib_test -object onnxruntime_global_thread_pools_test $(Build.SourcesDirectory)/include/onnxruntime $(Build.SourcesDirectory)/onnxruntime/core $(Build.SourcesDirectory)/onnxruntime/contrib_ops > $(Build.BinariesDirectory)/report.json + llvm-cov export -summary-only -instr-profile=ort.profdata onnxruntime_test_all -object onnx_test_runner -object onnxruntime_shared_lib_test -object onnxruntime_global_thread_pools_test $(Build.SourcesDirectory)/include/onnxruntime $(Build.SourcesDirectory)/onnxruntime/core $(Build.SourcesDirectory)/onnxruntime/contrib_ops > $(Build.BinariesDirectory)/report.json - llvm-cov show -instr-profile=ort.profdata onnxruntime_test_all -object onnxruntime_mlas_test -object onnx_test_runner -object onnxruntime_shared_lib_test -object onnxruntime_global_thread_pools_test $(Build.SourcesDirectory)/include/onnxruntime $(Build.SourcesDirectory)/onnxruntime/core $(Build.SourcesDirectory)/onnxruntime/contrib_ops --format=html -output-dir=$(Build.ArtifactStagingDirectory) + llvm-cov show -instr-profile=ort.profdata onnxruntime_test_all -object onnx_test_runner -object onnxruntime_shared_lib_test -object onnxruntime_global_thread_pools_test $(Build.SourcesDirectory)/include/onnxruntime $(Build.SourcesDirectory)/onnxruntime/core $(Build.SourcesDirectory)/onnxruntime/contrib_ops --format=html -output-dir=$(Build.ArtifactStagingDirectory) workingDirectory: $(Build.BinariesDirectory) - ${{ if or(startsWith(variables['System.CollectionUri'], 'https://dev.azure.com/aiinfra/'),startsWith(variables['System.CollectionUri'], 'https://aiinfra.visualstudio.com/')) }}: diff --git a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml index 21eb6f6435790..ee3fc431b2ff7 100644 --- a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml +++ b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml @@ -11,7 +11,7 @@ steps: packageType: upack feed: '/7424c8e4-5c62-490e-95c4-79446f31017c' definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0' - version: 1.0.195 + version: 1.0.196 downloadPath: $(Build.BinariesDirectory)/deps # The private ADO project @@ -22,7 +22,7 @@ steps: packageType: upack feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325' definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a' - version: 1.0.195 + version: 1.0.196 downloadPath: $(Build.BinariesDirectory)/deps # You can add more ADO accounts at here.