Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux-cpu-arm64-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Download Docker Image
run: |
set -e -x
az login --identity --username 63b63039-6328-442f-954b-5a64d124e5b4
az login --identity --object-id c90de106-42dc-405a-8bad-2438f4279448
az acr login --name onnxruntimebuildcache --subscription 00c06639-6ee4-454e-8058-8d8b1703bd87
python3 tools/ci_build/get_docker_image.py --dockerfile tools/ci_build/github/linux/docker/inference/aarch64/default/cpu/Dockerfile \
--context tools/ci_build/github/linux/docker/inference/aarch64/default/cpu \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-gpu-x64-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
- name: Get Docker Image
run: |
set -e -x
az login --identity --username 63b63039-6328-442f-954b-5a64d124e5b4
az login --identity --object-id c90de106-42dc-405a-8bad-2438f4279448
az acr login --name onnxruntimebuildcache --subscription 00c06639-6ee4-454e-8058-8d8b1703bd87
python3 tools/ci_build/get_docker_image.py --dockerfile tools/ci_build/github/linux/docker/manylinux/Dockerfile.manylinux2_28_cuda_12.2 \
--context tools/ci_build/github/linux/docker/manylinux \
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/stages/jobs/steps/capi-linux-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ steps:

- bash: |
set -e -x
az login --identity --username 63b63039-6328-442f-954b-5a64d124e5b4
az login --identity --object-id c90de106-42dc-405a-8bad-2438f4279448
az acr login --name onnxruntimebuildcache --subscription 00c06639-6ee4-454e-8058-8d8b1703bd87
python3 -m pip install requests
python3 tools/ci_build/get_docker_image.py --dockerfile tools/ci_build/github/linux/docker/manylinux/Dockerfile.manylinux2_28_$(ep)_$(cuda_version) \
Expand All @@ -59,7 +59,7 @@ steps:

- bash: |
set -e -x
az login --identity --username 63b63039-6328-442f-954b-5a64d124e5b4
az login --identity --object-id c90de106-42dc-405a-8bad-2438f4279448
az acr login --name onnxruntimebuildcache --subscription 00c06639-6ee4-454e-8058-8d8b1703bd87
python3 -m pip install requests
python3 tools/ci_build/get_docker_image.py --dockerfile tools/ci_build/github/linux/docker/manylinux/Dockerfile.manylinux2_28_$(ep) \
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/stages/jobs/steps/nuget-validation-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ steps:
NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS: 180
- bash: |
set -e -x
az login --identity --username 63b63039-6328-442f-954b-5a64d124e5b4
az login --identity --object-id c90de106-42dc-405a-8bad-2438f4279448
az acr login --name onnxruntimebuildcache --subscription 00c06639-6ee4-454e-8058-8d8b1703bd87
docker pull $(cuda_docker_image)

Expand Down
2 changes: 1 addition & 1 deletion .pipelines/stages/jobs/steps/python-validation-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ steps:

- bash: |
set -e -x
az login --identity --username 63b63039-6328-442f-954b-5a64d124e5b4
az login --identity --object-id c90de106-42dc-405a-8bad-2438f4279448
az acr login --name onnxruntimebuildcache --subscription 00c06639-6ee4-454e-8058-8d8b1703bd87
docker pull $(cuda_docker_image)
python_exe=/opt/python/cp310-cp310/bin/python3.10
Expand Down
28 changes: 18 additions & 10 deletions src/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -723,20 +723,28 @@ void SetProviderOption(Config& config, std::string_view provider_name, std::stri
}

bool IsGraphCaptureEnabled(Config::SessionOptions& session_options) {
for (const auto& provider_options : session_options.provider_options) {
if (provider_options.name == "cuda") {
// Graph Capture is currently broken for CUDA
for (const auto& value : provider_options.options) {
if (value.first == "enable_cuda_graph" && value.second == "1") {
throw std::runtime_error("Graph Capture is currently unsupported for CUDA");
for (const auto& provider : session_options.providers) {
const auto provider_options = std::find_if(session_options.provider_options.begin(),
session_options.provider_options.end(),
[&provider](const Config::ProviderOptions& po) {
return po.name == provider;
});
if (provider_options != session_options.provider_options.end()) {
if (provider_options->name == "cuda") {
// Graph Capture is currently broken for CUDA
for (const auto& value : provider_options->options) {
if (value.first == "enable_cuda_graph" && value.second == "1") {
throw std::runtime_error("Graph Capture is currently unsupported for CUDA");
}
}
} else if (provider_options->name == "DML") {
return true;
} else if (provider_options->name == "NvTensorRtRtx") {
return true;
}
} else if (provider_options.name == "DML") {
return true;
} else if (provider_options.name == "NvTensorRtRtx") {
return true;
}
}

return false;
}

Expand Down
Loading