Skip to content

Commit 473f220

Browse files
authored
Moving onnxconverter-common package from onnxmltools repo (#320)
* moving common onnx converter files to separate repo, deleting redundant files
1 parent aa9952e commit 473f220

26 files changed

+13
-4006
lines changed

.azure-pipelines/linux-CI-nightly.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ jobs:
3737
conda install -c conda-forge cmake
3838
pip install $(ONNX_PATH)
3939
pip install -r requirements.txt
40-
cd onnxutils
40+
git clone https://github.com/microsoft/onnxconverter-common
41+
cd onnxconverter-common
4142
pip install -e .
4243
cd ..
4344
pip install -r requirements-dev.txt
@@ -56,12 +57,6 @@ jobs:
5657
pytest tests --doctest-modules --junitxml=junit/test-results.xml
5758
displayName: 'pytest - onnxmltools'
5859
59-
- script: |
60-
export PYTHONPATH=$PYTHONPATH:libsvm/python
61-
python -c "import onnxconverter_common"
62-
pytest onnxutils/tests --doctest-modules --junitxml=junit/test-results-onnxutils.xml
63-
displayName: 'pytest - onnxutils'
64-
6560
- task: PublishTestResults@2
6661
inputs:
6762
testResultsFiles: '**/test-results.xml'

.azure-pipelines/linux-conda-CI.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ jobs:
4444
conda install -c conda-forge cmake
4545
pip install $(ONNX_PATH)
4646
pip install -r requirements.txt
47-
cd onnxutils
47+
git clone https://github.com/microsoft/onnxconverter-common
48+
cd onnxconverter-common
4849
pip install -e .
4950
cd ..
5051
pip install -r requirements-dev.txt
@@ -63,12 +64,6 @@ jobs:
6364
pytest tests --doctest-modules --junitxml=junit/test-results.xml
6465
displayName: 'pytest - onnxmltools'
6566
66-
- script: |
67-
export PYTHONPATH=$PYTHONPATH:libsvm/python
68-
python -c "import onnxconverter_common"
69-
pytest onnxutils/tests --doctest-modules --junitxml=junit/test-results-onnxutils.xml
70-
displayName: 'pytest - onnxutils'
71-
7267
- script: |
7368
export PYTHONPATH=$PYTHONPATH:libsvm/python
7469
python -c "import onnxconverter_common"

.azure-pipelines/win32-CI-nightly.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ jobs:
3737
python -m pip install --upgrade pip numpy
3838
echo Test numpy installation... && python -c "import numpy"
3939
pip install %COREML_PATH% %ONNX_PATH%
40-
cd onnxutils
40+
pip install -r requirements.txt
41+
git clone https://github.com/microsoft/onnxconverter-common
42+
cd onnxconverter-common
4143
pip install -e .
42-
echo Test onnxconverter-common installation... && python -c "import onnxconverter_common"
4344
cd ..
45+
echo Test onnxconverter-common installation... && python -c "import onnxconverter_common"
4446
pip install -r requirements-dev.txt
4547
pip install %ONNXRT_PATH%
4648
echo Test onnxruntime installation... && python -c "import onnxruntime"

.azure-pipelines/win32-conda-CI.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
ONNX_PATH: onnx==1.4.1
2525
ONNXRT_PATH: onnxruntime==0.3.0
2626
COREML_PATH: git+https://github.com/apple/coremltools
27-
27+
2828
Python37:
2929
python.version: '3.7'
3030
ONNX_PATH: onnx==1.5.0
@@ -50,10 +50,12 @@ jobs:
5050
python -m pip install --upgrade pip numpy
5151
echo Test numpy installation... && python -c "import numpy"
5252
pip install %COREML_PATH% %ONNX_PATH%
53-
cd onnxutils
53+
pip install -r requirements.txt
54+
git clone https://github.com/microsoft/onnxconverter-common
55+
cd onnxconverter-common
5456
pip install -e .
55-
echo Test onnxconverter-common installation... && python -c "import onnxconverter_common"
5657
cd ..
58+
echo Test onnxconverter-common installation... && python -c "import onnxconverter_common"
5759
pip install -r requirements-dev.txt
5860
pip install %ONNXRT_PATH%
5961
echo Test onnxruntime installation... && python -c "import onnxruntime"
@@ -72,12 +74,6 @@ jobs:
7274
pytest tests --doctest-modules --junitxml=junit/test-results.xml
7375
displayName: 'pytest - onnxmltools'
7476
75-
- script: |
76-
call activate py$(python.version)
77-
set PYTHONPATH=libsvm\python;%PYTHONPATH%
78-
pytest onnxutils/tests --doctest-modules --junitxml=junit/test-results-onnxutils.xml
79-
displayName: 'pytest - onnxutils'
80-
8177
- task: PublishTestResults@2
8278
inputs:
8379
testResultsFiles: '**/test-results.xml'

onnxutils/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

onnxutils/onnxconverter_common/__init__.py

Lines changed: 0 additions & 29 deletions
This file was deleted.

onnxutils/onnxconverter_common/case_insensitive_dict.py

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)