Skip to content

Commit af00a20

Browse files
authored
Change ORT nightly python packages' name (#22450)
### Description Our nightly CPU python package's name is "ort-nightly" instead of "onnxruntime". It was because of some historical reasons. Tensorflow was like that. Now we would prefer to make them the same. Do this change for all nightly python packages, including CPU, GPU(CUDA), and maybe others. ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. -->
1 parent a5e85a9 commit af00a20

File tree

9 files changed

+11
-22
lines changed

9 files changed

+11
-22
lines changed

onnxruntime/python/tools/transformers/machine_info.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ def get_related_packages(self) -> List[str]:
129129
related_packages = [
130130
"onnxruntime-gpu",
131131
"onnxruntime",
132-
"ort-nightly-gpu",
133-
"ort-nightly",
134132
"onnx",
135133
"transformers",
136134
"protobuf",

onnxruntime/python/tools/transformers/models/llama/benchmark_all.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,7 @@ def save_results(results, filename):
249249

250250
installed_packages = pkg_resources.working_set
251251
installed_packages_list = sorted(
252-
[
253-
f"{i.key}=={i.version}"
254-
for i in installed_packages
255-
if i.key in ["ort-nightly-gpu", "ort-nightly", "onnxruntime", "onnxruntime-gpu"]
256-
]
252+
[f"{i.key}=={i.version}" for i in installed_packages if i.key in ["onnxruntime", "onnxruntime-gpu"]]
257253
)
258254

259255
ort_pkg_name = ""

onnxruntime/python/tools/transformers/models/whisper/benchmark_all.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,7 @@ def save_results(results, filename):
291291

292292
installed_packages = pkg_resources.working_set
293293
installed_packages_list = sorted(
294-
[
295-
f"{i.key}=={i.version}"
296-
for i in installed_packages
297-
if i.key in ["ort-nightly-gpu", "ort-nightly", "onnxruntime", "onnxruntime-gpu"]
298-
]
294+
[f"{i.key}=={i.version}" for i in installed_packages if i.key in ["onnxruntime", "onnxruntime-gpu"]]
299295
)
300296
ort_pkg_name = ""
301297
ort_pkg_version = ""

onnxruntime/python/tools/transformers/run_benchmark.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/bash
12
# -------------------------------------------------------------------------
23
# Copyright (c) Microsoft Corporation. All rights reserved.
34
# Licensed under the MIT License. See License.txt in the project root for
@@ -91,7 +92,6 @@ fi
9192

9293

9394
if [ "$run_install" = true ] ; then
94-
pip uninstall --yes ort-nightly ort-gpu-nightly
9595
pip uninstall --yes onnxruntime
9696
pip uninstall --yes onnxruntime-gpu
9797
if [ "$run_cpu_fp32" = true ] || [ "$run_cpu_int8" = true ]; then

setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ def parse_arg_remove_string(argv, arg_name_equal):
4949
# Any combination of the following arguments can be applied
5050

5151
if parse_arg_remove_boolean(sys.argv, "--nightly_build"):
52-
package_name = "ort-nightly"
5352
nightly_build = True
5453

5554
wheel_name_suffix = parse_arg_remove_string(sys.argv, "--wheel_name_suffix=")
@@ -89,10 +88,10 @@ def parse_arg_remove_string(argv, arg_name_equal):
8988
pass
9089
elif parse_arg_remove_boolean(sys.argv, "--use_qnn"):
9190
is_qnn = True
92-
package_name = "onnxruntime-qnn" if not nightly_build else "ort-nightly-qnn"
91+
package_name = "onnxruntime-qnn"
9392

9493
if is_rocm or is_migraphx:
95-
package_name = "onnxruntime-rocm" if not nightly_build else "ort-rocm-nightly"
94+
package_name = "onnxruntime-rocm"
9695

9796
# PEP 513 defined manylinux1_x86_64 and manylinux1_i686
9897
# PEP 571 defined manylinux2010_x86_64 and manylinux2010_i686

tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-vs-2022-job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ jobs:
216216

217217
- ${{ if eq(parameters.EnablePython, true) }}:
218218
- powershell: |
219-
python3 -m pip uninstall -y ort-nightly-gpu ort-nightly onnxruntime onnxruntime-gpu onnxruntime-training onnxruntime-directml ort-nightly-directml -qq
219+
python3 -m pip uninstall -y onnxruntime onnxruntime-gpu onnxruntime-training onnxruntime-directml -qq
220220
Get-ChildItem -Path dist/*.whl | foreach {pip --disable-pip-version-check install --upgrade $_.fullname}
221221
222222
workingDirectory: '$(Build.BinariesDirectory)\${{ parameters.BuildConfig }}\${{ parameters.BuildConfig }}'

tools/ci_build/github/azure-pipelines/templates/py-packaging-selectable-stage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ stages:
241241
**/*.dll
242242
243243
- powershell: |
244-
python -m pip uninstall -y ort-nightly-gpu ort-nightly onnxruntime onnxruntime-gpu -qq
244+
python -m pip uninstall -y onnxruntime onnxruntime-gpu -qq
245245
Get-ChildItem -Path $(Build.ArtifactStagingDirectory)/*.whl | foreach {pip --disable-pip-version-check install --force-reinstall --upgrade $_.fullname tabulate}
246246
python -m pip install protobuf==3.18.1
247247
Remove-Item -Recurse -Force onnxruntime
@@ -334,7 +334,7 @@ stages:
334334
rm -rf $(Build.BinariesDirectory)/Release/onnxruntime $(Build.BinariesDirectory)/Release/pybind11
335335
sudo rm -f /build /onnxruntime_src
336336
sudo ln -s $(Build.SourcesDirectory) /onnxruntime_src
337-
python3 -m pip uninstall -y ort-nightly-gpu ort-nightly onnxruntime onnxruntime-gpu onnxruntime-training onnxruntime-directml ort-nightly-directml -qq
337+
python3 -m pip uninstall -y onnxruntime onnxruntime-gpu onnxruntime-training onnxruntime-directml -qq
338338
cp $(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt $(Build.BinariesDirectory)/requirements.txt
339339
# Test ORT with the latest ONNX release.
340340
sed -i "s/git+http:\/\/github\.com\/onnx\/onnx.*/onnx/" $(Build.BinariesDirectory)/requirements.txt
@@ -497,7 +497,7 @@ stages:
497497
**/*.dll
498498
499499
- powershell: |
500-
python -m pip uninstall -y ort-nightly-gpu ort-nightly onnxruntime onnxruntime-gpu -qq
500+
python -m pip uninstall -y onnxruntime onnxruntime-gpu -qq
501501
Get-ChildItem -Path $(Build.ArtifactStagingDirectory)/*.whl | foreach {pip --disable-pip-version-check install --upgrade $_.fullname tabulate}
502502
Remove-Item -Recurse -Force onnxruntime
503503
python onnx_backend_test_series.py

tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ stages:
241241
continueOnError: true
242242

243243
- powershell: |
244-
python -m pip uninstall -y ort-nightly-gpu ort-nightly onnxruntime onnxruntime-gpu -qq
244+
python -m pip uninstall -y onnxruntime onnxruntime-gpu -qq
245245
Get-ChildItem -Path $(Build.ArtifactStagingDirectory)/*.whl | foreach {pip --disable-pip-version-check install --upgrade $_.fullname tabulate}
246246
Remove-Item -Recurse -Force onnxruntime
247247
if ("$(ExtraParam)" -contains "--use_azure") {

tools/ci_build/github/azure-pipelines/templates/py-win-gpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ stages:
259259
arguments: -cpu_arch x64 -install_prefix $(Build.BinariesDirectory)\${{ parameters.cmake_build_type }}\installed -build_config ${{ parameters.cmake_build_type }}
260260

261261
- powershell: |
262-
python -m pip uninstall -y ort-nightly-gpu ort-nightly onnxruntime onnxruntime-gpu -qq
262+
python -m pip uninstall -y onnxruntime onnxruntime-gpu -qq
263263
Get-ChildItem -Path $(Build.ArtifactStagingDirectory)/*cp${{ replace(parameters.PYTHON_VERSION,'.','') }}*.whl | foreach {pip --disable-pip-version-check install --upgrade $_.fullname tabulate}
264264
mkdir -p $(Agent.TempDirectory)\ort_test_data
265265
Copy-Item -Path $(Build.sourcesDirectory)/onnxruntime/test/python/onnx_backend_test_series.py -Destination $(Agent.TempDirectory)\ort_test_data

0 commit comments

Comments
 (0)