onnx · jcwchen · Apr 4, 2023 · Mar 2, 2023 · Mar 2, 2023 · Mar 2, 2023
@@ -10,27 +10,27 @@ jobs:
       py39-ml-debug:
         python.version: '3.9'
         onnx_ml: 1
-        onnx_debug: 1
+        build_type: 'Debug'
         documentation: 0
       py38:
         python.version: '3.8'
         onnx_ml: 0
-        onnx_debug: 0
+        build_type: 'Release'
         documentation: 0
       py38-ml:
         python.version: '3.8'
         onnx_ml: 1
-        onnx_debug: 0
+        build_type: 'Release'
         documentation: 1
       py37:
         python.version: '3.7'
         onnx_ml: 0
-        onnx_debug: 0
+        build_type: 'Release'
         documentation: 0
       py37-ml:
         python.version: '3.7'
         onnx_ml: 1
-        onnx_debug: 0
+        build_type: 'Release'
         documentation: 0
     maxParallel: 6
 
@@ -48,19 +48,20 @@ jobs:
       sudo apt-get install libprotobuf-dev protobuf-compiler
       python -m pip install -q --upgrade pip
       python -m pip install -q -r requirements-release.txt
+      # still test protobuf==3.20.2 at least in a CI
+      python -m pip install protobuf==3.20.2
 
       sudo apt-get install -qq -o=Dpkg::Use-Pty=0 -y --no-install-recommends dos2unix
 
       git submodule update --init --recursive
       export ONNX_BUILD_TESTS=1
-      if [ '$(onnx_debug)' == '1' ]; then
+      if [ '$(build_type)' == 'Debug' ]; then
         export DEBUG=1
       fi
       if [ '$(onnx_ml)' == '1' ]; then
         export ONNX_ML=1
       fi
       export CMAKE_ARGS="-DONNX_WERROR=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
-      export ONNX_NAMESPACE=ONNX_NAMESPACE_FOO_BAR_FOR_CI
       # enable more sanitizer
       export CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_CXX_FLAGS='-fsanitize=undefined -fno-sanitize-recover=all '"
       python setup.py install

@@ -10,27 +10,27 @@ jobs:
       py39:
         python.version: '3.9'
         onnx_ml: 0
-        onnx_debug: 0
+        build_type: 'Release'
         onnx_lite: 0
       py38:
         python.version: '3.8'
         onnx_ml: 0
-        onnx_debug: 0
+        build_type: 'Release'
         onnx_lite: 1
       py38-ml:
         python.version: '3.8'
         onnx_ml: 1
-        onnx_debug: 0
+        build_type: 'Release'
         onnx_lite: 1
       py38-ml-debug:
         python.version: '3.8'
         onnx_ml: 1
-        onnx_debug: 1
+        build_type: 'Debug'
         onnx_lite: 0
       py37-ml-debug:
         python.version: '3.7'
         onnx_ml: 1
-        onnx_debug: 1
+        build_type: 'Debug'
         onnx_lite: 0
     maxParallel: 6
 
@@ -42,12 +42,10 @@ jobs:
   - script: |
       # Install Protobuf from source
       export NUM_CORES=`sysctl -n hw.logicalcpu`
-      if [ '$(onnx_debug)' == '1' ]; then
+      if [ '$(build_type)' == 'Debug' ]; then
         export DEBUG=1
-        source workflow_scripts/protobuf/build_protobuf_unix.sh $NUM_CORES $(pwd)/protobuf/protobuf_install Debug
-      else
-        source workflow_scripts/protobuf/build_protobuf_unix.sh $NUM_CORES $(pwd)/protobuf/protobuf_install
       fi
+      source workflow_scripts/protobuf/build_protobuf_unix.sh $NUM_CORES $(pwd)/protobuf/protobuf_install $(build_type)
 
       git submodule update --init --recursive
       python -m pip install -q --upgrade pip
@@ -61,7 +59,6 @@ jobs:
       if [ '$(onnx_lite)' == '1' ]; then
         export CMAKE_ARGS="${CMAKE_ARGS} -DONNX_USE_LITE_PROTO=ON"
       fi
-      export ONNX_NAMESPACE=ONNX_NAMESPACE_FOO_BAR_FOR_CI
       python setup.py install
     displayName: 'Install dependencies and ONNX'
 

@@ -41,7 +41,7 @@ jobs:
 
   - script: |
       conda create --yes --quiet --name py$(python.version) python=$(python.version)
-      conda install -n py$(python.version) -y -c conda-forge numpy libprotobuf=3.20
+      conda install -n py$(python.version) -y -c conda-forge numpy libprotobuf==3.21.5
     displayName: Create Anaconda environment
 
   - script: |
@@ -86,6 +86,16 @@ jobs:
 
       rm -rf .setuptools-cmake-build
 
+
+      conda remove libprotobuf
+      conda install libprotobuf=3.20
+      python -m pip install protobuf==3.20.2
+      pytest
+      IF NOT %ERRORLEVEL% EQU 0 (
+        @echo "pytest failed when testing onnx with libprotobuf=3.20"
+        EXIT 1
+      )
+
       python -m pip install -q onnxruntime
       set ORT_MAX_IR_SUPPORTED_VERSION=8
       set ORT_MAX_ML_OPSET_SUPPORTED_VERSION=3
@@ -97,3 +107,4 @@ jobs:
       )
 
     displayName: Install and test ONNX
+