diff --git a/index.html b/index.html index f953e020f4..d7054a9cb6 100644 --- a/index.html +++ b/index.html @@ -724,6 +724,29 @@ Console.WriteLine(outputs[0].AsTensor()[0]); +
+
+

Build

+

+ Build list contains two items +

+
+
+
+
+ Stable +
+
+ Preview (Nightly) +
+
+
+
+

diff --git a/js/script.js b/js/script.js index 55bba8601c..e54d772e7a 100644 --- a/js/script.js +++ b/js/script.js @@ -24,6 +24,7 @@ var ot_opts = { ot_architecture: 'ot_X64', ot_language: '', ot_hardwareAcceleration: '', + ot_build: '' }; var os = $(".os > .r-option"); @@ -39,6 +40,7 @@ var ot_scenario = $(".ot_scenario > .r-option"); var ot_architecture = $(".ot_architecture > .r-option"); var ot_language = $(".ot_language > .r-option"); var ot_hardwareAcceleration = $(".ot_hardwareAcceleration > .r-option"); +var ot_build = $(".ot_build > .r-option"); var supported = true; var ot_defaultSelection = true; @@ -83,6 +85,14 @@ ot_scenario.on("keypress keyup", function (event) { ot_selectedOption(ot_scenario, this, "ot_scenario"); } }); +ot_build.on("click", function () { + ot_selectedOption(ot_build, this, "ot_build"); +}); +ot_build.on("keypress keyup", function (event) { + if (checkKeyPress(event)) { + ot_selectedOption(ot_build, this, "ot_build"); + } +}); architecture.on("click", function () { selectedOption(architecture, this, "architecture"); }); @@ -184,11 +194,6 @@ function checkValidity(){ var current_arch = opts['architecture']; var current_hw = opts['hardwareAcceleration']; - // console.log("current: "+current_os); - // console.log("current: "+current_arch); - // console.log("current: "+current_lang); - // console.log("current: "+current_hw); - var valid = Object.getOwnPropertyNames(validCombos); //os section @@ -269,7 +274,6 @@ function checkValidity(){ } if(isvalidcombo==false && hardwareAcceleration[i].id!=current_hw){ - // console.log(hardwareAcceleration[i]); $(hardwareAcceleration[i]).addClass("gray"); } } @@ -281,25 +285,15 @@ function ot_checkValidity(){ var current_lang = ot_opts['ot_language']; var current_arch = ot_opts['ot_architecture']; var current_hw = ot_opts['ot_hardwareAcceleration']; - - // console.log("current: "+current_os); - // console.log("current: "+current_arch); - // console.log("current: "+current_lang); - // console.log("current: "+current_hw); - + var current_build = ot_opts['ot_build']; var valid = Object.getOwnPropertyNames(ot_validCombos); // scenario section for(var i =0; i<cu_version*>.html
pip install torch-ort
python -m torch_ort.configure

*Available versions", - "ot_linux,ot_large_model,ot_python,ot_X64,ot_ROCm": + "ot_linux,ot_large_model,ot_python,ot_X64,ot_CUDA,ot_nightly": + "pip install onnxruntime-training -f https://downloads.onnxruntime.ai/onnxruntime_nightly_<cu_version*>.html
pip install torch-ort
python -m torch_ort.configure

*Available versions", + + "ot_linux,ot_large_model,ot_python,ot_X64,ot_ROCm,ot_stable": "pip install onnxruntime-training -f https://downloads.onnxruntime.ai/onnxruntime_stable_<rocm_version*>.html
pip install torch-ort
python -m torch_ort.configure

*Available versions", - "ot_linux,ot_on_device,ot_python,ot_X64,ot_CPU": - "pip install onnxruntime-training

*Available versions", + "ot_linux,ot_large_model,ot_python,ot_X64,ot_ROCm,ot_nightly": + "pip install onnxruntime-training -f https://downloads.onnxruntime.ai/onnxruntime_nightly_<rocm_version*>.html
pip install torch-ort
python -m torch_ort.configure

*Available versions", + + "ot_linux,ot_on_device,ot_python,ot_X64,ot_CPU,ot_stable": + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/ onnxruntime-training-cpu", - "ot_linux,ot_on_device,ot_python,ot_X64,ot_CUDA": - "Follow build instructions from here", + "ot_linux,ot_on_device,ot_python,ot_X64,ot_CPU,ot_nightly": + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-nightly/pypi/simple/ onnxruntime-training-cpu", - "ot_windows,ot_on_device,ot_python,ot_X64,ot_CPU": - "Follow build instructions from here", + "ot_linux,ot_on_device,ot_python,ot_X64,ot_CUDA,ot_stable": + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/ onnxruntime-training", - "ot_windows,ot_on_device,ot_python,ot_X64,ot_CUDA": - "Follow build instructions from here", + "ot_linux,ot_on_device,ot_python,ot_X64,ot_CUDA,ot_nightly": + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ onnxruntime-training", - "ot_windows,ot_on_device,ot_c,ot_X64,ot_CPU": - "Install Nuget package Microsoft.ML.OnnxRuntime.Training", - "ot_windows,ot_on_device,ot_cplusplus,ot_X64,ot_CPU": - "Install Nuget package Microsoft.ML.OnnxRuntime.Training", - - "ot_windows,ot_on_device,ot_csharp,ot_X64,ot_CPU": - "Install Nuget package Microsoft.ML.OnnxRuntime.Training", - - "ot_linux,ot_on_device,ot_c,ot_X64,ot_CPU": - "Download .tgz file from Github
Refer to docs for requirements.", - - "ot_linux,ot_on_device,ot_cplusplus,ot_X64,ot_CPU": + "ot_linux,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_stable": "Download .tgz file from Github
Refer to docs for requirements.", - "ot_linux,ot_on_device,ot_csharp,ot_X64,ot_CPU": + "ot_linux,ot_on_device,ot_csharp,ot_X64,ot_CPU,ot_stable": "Install Nuget package Microsoft.ML.OnnxRuntime.Training", - "ot_linux,ot_on_device,ot_c,ot_X64,ot_CUDA": + "ot_linux,ot_on_device,ot_c,ot_X64,ot_CUDA,ot_stable": "Follow build instructions from here", - "ot_linux,ot_on_device,ot_cplusplus,ot_X64,ot_CUDA": + "ot_linux,ot_on_device,ot_cplusplus,ot_X64,ot_CUDA,ot_stable": "Follow build instructions from here", - "ot_linux,ot_on_device,ot_csharp,ot_X64,ot_CUDA": + "ot_linux,ot_on_device,ot_csharp,ot_X64,ot_CUDA,ot_stable": "Follow build instructions from here", - "ot_windows,ot_on_device,ot_c,ot_X64,ot_CUDA": + "ot_linux,ot_on_device,ot_c,ot_X64,ot_CPU,ot_stable": + "Download .tgz file from Github
Refer to docs for requirements.", + + "ot_windows,ot_on_device,ot_python,ot_X64,ot_CPU,ot_stable": + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/ onnxruntime-training-cpu", + + "ot_windows,ot_on_device,ot_python,ot_X64,ot_CPU,ot_nightly": + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ onnxruntime-training-cpu", + + "ot_windows,ot_on_device,ot_python,ot_X64,ot_CUDA,ot_stable": "Follow build instructions from here", - "ot_windows,ot_on_device,ot_cplusplus,ot_X64,ot_CUDA": + "ot_windows,ot_on_device,ot_c,ot_X64,ot_CPU,ot_stable": + "Install Nuget package Microsoft.ML.OnnxRuntime.Training", + + "ot_windows,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_stable": + "Install Nuget package Microsoft.ML.OnnxRuntime.Training", + + "ot_windows,ot_on_device,ot_csharp,ot_X64,ot_CPU,ot_stable": + "Install Nuget package Microsoft.ML.OnnxRuntime.Training", + + "ot_windows,ot_on_device,ot_c,ot_X64,ot_CUDA,ot_stable": + "Follow build instructions from here", + + "ot_windows,ot_on_device,ot_cplusplus,ot_X64,ot_CUDA,ot_stable": "Follow build instructions from here", - "ot_windows,ot_on_device,ot_csharp,ot_X64,ot_CUDA": + "ot_windows,ot_on_device,ot_csharp,ot_X64,ot_CUDA,ot_stable": "Follow build instructions from here", - "ot_android,ot_on_device,ot_c,ot_X64,ot_CPU": + "ot_android,ot_on_device,ot_c,ot_X64,ot_CPU,ot_stable": "Follow installation instructions from here", - "ot_android,ot_on_device,ot_cplusplus,ot_X64,ot_CPU": + "ot_android,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_stable": "Follow installation instructions from here", - "ot_android,ot_on_device,ot_java,ot_X64,ot_CPU": + "ot_android,ot_on_device,ot_java,ot_X64,ot_CPU,ot_stable": "Add a dependency on com.microsoft.onnxruntime:onnxruntime-training-android using Maven/Gradle and refer to the instructions here.", - "ot_mac,ot_on_device,ot_python,ot_X64,ot_CPU": - "pip install onnxruntime-training

*Available versions", + "ot_android,ot_on_device,ot_c,ot_X64,ot_CPU,ot_nightly": + "Follow build instructions from here", - "ot_ios,ot_on_device,ot_objc,ot_X64,ot_CPU": + "ot_android,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_nightly": + "Follow build instructions from here", + + "ot_android,ot_on_device,ot_java,ot_X64,ot_CPU,ot_nightly": + "Follow build instructions from here", + + "ot_mac,ot_on_device,ot_python,ot_X64,ot_CPU,ot_stable": + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT/pypi/simple/ onnxruntime-training-cpu", + + "ot_mac,ot_on_device,ot_python,ot_X64,ot_CPU,ot_nightly": + "python -m pip install cerberus flatbuffers h5py numpy>=1.16.6 onnx packaging protobuf sympy setuptools>=41.4.0
pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ onnxruntime-training-cpu", + + "ot_ios,ot_on_device,ot_objc,ot_X64,ot_CPU,ot_stable": "Add 'onnxruntime-training-objc' using CocoaPods and refer to the mobile deployment guide", - "ot_ios,ot_on_device,ot_c,ot_X64,ot_CPU": + "ot_ios,ot_on_device,ot_c,ot_X64,ot_CPU,ot_stable": "Add 'onnxruntime-training-c' using CocoaPods and refer to the mobile deployment guide", - "ot_ios,ot_on_device,ot_cplusplus,ot_X64,ot_CPU": + "ot_ios,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_stable": "Add 'onnxruntime-training-c' using CocoaPods and refer to the mobile deployment guide", + "ot_ios,ot_on_device,ot_objc,ot_X64,ot_CPU,ot_nightly": + "Follow build instructions from here", + + "ot_ios,ot_on_device,ot_c,ot_X64,ot_CPU,ot_nightly": + "Follow build instructions from here", + + "ot_ios,ot_on_device,ot_cplusplus,ot_X64,ot_CPU,ot_nightly": + "Follow build instructions from here", + }; function ot_commandMessage(key) { $("#ot_command").removeClass("valid"); $("#ot_command").removeClass("invalid"); - if(ot_opts['ot_os']=='' || ot_opts['ot_scenario'] == '' || ot_opts['ot_architecture'] == '' || ot_opts['ot_language']=='' || ot_opts['ot_hardwareAcceleration'] == ''){ - // console.log(ot_opts); + if(ot_opts['ot_os']=='' || ot_opts['ot_scenario'] == '' || ot_opts['ot_architecture'] == '' || ot_opts['ot_language']=='' || ot_opts['ot_hardwareAcceleration'] == '' || ot_opts['ot_build'] == ''){ $("#ot_command span").html( "Please select a combination of resources" ) @@ -669,21 +718,6 @@ function ot_commandMessage(key) { return true; } - // //console.log('key- '+key); - // var ot_object = { - // "ot_linux,ot_ORTModule,ot_X64,ot_CUDA10": - // "Follow sample notebook from here", - - // "ot_linux,ot_TensorFlow,ot_X64,ot_CUDA10": - // "Coming Soon", - // }; - // if (!ot_object.hasOwnProperty(key)) { - // $("#ot_command span").html( - // "Coming Soon" - // ); - // } else { - // $("#ot_command span").html(ot_object[key]); - // } } var validCombos = { @@ -1335,14 +1369,12 @@ var validCombos = { }; function commandMessage(key) { - // console.log('key- '.key); $("#command").removeClass("valid"); $("#command").removeClass("invalid"); if(opts['os']=='web' && opts['language']=='JS' &&validCombos.hasOwnProperty(key)){ $("#command span").html(validCombos[key]); - // console.log(element); $("#command").addClass("valid"); return true; } @@ -1360,7 +1392,6 @@ function commandMessage(key) { return false; } else { $("#command span").html(validCombos[key]); - // console.log(element); $("#command").addClass("valid"); return true; }