mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-05-14 20:48:00 +00:00
* First iteration of making cuda a shared provider. Separated out shared OpKernel change, so doing this to merge with that change. * More cuda shared library refactoring * More cuda shared library refactoring * More build options tested, converted the training ops over. * Fix merge breaks * Fix submodules * Fix submodules * Fix submodules * Fix python * Fix compile errors * Duplicate symbol fix * Test fix for ROCM provider * Another ROCM test workaround * ROCM Build Test * ROCM build fix * ROCM * ROCM * ROCM * ROCM * ROCM * ROCM test * Reduce header dependencies * Remove redundant namespace * Test fix for linux * Fix linux build * Fix Eigen build error * Fix unused parameter warning * Test link error * Another linker test * Linker test * Linker test * Another test * Another build test * Fix linux link error * Build test * Fix control flow ops to use common base class with core code * Remove extra qualifiers * Fix template syntax for linux * Fix cuda memory leak * Fix pybind * Test disabling cast * Cleanup * Restore cuda in test * Remove more header dependencies * Test not adding cuda provider to session * Make GetProviderInfo_CUDA throw * No-op cuda provider creation * Fix some setup issues * Fix memory cleanup on unload * Diagnostics * Don't unload library * Add diagnostics * Fix deleting registry at right time. * Test disabling profiler * Fix merge break * Revert profiler change * Move unloading of shared providers into Environment * Free more global allocations before library unloads * Add more diagnostics * Move unloading back to the OrtEnv as there are multiple Environments created during a session. Remove some library dependencies for tests. * Fix more cmake files * ERROR -> WARNING * Fix python shutdown * Test not using dml in pipeline * Change python version and disable dml * Update python version * Test adding unload method for shared providers * Disable DLL test * Python test * Revert "Python test" This reverts commitc7ec2cfe98. * Revert "Disable DLL test" This reverts commite901cb93aa. * Revert "Test adding unload method for shared providers" This reverts commitc427b78799. * Point to RyanWinGPU * Revert python version * Fix id_to_allocator_map * Another python exit test * Remove extra debug messages Try a more clean python shutdown through DllMain * Revert DllMain idea, it didn't work * Merge conflicts * Fix merge with master issues. * Comments * Undo edit to file * Cleanup + new training ops * Revert yml changes * Fix another merge error * ROCM fix * ROCM fix v2 * Put back Linux hack, it is necessary * Stupid fixes * Fix submodule out of sync * ROCM fix 3 * ROCM 4 * Test java fix * Fix typos * Java test on my VM * Fix build error * Spotless fix * Leave temp file around to load properly * Fix cleanup on exit * Fix break * Java comments * Remove LongformerAttentionBase workaround * Spotless fix * Switch yml back to regular build pool * Revert "Switch yml back to regular build pool" This reverts commitbe35fc2a5a. * Code review feedback * Fix errors due to merge * Spotless fix * Fix minimal build * Java fix for non cuda case * Java fix for CPU build * Fix Nuphar? * Fix nuphar 2 * Fix formatting * Revert "Remove LongformerAttentionBase workaround" This reverts commit648679b370. * Training fix * Another java fix * Formatting * Formatting * For orttraining * Last orttraining build fix... * training fixes * Fix test provider error * Missing pass command * Removed in wrong spot * Python typo * Python typos * Python crash on exit, possibly due to unloading of libraries. * Remove test_execution_provider from training build Only enable python atexit on windows Remove assert on provider library exit * Still can't unload providers in python, alas. * Disable Nvtx temporarily * MPI Kernels for Training * MPI Kernels part 2 * Patch through INcclService * Oops, wrong CMakeLists * Missing namespace * Fix missing () * Move INcclService::GetInstance around to link nicer * Missing } * Missing MPI libraries for Cuda * Add extra GetType functions used by MPI * Missing Nccl library * Remove LOGS statements as a test * Add in a couple more missing GetType methods * Update comments * Missed a logging reference in mpi_context.h * Convert aten_op to shared (due to marge with master) * Test moving DistributedRunContext instance into shared provider layer (with purpose error to verify it's being built properly) * Test passed, now with fix * Missing static * Oops, scope DistributedRunContext to just NCCL * Merge related issues and code review feedback. * Merge error * Bump to rel-1.9.1 (#7684) * Formatting * Code review feedback for Java build on non Windows * Remove cupti library dependency from core library * Test Java pipeline fix * Linux build fix * Revert "Linux build fix" This reverts commita73a811516. * Revert "Remove cupti library dependency from core library" This reverts commit6a889ee8bf. * Packaging pipeline fixes to copy cuda shared provider for tensorrt & standard packages * Add cuda to Tensorrt nuget package * onnxruntime_common still has a cuda header dependency Co-authored-by: ashbhandare <ash.bhandare@gmail.com>
193 lines
9.8 KiB
CMake
193 lines
9.8 KiB
CMake
# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
|
|
# Licensed under the MIT License.
|
|
|
|
#set(CMAKE_VERBOSE_MAKEFILE on)
|
|
|
|
# Setup Java compilation
|
|
include(FindJava)
|
|
find_package(Java REQUIRED)
|
|
include(UseJava)
|
|
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
|
|
find_package(JNI REQUIRED)
|
|
endif()
|
|
|
|
set(JAVA_ROOT ${REPO_ROOT}/java)
|
|
set(JAVA_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/java)
|
|
if (onnxruntime_RUN_ONNX_TESTS)
|
|
set(JAVA_DEPENDS onnxruntime ${test_data_target})
|
|
else()
|
|
set(JAVA_DEPENDS onnxruntime)
|
|
endif()
|
|
|
|
# use the gradle wrapper if it exists
|
|
if(EXISTS "${JAVA_ROOT}/gradlew")
|
|
set(GRADLE_EXECUTABLE "${JAVA_ROOT}/gradlew")
|
|
else()
|
|
# fall back to gradle on our PATH
|
|
find_program(GRADLE_EXECUTABLE gradle)
|
|
if(NOT GRADLE_EXECUTABLE)
|
|
message(SEND_ERROR "Gradle installation not found")
|
|
endif()
|
|
endif()
|
|
message(STATUS "Using gradle: ${GRADLE_EXECUTABLE}")
|
|
|
|
# Specify the Java source files
|
|
file(GLOB_RECURSE onnxruntime4j_gradle_files "${JAVA_ROOT}/*.gradle")
|
|
file(GLOB_RECURSE onnxruntime4j_src "${JAVA_ROOT}/src/main/java/ai/onnxruntime/*.java")
|
|
set(JAVA_OUTPUT_JAR ${JAVA_ROOT}/build/libs/onnxruntime.jar)
|
|
# this jar is solely used to signaling mechanism for dependency management in CMake
|
|
# if any of the Java sources change, the jar (and generated headers) will be regenerated and the onnxruntime4j_jni target will be rebuilt
|
|
set(GRADLE_ARGS clean jar)
|
|
if(WIN32)
|
|
set(GRADLE_ARGS ${GRADLE_ARGS} -Dorg.gradle.daemon=false)
|
|
elseif (CMAKE_SYSTEM_NAME STREQUAL "Android")
|
|
# For Android build, we may run gradle multiple times in same build,
|
|
# sometimes gradle JVM will run out of memory if we keep the daemon running
|
|
# it is better to not keep a daemon running
|
|
set(GRADLE_ARGS ${GRADLE_ARGS} --no-daemon)
|
|
endif()
|
|
|
|
add_custom_command(OUTPUT ${JAVA_OUTPUT_JAR} COMMAND ${GRADLE_EXECUTABLE} ${GRADLE_ARGS} WORKING_DIRECTORY ${JAVA_ROOT} DEPENDS ${onnxruntime4j_gradle_files} ${onnxruntime4j_src})
|
|
add_custom_target(onnxruntime4j DEPENDS ${JAVA_OUTPUT_JAR})
|
|
set_source_files_properties(${JAVA_OUTPUT_JAR} PROPERTIES GENERATED TRUE)
|
|
set_property(TARGET onnxruntime4j APPEND PROPERTY ADDITIONAL_CLEAN_FILES "${JAVA_OUTPUT_DIR}")
|
|
|
|
# Specify the native sources
|
|
file(GLOB onnxruntime4j_native_src
|
|
"${JAVA_ROOT}/src/main/native/*.c"
|
|
"${JAVA_ROOT}/src/main/native/*.h"
|
|
"${REPO_ROOT}/include/onnxruntime/core/session/*.h"
|
|
)
|
|
# Build the JNI library
|
|
onnxruntime_add_shared_library_module(onnxruntime4j_jni ${onnxruntime4j_native_src})
|
|
set_property(TARGET onnxruntime4j_jni PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
# depend on java sources. if they change, the JNI should recompile
|
|
add_dependencies(onnxruntime4j_jni onnxruntime4j)
|
|
onnxruntime_add_include_to_target(onnxruntime4j_jni onnxruntime_session)
|
|
# the JNI headers are generated in the onnxruntime4j target
|
|
target_include_directories(onnxruntime4j_jni PRIVATE ${REPO_ROOT}/include ${JAVA_ROOT}/build/headers ${JNI_INCLUDE_DIRS})
|
|
target_link_libraries(onnxruntime4j_jni PUBLIC onnxruntime)
|
|
|
|
set(JAVA_PACKAGE_OUTPUT_DIR ${JAVA_OUTPUT_DIR}/build)
|
|
file(MAKE_DIRECTORY ${JAVA_PACKAGE_OUTPUT_DIR})
|
|
if (CMAKE_SYSTEM_NAME STREQUAL "Android")
|
|
set(ANDROID_PACKAGE_OUTPUT_DIR ${JAVA_PACKAGE_OUTPUT_DIR}/android)
|
|
file(MAKE_DIRECTORY ${ANDROID_PACKAGE_OUTPUT_DIR})
|
|
endif()
|
|
|
|
# Set platform and arch for packaging
|
|
# Checks the names set by MLAS on non-Windows platforms first
|
|
if (CMAKE_SYSTEM_NAME STREQUAL "Android")
|
|
set(JNI_ARCH ${ANDROID_ABI})
|
|
elseif (ARM64)
|
|
set(JNI_ARCH aarch64)
|
|
elseif (X86_64)
|
|
set(JNI_ARCH x64)
|
|
elseif (POWER)
|
|
set(JNI_ARCH ppc64)
|
|
else()
|
|
# Now mirror the checks used with MSVC
|
|
if(MSVC)
|
|
if(onnxruntime_target_platform STREQUAL "ARM64")
|
|
set(JNI_ARCH aarch64)
|
|
elseif(onnxruntime_target_platform STREQUAL "x64")
|
|
set(JNI_ARCH x64)
|
|
else()
|
|
# if everything else failed then we're on a 32-bit arch and Java isn't supported
|
|
message(FATAL_ERROR "Java is currently not supported on 32-bit x86 architecture")
|
|
endif()
|
|
else()
|
|
# if everything else failed then we're on a 32-bit arch and Java isn't supported
|
|
message(FATAL_ERROR "Java is currently not supported on 32-bit x86 architecture")
|
|
endif()
|
|
endif()
|
|
|
|
if (WIN32)
|
|
set(JAVA_PLAT "win")
|
|
elseif (APPLE)
|
|
set(JAVA_PLAT "osx")
|
|
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
set(JAVA_PLAT "linux")
|
|
else()
|
|
# We don't do distribution for Android
|
|
# Set for completeness
|
|
set(JAVA_PLAT "android")
|
|
endif()
|
|
|
|
# Similar to Nuget schema
|
|
set(JAVA_OS_ARCH ${JAVA_PLAT}-${JNI_ARCH})
|
|
|
|
# expose native libraries to the gradle build process
|
|
set(JAVA_PACKAGE_DIR ai/onnxruntime/native/${JAVA_OS_ARCH})
|
|
set(JAVA_NATIVE_LIB_DIR ${JAVA_OUTPUT_DIR}/native-lib)
|
|
set(JAVA_NATIVE_JNI_DIR ${JAVA_OUTPUT_DIR}/native-jni)
|
|
set(JAVA_PACKAGE_LIB_DIR ${JAVA_NATIVE_LIB_DIR}/${JAVA_PACKAGE_DIR})
|
|
set(JAVA_PACKAGE_JNI_DIR ${JAVA_NATIVE_JNI_DIR}/${JAVA_PACKAGE_DIR})
|
|
file(MAKE_DIRECTORY ${JAVA_PACKAGE_LIB_DIR})
|
|
file(MAKE_DIRECTORY ${JAVA_PACKAGE_JNI_DIR})
|
|
|
|
# On Windows TARGET_LINKER_FILE_NAME is the .lib, TARGET_FILE_NAME is the .dll
|
|
if (WIN32)
|
|
#Our static analysis plugin set /p:LinkCompiled=false
|
|
if(NOT onnxruntime_ENABLE_STATIC_ANALYSIS)
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime> ${JAVA_PACKAGE_LIB_DIR}/$<TARGET_FILE_NAME:onnxruntime>)
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime4j_jni> ${JAVA_PACKAGE_JNI_DIR}/$<TARGET_FILE_NAME:onnxruntime4j_jni>)
|
|
if (onnxruntime_USE_CUDA)
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime_providers_shared> ${JAVA_PACKAGE_LIB_DIR}/$<TARGET_FILE_NAME:onnxruntime_providers_shared>)
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime_providers_cuda> ${JAVA_PACKAGE_LIB_DIR}/$<TARGET_FILE_NAME:onnxruntime_providers_cuda>)
|
|
endif()
|
|
endif()
|
|
else()
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime> ${JAVA_PACKAGE_LIB_DIR}/$<TARGET_LINKER_FILE_NAME:onnxruntime>)
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime4j_jni> ${JAVA_PACKAGE_JNI_DIR}/$<TARGET_LINKER_FILE_NAME:onnxruntime4j_jni>)
|
|
if (onnxruntime_USE_CUDA)
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime_providers_shared> ${JAVA_PACKAGE_LIB_DIR}/$<TARGET_LINKER_FILE_NAME:onnxruntime_providers_shared>)
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime_providers_cuda> ${JAVA_PACKAGE_LIB_DIR}/$<TARGET_LINKER_FILE_NAME:onnxruntime_providers_cuda>)
|
|
endif()
|
|
endif()
|
|
|
|
# run the build process (this copies the results back into CMAKE_CURRENT_BINARY_DIR)
|
|
set(GRADLE_ARGS cmakeBuild -DcmakeBuildDir=${CMAKE_CURRENT_BINARY_DIR})
|
|
if(WIN32)
|
|
set(GRADLE_ARGS ${GRADLE_ARGS} -Dorg.gradle.daemon=false)
|
|
elseif (CMAKE_SYSTEM_NAME STREQUAL "Android")
|
|
# For Android build, we may run gradle multiple times in same build,
|
|
# sometimes gradle JVM will run out of memory if we keep the daemon running
|
|
# it is better to not keep a daemon running
|
|
set(GRADLE_ARGS ${GRADLE_ARGS} --no-daemon)
|
|
endif()
|
|
string(JOIN " " GRADLE_EP_FLAGS ${ORT_PROVIDER_FLAGS})
|
|
set(GRADLE_ARGS ${GRADLE_ARGS} ${GRADLE_EP_FLAGS})
|
|
|
|
message(STATUS "GRADLE_ARGS: ${GRADLE_ARGS}")
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${GRADLE_EXECUTABLE} ${GRADLE_ARGS} WORKING_DIRECTORY ${JAVA_ROOT})
|
|
|
|
if (CMAKE_SYSTEM_NAME STREQUAL "Android")
|
|
set(ANDROID_PACKAGE_JNILIBS_DIR ${JAVA_OUTPUT_DIR}/android)
|
|
set(ANDROID_PACKAGE_ABI_DIR ${ANDROID_PACKAGE_JNILIBS_DIR}/${ANDROID_ABI})
|
|
file(MAKE_DIRECTORY ${ANDROID_PACKAGE_JNILIBS_DIR})
|
|
file(MAKE_DIRECTORY ${ANDROID_PACKAGE_ABI_DIR})
|
|
|
|
# Create symbolic links for onnxruntime.so and onnxruntime4j_jni.so for building Android AAR package
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime> ${ANDROID_PACKAGE_ABI_DIR}/$<TARGET_LINKER_FILE_NAME:onnxruntime>)
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:onnxruntime4j_jni> ${ANDROID_PACKAGE_ABI_DIR}/$<TARGET_LINKER_FILE_NAME:onnxruntime4j_jni>)
|
|
# Generate the Android AAR package
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${GRADLE_EXECUTABLE} -b build-android.gradle -c settings-android.gradle build -DjniLibsDir=${ANDROID_PACKAGE_JNILIBS_DIR} -DbuildDir=${ANDROID_PACKAGE_OUTPUT_DIR} -DminSdkVer=${ANDROID_MIN_SDK} WORKING_DIRECTORY ${JAVA_ROOT})
|
|
|
|
if (onnxruntime_BUILD_UNIT_TESTS)
|
|
set(ANDROID_TEST_PACKAGE_ROOT ${JAVA_ROOT}/src/test/android)
|
|
set(ANDROID_TEST_PACKAGE_DIR ${JAVA_OUTPUT_DIR}/androidtest/android)
|
|
#copy the androidtest project into cmake binary directory
|
|
file(MAKE_DIRECTORY ${JAVA_OUTPUT_DIR}/androidtest)
|
|
file(COPY ${ANDROID_TEST_PACKAGE_ROOT} DESTINATION ${JAVA_OUTPUT_DIR}/androidtest)
|
|
set(ANDROID_TEST_PACKAGE_LIB_DIR ${ANDROID_TEST_PACKAGE_DIR}/app/libs)
|
|
file(MAKE_DIRECTORY ${ANDROID_TEST_PACKAGE_LIB_DIR})
|
|
# Copy the built Android AAR package to libs folder of our test app
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink ${ANDROID_PACKAGE_OUTPUT_DIR}/outputs/aar/onnxruntime-debug.aar ${ANDROID_TEST_PACKAGE_LIB_DIR}/onnxruntime-debug.aar)
|
|
# Build Android test apk for java package
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${GRADLE_EXECUTABLE} clean WORKING_DIRECTORY ${ANDROID_TEST_PACKAGE_DIR})
|
|
add_custom_command(TARGET onnxruntime4j_jni POST_BUILD COMMAND ${GRADLE_EXECUTABLE} assembleDebug assembleDebugAndroidTest -DminSdkVer=${ANDROID_MIN_SDK} WORKING_DIRECTORY ${ANDROID_TEST_PACKAGE_DIR})
|
|
endif()
|
|
endif()
|