From d3e69f10866bfad6660333db3ba1ea7811c78278 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Fri, 26 Apr 2024 23:39:15 +0900 Subject: [PATCH] Fix builds for ONNX Runtime --- onnxruntime/cppbuild.sh | 17 ++++++++++++----- .../onnxruntime/presets/onnxruntime.java | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index 610a6301762..12ee3420e44 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -10,6 +10,7 @@ fi export ARCH_FLAGS="--allow_running_as_root" export DNNL_FLAGS="--use_dnnl" export OPENMP_FLAGS= # "--use_openmp" +export CUDAFLAGS="-v" export CUDACXX="/usr/local/cuda/bin/nvcc" export CUDA_HOME="/usr/local/cuda" export CUDNN_HOME="/usr/local/cuda" @@ -75,6 +76,12 @@ sedinplace '/WX/d' cmake/CMakeLists.txt # allow cross compilation for linux-arm64 sedinplace 's/if args.arm or args.arm64:/if False:/g' tools/ci_build/build.py +sedinplace 's/is_linux() and platform.machine() == "x86_64"/False/g' tools/ci_build/build.py +sedinplace 's/onnxruntime_target_platform STREQUAL "aarch64"/FALSE/g' cmake/CMakeLists.txt +sedinplace 's/if (NOT APPLE)/if (FALSE)/g' cmake/onnxruntime_mlas.cmake +sedinplace 's/!defined(__APPLE__)/0/g' onnxruntime/core/mlas/inc/mlas.h +sedinplace 's/defined(__aarch64__) && defined(__linux__)/0/g' `find . -name *.cpp -o -name *.cc -o -name *.h` +sedinplace 's/MLAS_CPUIDINFO::GetCPUIDInfo().HasArmNeon_I8MM()/false/g' onnxruntime/core/mlas/lib/platform.cpp # work around toolchain issues on Mac and Windows patch -p1 < ../../../onnxruntime.patch @@ -82,11 +89,11 @@ patch -p1 < ../../../onnxruntime.patch sedinplace '/--Werror/d' cmake/CMakeLists.txt sedinplace "s/return 'ON'/return 'OFF'/g" tools/ci_build/build.py sedinplace "s/Visual Studio 1. 20../Ninja/g" tools/ci_build/build.py -sedinplace 's/Darwin|iOS/iOS/g' cmake/onnxruntime_providers.cmake -sedinplace 's/-fvisibility=hidden//g' cmake/CMakeLists.txt cmake/adjust_global_compile_flags.cmake cmake/onnxruntime_providers.cmake -sedinplace 's:/Yucuda_pch.h /FIcuda_pch.h::g' cmake/onnxruntime_providers.cmake -sedinplace 's/${PROJECT_SOURCE_DIR}\/external\/cub//g' cmake/onnxruntime_providers.cmake -sedinplace 's/ONNXRUNTIME_PROVIDERS_SHARED)/ONNXRUNTIME_PROVIDERS_SHARED onnxruntime_providers_shared)/g' cmake/onnxruntime_providers.cmake +sedinplace 's/Darwin|iOS/iOS/g' cmake/onnxruntime_providers_cpu.cmake cmake/onnxruntime_providers.cmake +sedinplace 's/-fvisibility=hidden//g' cmake/CMakeLists.txt cmake/adjust_global_compile_flags.cmake cmake/onnxruntime_providers_cpu.cmake cmake/onnxruntime_providers.cmake +sedinplace 's:/Yucuda_pch.h /FIcuda_pch.h::g' cmake/onnxruntime_providers_cuda.cmake cmake/onnxruntime_providers.cmake +sedinplace 's/${PROJECT_SOURCE_DIR}\/external\/cub//g' cmake/onnxruntime_providers_cuda.cmake cmake/onnxruntime_providers.cmake +sedinplace 's/ONNXRUNTIME_PROVIDERS_SHARED)/ONNXRUNTIME_PROVIDERS_SHARED onnxruntime_providers_shared)/g' cmake/onnxruntime_providers_cpu.cmake cmake/onnxruntime_providers.cmake sedinplace 's/DNNL_TAG v.*)/DNNL_TAG v3.4.1)/g' cmake/external/dnnl.cmake sedinplace 's/DNNL_SHARED_LIB libdnnl.1.dylib/DNNL_SHARED_LIB libdnnl.2.dylib/g' cmake/external/dnnl.cmake sedinplace 's/DNNL_SHARED_LIB libdnnl.so.1/DNNL_SHARED_LIB libdnnl.so.2/g' cmake/external/dnnl.cmake diff --git a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java index b0b78b09118..1ce97706da9 100644 --- a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java +++ b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java @@ -224,7 +224,7 @@ public void map(InfoMap infoMap) { .put(new Info("Ort::detail::Base").pointerTypes("BaseKernelInfo")) .put(new Info("Ort::detail::Base").pointerTypes("BaseThreadingOptions")) - .put(new Info("OrtSessionOptionsAppendExecutionProvider_MIGraphX", + .put(new Info("OrtSessionOptionsAppendExecutionProvider_MIGraphX", "OrtSessionOptionsAppendExecutionProvider_Tensorrt", "OrtSessionOptionsAppendExecutionProvider_ROCM", "Ort::detail::OptionalTypeInfoImpl::GetOptionalElementType").skip()) .put(new Info("OrtSessionOptionsAppendExecutionProvider_CUDA").annotations("@Platform(extension=\"-gpu\")").javaNames("OrtSessionOptionsAppendExecutionProvider_CUDA")); }