Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update onnx-mlir product version #1727

Merged
merged 56 commits into from
Oct 11, 2022
Merged

Update onnx-mlir product version #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
82606f1
Update onnx-mlir product version
MegoHam21 Sep 22, 2022
b50eb9d
fix einsum decomposition bug (#1730)
sorenlassen Sep 23, 2022
95f7510
Update version to 0.3.1 (#1728)
cjvolzka Sep 23, 2022
a8e9bac
Fix issues to compile Yolov3-12. (#1726)
negiyas Sep 26, 2022
b0a54fa
simplified if lowering (#1717)
sorenlassen Sep 26, 2022
4aa1523
Add definitions
MegoHam21 Sep 26, 2022
99f6afb
parse string type from getTypeMap() (#1735)
sorenlassen Sep 26, 2022
4ae32e2
fix 2 compiler warnings (#1736)
sorenlassen Sep 26, 2022
bc1977b
cleanup some include files (#1733)
sorenlassen Sep 26, 2022
af5ba86
Fix remaining warnings on Windows and turn on warning-as-error (#1706)
sstamenova Sep 27, 2022
75e8f86
Fix synax
MegoHam21 Sep 27, 2022
f501206
Simplify shape-related operations (#1695)
tungld Sep 28, 2022
5f738fc
run-onnx-lib script and docs fixes (#1705)
sorenlassen Sep 28, 2022
d091ea8
remove initializedTensors map from ONNX parser (#1739)
sorenlassen Sep 28, 2022
f8a5b51
Add decompositions for v11 split, squeeze, and unsqueeze (#1702)
philass Sep 28, 2022
8915187
factored input shaping into ModelInputShaper (#1740)
sorenlassen Sep 28, 2022
68c356b
Ingest all of Opset 16 (#1704)
philass Sep 29, 2022
5427f8b
Fix onnx-mlir.py docker wrapper (#1734)
gongsu832 Sep 29, 2022
cfacf7f
Update protobuf (#1747)
cjvolzka Sep 29, 2022
8ef7e28
Add the product version and fix formatting
MegoHam21 Sep 29, 2022
dcddaa7
Make updates to product version
MegoHam21 Sep 29, 2022
d12930a
further updates
MegoHam21 Sep 30, 2022
4274752
Add product version text file
MegoHam21 Sep 30, 2022
bac7a7e
Removed the memory leaks directly in execution session (#1746)
AlexandreEichenberger Sep 30, 2022
a6550e0
Add support for ArgMin (#1737)
airMeng Sep 30, 2022
5b6254b
Inclusive terminology update (#1750)
cjvolzka Sep 30, 2022
31aa0cd
Warning and instructions that --onnx-op-stats needs more than EmitONN…
AlexandreEichenberger Sep 30, 2022
0e11093
Move product version text file
MegoHam21 Sep 30, 2022
7127e69
Remove comment
MegoHam21 Sep 30, 2022
1bfaca2
Output the product version for the compiler/version
MegoHam21 Oct 3, 2022
fa613a7
Cleaned up commit of the InferTypes change. (#1753)
messerb5467 Sep 30, 2022
b4e2989
setup.py install is deprecated, use pip install instead (#1752)
gongsu832 Oct 1, 2022
1e028ad
adding reference to onnx-mlir-serving (#1745)
AlexandreEichenberger Oct 3, 2022
369e015
[TOSA] Update type converter and unary ops (#1553)
Oct 3, 2022
e9306d5
Fix syntax
MegoHam21 Oct 3, 2022
9f5c7dd
Remove strip
MegoHam21 Oct 3, 2022
9a003ab
Revert "Cleaned up commit of the InferTypes change. (#1753)"
MegoHam21 Oct 3, 2022
6ca91f7
Cleaned up commit of the InferTypes change. (#1753)
messerb5467 Sep 30, 2022
23d210c
Fix for GatherND verifier (#1754)
philass Oct 4, 2022
fe5600b
Fix OnnxBuilder::concat where axis was not used (#1759)
tungld Oct 4, 2022
3e4f8bb
Simplify GatherOp when its inputs are dimensions (#1755)
tungld Oct 4, 2022
bdd68b5
Assign each question mark a unique negative integer value (#1757)
tungld Oct 4, 2022
a9cf18c
Change the regex
MegoHam21 Oct 4, 2022
8008125
Fix regex and display product numbers
MegoHam21 Oct 5, 2022
9d2e6dc
normalize axis in ScatterElements verify (#1760)
philass Oct 4, 2022
e604d7e
redo ArrayRefOrSmallVector with enable_if (#1758)
sorenlassen Oct 4, 2022
58c1063
fix syntax
MegoHam21 Oct 5, 2022
0893ac2
Handle scalar tensor tensor<type> in SimplifyShapeRelatesOps pass (#1…
tungld Oct 5, 2022
9e00f74
namespace cleanup (#1763)
sorenlassen Oct 5, 2022
e78b1d5
Merge branch 'main' into hamptonm/feature/cmake
hamptonm1 Oct 5, 2022
3a4e261
Signed-off-by: Megan Hampton <[email protected]>
MegoHam21 Oct 5, 2022
5c3b6f9
Merge branch 'main' into hamptonm/feature/cmake
hamptonm1 Oct 5, 2022
dff0fba
Make use of the product vendor flag
MegoHam21 Oct 5, 2022
8867893
Merge branch 'main' into hamptonm/feature/cmake
hamptonm1 Oct 10, 2022
d024a57
Address feedback
MegoHam21 Oct 11, 2022
fb87d3f
Merge branch 'onnx:main' into hamptonm/feature/cmake
hamptonm1 Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Compiler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ if (DEFINED ONNX_MLIR_PRODUCT_VERSION)
message(DEBUG "PRODUCT_VERSION_PATCH = ${PRODUCT_VERSION_PATCH}")
message(DEBUG "PRODUCT_ID = ${PRODUCT_ID}")

list(APPEND DEFINITIONS "ONNX_MLIR_PRODUCT_VERSION=${ONNX_MLIR_PRODUCT_VERSION}")

# Major and product ID are mandatory, minor and patch are optional.
if (("${PRODUCT_VERSION_MAJOR}" STREQUAL "") OR ("${PRODUCT_ID}" STREQUAL ""))
message(STATUS "Product version : Invalid version ${ONNX_MLIR_PRODUCT_VERSION} ignored")
Expand All @@ -113,6 +115,7 @@ list(APPEND DEFINITIONS "PRODUCT_VERSION_MAJOR=${PRODUCT_VERSION_MAJOR}")
list(APPEND DEFINITIONS "PRODUCT_VERSION_MINOR=${PRODUCT_VERSION_MINOR}")
list(APPEND DEFINITIONS "PRODUCT_VERSION_PATCH=${PRODUCT_VERSION_PATCH}")
list(APPEND DEFINITIONS "PRODUCT_ID=\"${PRODUCT_ID}\"")
target_compile_definitions(OMVersion PUBLIC ${DEFINITIONS})
set_property(SOURCE CompilerUtils.cpp APPEND PROPERTY COMPILE_DEFINITIONS ${DEFINITIONS})

add_onnx_mlir_library(CompilerUtils
Expand All @@ -128,7 +131,7 @@ add_onnx_mlir_library(CompilerUtils

INCLUDE_DIRS PRIVATE
${FILE_GENERATE_DIR}

INCLUDE_DIRS PUBLIC
${ONNX_MLIR_SRC_ROOT}/include

Expand Down Expand Up @@ -166,7 +169,7 @@ add_onnx_mlir_library(OnnxMlirCompiler
${FILE_GENERATE_DIR}

EXCLUDE_FROM_OM_LIBS

LINK_LIBS PRIVATE
CompilerUtils
)
Expand Down
2 changes: 1 addition & 1 deletion src/Version/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ else()
list(APPEND DEFINITIONS "ONNX_VERSION=\"${ONNX_VERSION}\"")
endif()
if (ONNX_MLIR_VENDOR)
list(APPEND DEFINITIONS "ONNX_MLIR_VENDOR=\"${ONNX_MLIR_VENDOR }\"")
list(APPEND DEFINITIONS "ONNX_MLIR_VENDOR=\"${ONNX_MLIR_VENDOR}\"")
endif()
list(APPEND DEFINITIONS "LLVM_PACKAGE_VERSION=\"${LLVM_PACKAGE_VERSION}\"")
target_compile_definitions(OMVersion PUBLIC ${DEFINITIONS})
18 changes: 10 additions & 8 deletions src/Version/Version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ std::string getLLVMFullRepositoryVersion() {
std::string getOnnxMlirFullVersion(bool toIncludeLLVM) {
std::string buf;
llvm::raw_string_ostream os(buf);
#ifdef ONNX_MLIR_VENDOR
os << ONNX_MLIR_VENDOR;
#endif
os << "onnx-mlir version " ONNX_MLIR_VERSION;
#ifdef ONNX_VERSION
os << ", onnx version " ONNX_VERSION;
Expand Down Expand Up @@ -118,13 +115,18 @@ std::string getOnnxMlirFullVersion(bool toIncludeLLVM) {
#endif

void getVersionPrinter(llvm::raw_ostream &os) {
#if defined(ONNX_MLIR_VENDOR) && defined(ONNX_MLIR_PRODUCT_VERSION)
os << ONNX_MLIR_VENDOR << " " << PRODUCT_VERSION_MAJOR << '.';
os << PRODUCT_VERSION_MINOR << '.';
os << PRODUCT_VERSION_PATCH << '-' << PRODUCT_ID << '\n';
Comment on lines +119 to +121
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't PRODUCT_VERSION_MAJOR, PRODUCT_VERSION_MINOR, and PRODUCT_VERSION_PATCH and PRODUCT_ID built by splitting apart the ONNX_MLIR_PRODUCT_VERSION supplied at compile time? If so, is there a reason to not use ONNX_MLIR_PRODUCT_VERSION directly instead of rebuilding it from the composite components here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes there is a reason... if I attempt to use ONNX_MLIR_PRODUCT_VERSION it will fail on the cmake command with the following error:

on.dir/Version.cpp.o -MF src/Version/CMakeFiles/OMVersion.dir/Version.cpp.o.d -o src/Version/CMakeFiles/OMVersion.dir/Version.cpp.o -c ../src/Version/Version.cpp
<command-line>: error: too many decimal points in number
../src/Version/Version.cpp:122:16: note: in expansion of macro 'ONNX_MLIR_PRODUCT_VERSION'
  122 |   os << " " << ONNX_MLIR_PRODUCT_VERSION << '\n';
      |                ^~~~~~~~~~~~~~~~~~~~~~~~~
../src/Version/Version.cpp: In function 'void onnx_mlir::getVersionPrinter(llvm::raw_ostream&)':
<command-line>: error: 'zdlc' was not declared in this scope
<command-line>: note: in definition of macro 'ONNX_MLIR_PRODUCT_VERSION'
[452/509] Building CXX object test/num...CMakeFiles/TestLoop.dir/TestLoop.cpp.o
ninja: build stopped: subcommand failed.

I tried 3 times....so adding the code the way I did gets around this problem :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I am not rebuilding it.... ONNX_MLIR_PRODUCT_VERSION is broken up into these 4 segments by using a CMAKE_MATCH_1 and then a SET which was already added to the code.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I thought that might be the case but I wanted to make sure. PR looks good to me. I'd say give it overnight to see if there's any other comments from other timezones but otherwise it's good to go.

#endif
os << getOnnxMlirFullVersion(false) << "\n";
os << " LLVM version " << LLVM_PACKAGE_VERSION << ' '
os << "LLVM version " << LLVM_PACKAGE_VERSION << ' '
<< getLLVMFullRepositoryVersion() << '\n';
#if ONNX_MLIR_IS_DEBUG_BUILD
os << " DEBUG build";
os << "DEBUG build";
#else
os << " Optimized build";
os << "Optimized build";
#endif
#ifndef NDEBUG
os << " with assertions";
Expand All @@ -133,8 +135,8 @@ void getVersionPrinter(llvm::raw_ostream &os) {
if (CPU == "generic")
CPU = "(unknown)";
os << ".\n";
os << " Default target: " << llvm::sys::getDefaultTargetTriple() << '\n'
<< " Host CPU: " << CPU << '\n';
os << "Default target: " << llvm::sys::getDefaultTargetTriple() << '\n'
<< "Host CPU: " << CPU << '\n';
}

} // namespace onnx_mlir
2 changes: 1 addition & 1 deletion test/mlir/driver/version.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: onnx-mlir --version | FileCheck %s

// CHECK: onnx-mlir version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}, onnx version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}
// CHECK: onnx-mlir version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}, onnx version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}
// CHECK: LLVM version {{[0-9]+}}.{{[0-9]+}}.{{[0-9]+}}
// CHECK: {{[DEBUG|Optimized]}} build{{[ with assertions]*}}
// CHECK: Default target:
Expand Down