Transition to ONNX-1.6.0. (#95)

* Transition to ONNX-1.6.0.

* Use the version of ONNX inside ONNF when running backend tests.

* Install quietly and with sudo previledge.
This commit is contained in:
Tian Jin 2020-02-25 13:04:15 +08:00 committed by GitHub
parent fcb5f35993
commit 732317cd5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View File

@ -38,7 +38,7 @@ jobs:
- run: - run:
name: Run End-To-End Tests name: Run End-To-End Tests
command: | command: |
sudo pip install -q onnx sudo pip install -q -e ./ONNF/third_party/onnx
cd ONNF/build cd ONNF/build
cmake --build . --target run-onnx-backend-test cmake --build . --target run-onnx-backend-test
- run: - run:

View File

@ -189,8 +189,9 @@ private:
} }
} }
mlir::Type elementType = auto elementOnnxType =
convertONNXTypeToMLIRType(input.type().tensor_type().elem_type()); (onnx::TensorProto_DataType)input.type().tensor_type().elem_type();
mlir::Type elementType = convertONNXTypeToMLIRType(elementOnnxType);
llvm::ArrayRef<int64_t> tensor_dims(dims.data(), dims.size()); llvm::ArrayRef<int64_t> tensor_dims(dims.data(), dims.size());
arg_types.emplace_back( arg_types.emplace_back(
mlir::RankedTensorType::get(tensor_dims, elementType)); mlir::RankedTensorType::get(tensor_dims, elementType));

2
third_party/onnx vendored

@ -1 +1 @@
Subproject commit 1439eab5542c625bb3da49860f0cd68c3eafdc18 Subproject commit 553df22c67bee5f0fe6599cff60f1afc6748c635