diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index 35a95c2c90..8a792bb95f 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -1822,8 +1822,12 @@ def build_nuget_package(source_dir, build_dir, configs, use_cuda, use_openvino, run_subprocess(cmd_args, cwd=csharp_build_dir) if is_windows(): - # this path is setup by cmake/nuget_helpers.cmake for MSVC on Windows - nuget_exe = os.path.normpath(os.path.join(native_dir, config, "nuget_exe", "src", "nuget.exe")) + if use_openvino: + # user needs to make sure nuget is installed and added to the path variable + nuget_exe = "nuget.exe" + else: + # this path is setup by cmake/nuget_helpers.cmake for MSVC on Windows + nuget_exe = os.path.normpath(os.path.join(native_dir, config, "nuget_exe", "src", "nuget.exe")) else: # user needs to make sure nuget is installed and can be found nuget_exe = "nuget" diff --git a/tools/nuget/generate_nuspec_for_native_nuget.py b/tools/nuget/generate_nuspec_for_native_nuget.py index 1e99e22fda..438e77d609 100644 --- a/tools/nuget/generate_nuspec_for_native_nuget.py +++ b/tools/nuget/generate_nuspec_for_native_nuget.py @@ -33,7 +33,8 @@ def get_package_name(os, cpu_arch, ep): # Currently we take onnxruntime_providers_cuda from CUDA build -# And onnxruntime, onnxruntime_providers_shared and onnxruntime_providers_tensorrt from tensorrt build +# And onnxruntime, onnxruntime_providers_shared and +# onnxruntime_providers_tensorrt from tensorrt build def is_this_file_needed(ep, filename): return (ep != 'cuda' or 'cuda' in filename) and (ep != 'tensorrt' or 'cuda' not in filename) @@ -453,6 +454,7 @@ def generate_files(list, args): runtimes_target + args.target_architecture + '\\native" />') if args.execution_provider == "openvino": + openvino_path = get_env_var('INTEL_OPENVINO_DIR') files_list.append('') @@ -460,6 +462,29 @@ def generate_files(list, args): nuget_dependencies['openvino_ep_shared_lib']) + runtimes_target + args.target_architecture + '\\native" />') + if is_windows(): + dll_list_path = os.path.join(openvino_path, 'deployment_tools\\inference_engine\\bin\\intel64\\Release\\') + for dll_element in os.listdir(dll_list_path): + if dll_element.endswith('dll'): + files_list.append('') + ngraph_list_path = os.path.join(openvino_path, 'deployment_tools\\ngraph\\lib\\') + for ngraph_element in os.listdir(ngraph_list_path): + if ngraph_element.endswith('dll'): + files_list.append('') + # plugins.xml + files_list.append('') + # usb-ma2x8x.mvcmd + files_list.append('') + tbb_list_path = os.path.join(openvino_path, 'deployment_tools\\inference_engine\\external\\tbb\\bin\\') + for tbb_element in os.listdir(tbb_list_path): + if tbb_element.endswith('dll'): + files_list.append('') + if args.execution_provider == "cuda" or is_cuda_gpu_package and not is_ado_packaging_build: files_list.append('