From d3502dc739ba040746074636fd8d6c06e76d7070 Mon Sep 17 00:00:00 2001 From: xadupre Date: Tue, 29 Nov 2022 16:52:37 +0100 Subject: [PATCH] update example, switch to python310 --- _doc/examples/data/eager_mode.csv | 99 ---------------------- _doc/examples/plot_benchmark_eager_mode.py | 4 +- _doc/sphinxdoc/source/conf.py | 1 + appveyor.yml | 6 +- 4 files changed, 6 insertions(+), 104 deletions(-) delete mode 100644 _doc/examples/data/eager_mode.csv diff --git a/_doc/examples/data/eager_mode.csv b/_doc/examples/data/eager_mode.csv deleted file mode 100644 index e953883..0000000 --- a/_doc/examples/data/eager_mode.csv +++ /dev/null @@ -1,99 +0,0 @@ -name,N,time -numpy,1,1.6239401884377004e-06 -ort-eager,1,1.2923539616167545e-05 -ort,1,7.524730172008276e-06 -ort-ov-eager,1,1.0392629774287342e-05 -ort-ov,1,6.243779789656401e-06 -ort-ov-eager-gpu,1,6.998750963248313e-05 -ort-ov-gpu,1,3.477875958196819e-05 -numpy,2,3.044890472665429e-06 -ort-eager,2,1.3051539426669478e-05 -ort,2,8.713690331205726e-06 -ort-ov-eager,2,1.1555589735507964e-05 -ort-ov,2,7.138750515878201e-06 -ort-ov-eager-gpu,2,7.208543014712632e-05 -ort-ov-gpu,2,3.6394710186868905e-05 -numpy,5,3.831860376521945e-06 -ort-eager,5,1.4171500224620103e-05 -ort,5,8.038709638640285e-06 -ort-ov-eager,5,1.1525589507073164e-05 -ort-ov,5,7.319740252569317e-06 -ort-ov-eager-gpu,5,7.189344032667577e-05 -ort-ov-gpu,5,3.57317307498306e-05 -numpy,10,4.102849634364247e-06 -ort-eager,10,1.4772480353713036e-05 -ort,10,8.412699680775403e-06 -ort-ov-eager,10,1.1969569604843856e-05 -ort-ov,10,7.66773009672761e-06 -ort-ov-eager-gpu,10,7.502933032810688e-05 -ort-ov-gpu,10,3.6292700096964834e-05 -numpy,20,5.108820041641593e-06 -ort-eager,20,1.6318419948220253e-05 -ort,20,9.663649834692478e-06 -ort-ov-eager,20,1.3151530874893069e-05 -ort-ov,20,8.747689425945282e-06 -ort-ov-eager-gpu,20,7.586929947137832e-05 -ort-ov-gpu,20,3.6894690711051223e-05 -numpy,50,8.849690202623605e-06 -ort-eager,50,2.1720220101997255e-05 -ort,50,1.3897509779781103e-05 -ort-ov-eager,50,1.6557410126551987e-05 -ort-ov,50,1.1749580735340715e-05 -ort-ov-eager-gpu,50,8.735888986848295e-05 -ort-ov-gpu,50,3.979059052653611e-05 -numpy,100,1.4907469740137458e-05 -ort-eager,100,2.8627979336306453e-05 -ort,100,2.0100290421396493e-05 -ort-ov-eager,100,2.2381199523806573e-05 -ort-ov,100,1.7124389996752145e-05 -ort-ov-eager-gpu,100,9.972644969820977e-05 -ort-ov-gpu,100,4.341945983469486e-05 -numpy,200,2.7075030375272035e-05 -ort-eager,200,4.3370459461584684e-05 -ort,200,3.119189059361815e-05 -ort-ov-eager,200,3.3285809913650154e-05 -ort-ov,200,2.6379060000181197e-05 -ort-ov-eager-gpu,200,0.0001272184809204191 -ort-ov-gpu,200,5.1265170332044365e-05 -numpy,500,6.265176925808191e-05 -ort-eager,500,8.758387994021178e-05 -ort,500,6.585365976206958e-05 -ort-ov-eager,500,5.8810909977182745e-05 -ort-ov,500,5.206315079703927e-05 -ort-ov-eager-gpu,500,0.0001980439608450979 -ort-ov-gpu,500,7.229942944832146e-05 -numpy,1000,0.00012052271980792284 -ort-eager,1000,0.00020487471017986537 -ort,1000,0.00010618122993037104 -ort-ov-eager,1000,7.917118025943637e-05 -ort-ov,1000,9.659656090661884e-05 -ort-ov-eager-gpu,1000,0.0003143318207003176 -ort-ov-gpu,1000,0.00010537925059907138 -numpy,2000,0.0002533179905731231 -ort-eager,2000,0.00042499787989072504 -ort,2000,0.0003522354701999575 -ort-ov-eager,2000,0.0001527195703238249 -ort-ov,2000,0.0001286304194945842 -ort-ov-eager-gpu,2000,0.0005476115201599896 -ort-ov-gpu,2000,0.00017218387103639542 -numpy,5000,0.0006107362709008157 -ort-eager,5000,0.0007773243507836014 -ort,5000,0.0005611650308128447 -ort-ov-eager,5000,9.656556067056954e-05 -ort-ov,5000,0.000121245690388605 -ort-ov-eager-gpu,5000,0.0012037401704583317 -ort-ov-gpu,5000,0.00034049289068207146 -numpy,10000,0.0011586127802729607 -ort-eager,10000,0.0016428445605561138 -ort,10000,0.0008303114597219974 -ort-ov-eager,10000,0.0003013462794478983 -ort-ov,10000,0.0004336395696736872 -ort-ov-eager-gpu,10000,0.0021700217993929983 -ort-ov-gpu,10000,0.0007736664800904691 -numpy,20000,0.0026089051889721304 -ort-eager,20000,0.003720655629877001 -ort,20000,0.002414294109912589 -ort-ov-eager,20000,0.0006073223997373134 -ort-ov,20000,0.0005382718495093287 -ort-ov-eager-gpu,20000,0.004377091269707307 -ort-ov-gpu,20000,0.0014389527996536344 diff --git a/_doc/examples/plot_benchmark_eager_mode.py b/_doc/examples/plot_benchmark_eager_mode.py index d82fd1b..4d2838b 100644 --- a/_doc/examples/plot_benchmark_eager_mode.py +++ b/_doc/examples/plot_benchmark_eager_mode.py @@ -490,9 +490,9 @@ def subgraph(row, cols): # `run_with_ort_values` and the data needs to be copied from CPU # to GPU. -if not has_cuda: +if sess_add_gpu is None: print("With GPU") - df = pandas.read_csv("data/eager_mode.csv") + df = pandas.read_csv("data/plot_benchmark_eager_mode.csv") _, ax = make_graph(df) else: ax = None diff --git a/_doc/sphinxdoc/source/conf.py b/_doc/sphinxdoc/source/conf.py index 7604328..2a4b435 100644 --- a/_doc/sphinxdoc/source/conf.py +++ b/_doc/sphinxdoc/source/conf.py @@ -158,6 +158,7 @@ def callback_begin(): 'http://www.xavierdupre.fr/app/pandas_streaming/helpsphinx/index.html', 'protobuf': 'https://developers.google.com/protocol-buffers', 'py-spy': 'https://github.com/benfred/py-spy', + 'pybind11': 'https://github.com/pybind/pybind11', 'pyinstrument': 'https://github.com/joerick/pyinstrument', 'pyspark': 'https://spark.apache.org/docs/latest/api/python/', 'python': 'https://www.python.org/', diff --git a/appveyor.yml b/appveyor.yml index ef69685..77320bf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,9 +12,9 @@ install: - "%PYTHON%\\python -m pip install -r requirements.txt" - "%PYTHON%\\python -m pip install -r requirements-dev.txt" - "%PYTHON%\\python -m pip install pytest" - - "%PYTHON%\\python -m pip install https://github.com/sdpython/onnxruntime/releases/download/v1.14.0/onnxruntime_training-1.14.0+cpu-cp310-cp310-win_amd64.whl" - #- "%PYTHON%\\python -m pip install http://www.xavierdupre.fr/enseignement/setup/torch_interop_utils-1.10.1+cpu-cp39-cp39-win_amd64.whl" - #- "%PYTHON%\\python -m pip install http://www.xavierdupre.fr/enseignement/setup/aten_op_executor-1.10.1+cpu-cp39-cp39-win_amd64.whl" + - "%PYTHON%\\python -m pip install https://github.com/sdpython/onnxruntime/releases/download/v1.14.0/onnxruntime_training-1.14.92+cpu-cp310-cp310-win_amd64.whl" + - "%PYTHON%\\python -m pip install https://github.com/sdpython/onnxruntime/releases/download/v1.14.0/aten_op_executor-1.13.0+cpu-cp310-cp310-win_amd64.whl" + - "%PYTHON%\\python -m pip install https://github.com/sdpython/onnxruntime/releases/download/v1.14.0/torch_interop_utils-1.13.0+cpu-cp310-cp310-win_amd64.whl" build: off