diff --git a/.azure-pipelines/linux-CI-nightly.yml b/.azure-pipelines/linux-CI-nightly.yml deleted file mode 100644 index 0135a2fd..00000000 --- a/.azure-pipelines/linux-CI-nightly.yml +++ /dev/null @@ -1,66 +0,0 @@ -# Python package -# Create and test a Python package on multiple Python versions. -# Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more: -# https://docs.microsoft.com/azure/devops/pipelines/languages/python - -trigger: -- master - -jobs: - -- job: 'Test' - pool: - vmImage: 'Ubuntu-16.04' - strategy: - matrix: - Python39-nightly: - python.version: '3.9' - ORT_PATH: -i https://test.pypi.org/simple/ ort-nightly - COREML_PATH: git+https://github.com/apple/coremltools@3.1 - Python38-nightly: - python.version: '3.8' - ORT_PATH: -i https://test.pypi.org/simple/ ort-nightly - COREML_PATH: git+https://github.com/apple/coremltools@3.1 - Python37-nightly: - python.version: '3.7' - ORT_PATH: -i https://test.pypi.org/simple/ ort-nightly - COREML_PATH: git+https://github.com/apple/coremltools@3.1 - maxParallel: 3 - - steps: - - script: sudo install -d -m 0777 /home/vsts/.conda/envs - displayName: Fix Conda permissions - - - task: CondaEnvironment@1 - inputs: - createCustomEnvironment: true - environmentName: 'py$(python.version)' - packageSpecs: 'python=$(python.version)' - - - script: | - python -m pip install --upgrade pip - conda config --set always_yes yes --set changeps1 no - conda install -c conda-forge protobuf - conda install -c conda-forge numpy - conda install -c conda-forge cmake - python -m pip install $(COREML_PATH) - python -m pip install $(ONNX_PATH) - python -m pip install hummingbird-ml --no-deps - python -m pip install -r requirements.txt - python -m pip install -r requirements-dev.txt - python -m pip install $(ORT_PATH) - python -m pip install pytest - displayName: 'Install dependencies' - - - script: | - pip install -e . - python -c "import onnxconverter_common;print(onnxconverter_common.__version__)" - python -c "import onnxruntime;print(onnxruntime.__version__)" - pytest tests --ignore=tests/sparkml --doctest-modules --junitxml=junit/test-results.xml - displayName: 'pytest - onnxmltools' - - - task: PublishTestResults@2 - inputs: - testResultsFiles: '**/test-results.xml' - testRunTitle: 'Python $(python.version)' - condition: succeededOrFailed() diff --git a/.azure-pipelines/win32-CI-nightly.yml b/.azure-pipelines/win32-CI-nightly.yml deleted file mode 100644 index 3aad5d61..00000000 --- a/.azure-pipelines/win32-CI-nightly.yml +++ /dev/null @@ -1,64 +0,0 @@ -# Python package -# Create and test a Python package on multiple Python versions. -# Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more: -# https://docs.microsoft.com/azure/devops/pipelines/languages/python - -trigger: -- master - -jobs: - -- job: 'Test' - pool: - vmImage: 'windows-latest' - strategy: - matrix: - Python39-nightly: - python.version: '3.9' - ONNXRT_PATH: -i https://test.pypi.org/simple/ ort-nightly - COREML_PATH: git+https://github.com/apple/coremltools@3.1 - Python38-nightly: - python.version: '3.8' - ONNXRT_PATH: -i https://test.pypi.org/simple/ ort-nightly - COREML_PATH: git+https://github.com/apple/coremltools@3.1 - Python37-nightly: - python.version: '3.7' - ONNXRT_PATH: -i https://test.pypi.org/simple/ ort-nightly - COREML_PATH: git+https://github.com/apple/coremltools@3.1 - maxParallel: 3 - - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '$(python.version)' - architecture: 'x64' - - - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" - displayName: Add conda to PATH - - - script: conda create --yes --quiet --name py$(python.version) -c conda-forge python=$(python.version) numpy protobuf - displayName: Create Anaconda environment - - - script: | - call activate py$(python.version) - python -m pip install --upgrade pip numpy - pip install %COREML_PATH% %ONNX_PATH% - pip install humming-bird-ml --no-deps - pip install -r requirements.txt - pip install -r requirements-dev.txt - pip install %ONNXRT_PATH% - displayName: 'Install dependencies' - - - script: | - call activate py$(python.version) - pip install -e . - python -c "import onnxconverter_common;print(onnxconverter_common.__version__)" - python -c "import onnxruntime;print(onnxruntime.__version__)" - python -m pytest tests --ignore=tests/sparkml --doctest-modules --junitxml=junit/test-results.xml - displayName: 'pytest - onnxmltools' - - - task: PublishTestResults@2 - inputs: - testResultsFiles: '**/test-results.xml' - testRunTitle: 'Python $(python.version)' - condition: succeededOrFailed() diff --git a/.github/workflows/black-ruff.yml b/.github/workflows/black-ruff.yml index c48dc25f..09da3fc3 100644 --- a/.github/workflows/black-ruff.yml +++ b/.github/workflows/black-ruff.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: psf/black@stable + - uses: psf/black@193ee766ca496871f93621d6b58d57a6564ff81b # stable 23.7.0 with: options: "--diff --check" src: "." @@ -13,4 +13,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: chartboost/ruff-action@v1 + - uses: chartboost/ruff-action@v1.0.0 diff --git a/onnxmltools/convert/xgboost/__init__.py b/onnxmltools/convert/xgboost/__init__.py index 11db0855..017852fc 100644 --- a/onnxmltools/convert/xgboost/__init__.py +++ b/onnxmltools/convert/xgboost/__init__.py @@ -1,3 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 +from . import operator_converters, shape_calculators from .convert import convert