From 77a066c700d8ee936c19eed1214527a324c75257 Mon Sep 17 00:00:00 2001 From: RandySheriffH <48490400+RandySheriffH@users.noreply.github.com> Date: Mon, 26 Sep 2022 17:06:08 -0700 Subject: [PATCH] Drop nuphar from java API (#13107) Drop nuphar from: - java API - tvm.cmake - run_build.sh --- cmake/external/tvm.cmake | 20 +------------------ .../main/java/ai/onnxruntime/OrtProvider.java | 1 - .../main/java/ai/onnxruntime/OrtSession.java | 4 ---- ...ai_onnxruntime_OrtSession_SessionOptions.c | 18 ----------------- tools/ci_build/github/linux/run_build.sh | 2 +- 5 files changed, 2 insertions(+), 43 deletions(-) diff --git a/cmake/external/tvm.cmake b/cmake/external/tvm.cmake index 597355daa7..61db398df6 100644 --- a/cmake/external/tvm.cmake +++ b/cmake/external/tvm.cmake @@ -21,22 +21,4 @@ if (onnxruntime_USE_TVM) set(tvm_INCLUDE_DIRS ${tvm_SOURCE_DIR}/include) -endif() - -if (onnxruntime_USE_NUPHAR) - message(STATUS "onnxruntime_USE_NUPHAR: Fetch onnxruntime-tvm for NUPHAR EP") - - FetchContent_Declare( - tvm - GIT_REPOSITORY https://github.com/microsoft/onnxruntime-tvm.git - GIT_TAG 9ec2b92d180dff8877e402018b97baa574031b8b - ) - - FetchContent_GetProperties(tvm) - if(NOT tvm_POPULATED) - FetchContent_Populate(tvm) - endif() - - set(tvm_INCLUDE_DIRS ${tvm_SOURCE_DIR}/include) - -endif() +endif() \ No newline at end of file diff --git a/java/src/main/java/ai/onnxruntime/OrtProvider.java b/java/src/main/java/ai/onnxruntime/OrtProvider.java index 21ad99fb8b..cb35bf4f50 100644 --- a/java/src/main/java/ai/onnxruntime/OrtProvider.java +++ b/java/src/main/java/ai/onnxruntime/OrtProvider.java @@ -13,7 +13,6 @@ public enum OrtProvider { CUDA("CUDAExecutionProvider"), DNNL("DnnlExecutionProvider"), OPEN_VINO("OpenVINOExecutionProvider"), - NUPHAR("NupharExecutionProvider"), VITIS_AI("VitisAIExecutionProvider"), TENSOR_RT("TensorrtExecutionProvider"), NNAPI("NnapiExecutionProvider"), diff --git a/java/src/main/java/ai/onnxruntime/OrtSession.java b/java/src/main/java/ai/onnxruntime/OrtSession.java index 86a70a437d..3ae8ca77cb 100644 --- a/java/src/main/java/ai/onnxruntime/OrtSession.java +++ b/java/src/main/java/ai/onnxruntime/OrtSession.java @@ -1090,10 +1090,6 @@ public class OrtSession implements AutoCloseable { private native void addNnapi(long apiHandle, long nativeHandle, int nnapiFlags) throws OrtException; - private native void addNuphar( - long apiHandle, long nativeHandle, int allowUnalignedBuffers, String settings) - throws OrtException; - private native void addTvm(long apiHandle, long nativeHandle, String settings) throws OrtException; diff --git a/java/src/main/native/ai_onnxruntime_OrtSession_SessionOptions.c b/java/src/main/native/ai_onnxruntime_OrtSession_SessionOptions.c index 87f89b4974..bf530be1e4 100644 --- a/java/src/main/native/ai_onnxruntime_OrtSession_SessionOptions.c +++ b/java/src/main/native/ai_onnxruntime_OrtSession_SessionOptions.c @@ -484,24 +484,6 @@ JNIEXPORT void JNICALL Java_ai_onnxruntime_OrtSession_00024SessionOptions_addNna #endif } -/* - * Class: ai_onnxruntime_OrtSession_SessionOptions - * Method: addNuphar - * Signature: (JILjava/lang/String)V - */ -JNIEXPORT void JNICALL Java_ai_onnxruntime_OrtSession_00024SessionOptions_addNuphar - (JNIEnv * jniEnv, jobject jobj, jlong apiHandle, jlong handle, jint allowUnalignedBuffers, jstring settingsString) { - (void)jobj; - #ifdef USE_NUPHAR - const char* settings = (*jniEnv)->GetStringUTFChars(jniEnv, settingsString, NULL); - checkOrtStatus(jniEnv,(const OrtApi*)apiHandle,OrtSessionOptionsAppendExecutionProvider_Nuphar((OrtSessionOptions*) handle, allowUnalignedBuffers, settings)); - (*jniEnv)->ReleaseStringUTFChars(jniEnv,settingsString,settings); - #else - (void)apiHandle;(void)handle;(void)allowUnalignedBuffers;(void)settingsString; // Parameters used when Nuphar is defined. - throwOrtException(jniEnv,convertErrorCode(ORT_INVALID_ARGUMENT),"This binary was not compiled with Nuphar support."); - #endif -} - /* * Class:: ai_onnxruntime_OrtSession_SessionOptions * Method: addTvm diff --git a/tools/ci_build/github/linux/run_build.sh b/tools/ci_build/github/linux/run_build.sh index 2a4fee76db..574aed84c5 100755 --- a/tools/ci_build/github/linux/run_build.sh +++ b/tools/ci_build/github/linux/run_build.sh @@ -35,7 +35,7 @@ if [ $BUILD_OS = "yocto" ]; then cd build . /opt/fsl-imx-xwayland/$YOCTO_FOLDER/environment-setup-aarch64-poky-linux alias cmake="/usr/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$OECORE_NATIVE_SYSROOT/usr/share/cmake/OEToolchainConfig.cmake" - cmake ../cmake -Donnxruntime_RUN_ONNX_TESTS=OFF -Donnxruntime_GENERATE_TEST_REPORTS=ON -Donnxruntime_DEV_MODE=ON -DPYTHON_EXECUTABLE=/usr/bin/python3 -Donnxruntime_USE_CUDA=OFF -Donnxruntime_USE_NSYNC=OFF -Donnxruntime_CUDNN_HOME= -Donnxruntime_USE_JEMALLOC=OFF -Donnxruntime_ENABLE_PYTHON=OFF -Donnxruntime_BUILD_CSHARP=OFF -Donnxruntime_USE_EIGEN_FOR_BLAS=ON -Donnxruntime_USE_OPENBLAS=OFF -Donnxruntime_USE_ACL=ON -Donnxruntime_USE_MKLDNN=OFF -Donnxruntime_USE_MKLML=OFF -Donnxruntime_USE_NUPHAR_TVM=OFF -Donnxruntime_USE_LLVM=OFF -Donnxruntime_ENABLE_MICROSOFT_INTERNAL=OFF -Donnxruntime_USE_NUPHAR=OFF -Donnxruntime_USE_EIGEN_THREADPOOL=OFF -Donnxruntime_BUILD_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=/opt/fsl-imx-xwayland/$YOCTO_FOLDER/sysroots/aarch64-poky-linux/usr/include -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=/opt/fsl-imx-xwayland/$YOCTO_FOLDER/sysroots/aarch64-poky-linux/usr/include -DONNX_CUSTOM_PROTOC_EXECUTABLE=/usr/bin/protoc + cmake ../cmake -Donnxruntime_RUN_ONNX_TESTS=OFF -Donnxruntime_GENERATE_TEST_REPORTS=ON -Donnxruntime_DEV_MODE=ON -DPYTHON_EXECUTABLE=/usr/bin/python3 -Donnxruntime_USE_CUDA=OFF -Donnxruntime_USE_NSYNC=OFF -Donnxruntime_CUDNN_HOME= -Donnxruntime_USE_JEMALLOC=OFF -Donnxruntime_ENABLE_PYTHON=OFF -Donnxruntime_BUILD_CSHARP=OFF -Donnxruntime_USE_EIGEN_FOR_BLAS=ON -Donnxruntime_USE_OPENBLAS=OFF -Donnxruntime_USE_ACL=ON -Donnxruntime_USE_MKLDNN=OFF -Donnxruntime_USE_MKLML=OFF -Donnxruntime_USE_LLVM=OFF -Donnxruntime_ENABLE_MICROSOFT_INTERNAL=OFF -Donnxruntime_USE_NUPHAR=OFF -Donnxruntime_USE_EIGEN_THREADPOOL=OFF -Donnxruntime_BUILD_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=/opt/fsl-imx-xwayland/$YOCTO_FOLDER/sysroots/aarch64-poky-linux/usr/include -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=/opt/fsl-imx-xwayland/$YOCTO_FOLDER/sysroots/aarch64-poky-linux/usr/include -DONNX_CUSTOM_PROTOC_EXECUTABLE=/usr/bin/protoc make -j$(nproc) else