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

Upgrade to ONNX 1.15.0 #2649

Closed
wants to merge 9 commits into from
Closed

Upgrade to ONNX 1.15.0 #2649

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5d50495
Upgrade to ONNX 1.15.0
MegoHam21 Nov 30, 2023
5004112
Upgrade setuptools
MegoHam21 Nov 30, 2023
458c969
Add pybind11
MegoHam21 Nov 30, 2023
c0019c6
Downgrade setuptools
MegoHam21 Nov 30, 2023
c1cd57d
setuptools failing
MegoHam21 Nov 30, 2023
e21430b
Add a new dependency
MegoHam21 Nov 30, 2023
f973dff
Remove --cpp implementation
MegoHam21 Nov 30, 2023
4c3d300
Fixing format
MegoHam21 Nov 30, 2023
dc27913
Fixing
MegoHam21 Dec 1, 2023
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
8 changes: 7 additions & 1 deletion docker/Dockerfile.llvm-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ RUN distro=$(cat /etc/os-release|grep -Po '(?<=^ID=").*(?=")|(?<=^ID=)[^"].*[^"]
python3 python3-dev python3-distutils python3-numpy \
python3-pip python3-pytest-xdist python3-setuptools \
python3-typing-extensions zlib1g-dev && \
# Use newer version of setuptools
Copy link
Collaborator Author

@hamptonm1 hamptonm1 Nov 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Also this upgrade of pip and setuptools is required to bypass another error of UNKNOWN Wheel.

python3 -m pip install --upgrade pip && \
python3 -m pip install --upgrade setuptools && \
rm -rf /var/lib/apt/lists/* && \
ln -sf /usr/bin/pytest-3 /usr/bin/pytest; \
elif [ "${distro}" = "rhel" ] || [ "${distro}" = "fedora" ]; then \
Expand All @@ -49,6 +52,9 @@ RUN distro=$(cat /etc/os-release|grep -Po '(?<=^ID=").*(?=")|(?<=^ID=)[^"].*[^"]
gcc gcc-c++ git libtool make ncurses-devel \
python39 python39-devel python39-numpy python39-pip \
python39-setuptools python39-wheel tzdata-java zlib-devel && \
# Use newer version of pip and setuptools
python3 -m pip install --upgrade pip && \
python3 -m pip install --upgrade setuptools && \
# Use same versions as those in ubuntu:jammy
pip3 install -q \
Cython pytest==6.2.5 pytest-forked==1.4.0 \
Expand All @@ -69,7 +75,7 @@ RUN git clone -b v${PROTOBUF_VERSION} --recursive https://github.com/protocolbuf
&& cd protobuf && ./autogen.sh \
&& ./configure --enable-static=no \
&& make -j${NPROC} install && ldconfig \
&& cd python && python3 setup.py install --cpp_implementation \
&& cd python && python3 setup.py install \
&& cd ../.. && rm -rf protobuf

# Install jsoniter
Expand Down
134 changes: 75 additions & 59 deletions docs/Dialects/krnl.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,10 @@ means to block the for loop referred to by %i using a tile size of 4.

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `tile_size` | ::mlir::IntegerAttr | 64-bit signless integer attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>tile_size</code></td><td>::mlir::IntegerAttr</td><td>64-bit signless integer attribute</td></tr>
</table>

#### Operands:

Expand Down Expand Up @@ -178,10 +179,11 @@ Interfaces: MemoryEffectOpInterface

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `funcName` | ::mlir::StringAttr | string attribute
| `numOfOutput` | ::mlir::IntegerAttr | 64-bit signed integer attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>funcName</code></td><td>::mlir::StringAttr</td><td>string attribute</td></tr>
<tr><td><code>numOfOutput</code></td><td>::mlir::IntegerAttr</td><td>64-bit signed integer attribute</td></tr>
</table>

#### Operands:

Expand Down Expand Up @@ -214,9 +216,10 @@ Traits: MemRefsNormalizable

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `tileSize` | ::mlir::ArrayAttr | 64-bit integer array attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>tileSize</code></td><td>::mlir::ArrayAttr</td><td>64-bit integer array attribute</td></tr>
</table>

#### Operands:

Expand Down Expand Up @@ -280,11 +283,12 @@ Traits: MemRefsNormalizable

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `tileSize` | ::mlir::ArrayAttr | 64-bit integer array attribute
| `padToNext` | ::mlir::ArrayAttr | 64-bit integer array attribute
| `transpose` | ::mlir::BoolAttr | bool attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>tileSize</code></td><td>::mlir::ArrayAttr</td><td>64-bit integer array attribute</td></tr>
<tr><td><code>padToNext</code></td><td>::mlir::ArrayAttr</td><td>64-bit integer array attribute</td></tr>
<tr><td><code>transpose</code></td><td>::mlir::BoolAttr</td><td>bool attribute</td></tr>
</table>

#### Operands:

Expand Down Expand Up @@ -469,13 +473,14 @@ Effects: MemoryEffects::Effect{}

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `shape` | ::mlir::Attribute | any attribute
| `name` | ::mlir::StringAttr | string attribute
| `value` | ::mlir::Attribute | any attribute
| `offset` | ::mlir::IntegerAttr | 64-bit signless integer attribute
| `alignment` | ::mlir::IntegerAttr | 64-bit signless integer attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>shape</code></td><td>::mlir::Attribute</td><td>any attribute</td></tr>
<tr><td><code>name</code></td><td>::mlir::StringAttr</td><td>string attribute</td></tr>
<tr><td><code>value</code></td><td>::mlir::Attribute</td><td>any attribute</td></tr>
<tr><td><code>offset</code></td><td>::mlir::IntegerAttr</td><td>64-bit signless integer attribute</td></tr>
<tr><td><code>alignment</code></td><td>::mlir::IntegerAttr</td><td>64-bit signless integer attribute</td></tr>
</table>

#### Results:

Expand All @@ -492,11 +497,12 @@ May be used for gdb.

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `opName` | ::mlir::StringAttr | string attribute
| `tag` | ::mlir::IntegerAttr | 64-bit signless integer attribute
| `nodeName` | ::mlir::StringAttr | string attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>opName</code></td><td>::mlir::StringAttr</td><td>string attribute</td></tr>
<tr><td><code>tag</code></td><td>::mlir::IntegerAttr</td><td>64-bit signless integer attribute</td></tr>
<tr><td><code>nodeName</code></td><td>::mlir::StringAttr</td><td>string attribute</td></tr>
</table>

### `krnl.isinf` (KrnlIsInfOp)

Expand Down Expand Up @@ -789,15 +795,16 @@ Interfaces: SpecializedKernelOpInterface

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `computeTileSize` | ::mlir::ArrayAttr | 64-bit integer array attribute
| `aTileSize` | ::mlir::ArrayAttr | 64-bit integer array attribute
| `bTileSize` | ::mlir::ArrayAttr | 64-bit integer array attribute
| `cTileSize` | ::mlir::ArrayAttr | 64-bit integer array attribute
| `simdize` | ::mlir::BoolAttr | bool attribute
| `unroll` | ::mlir::BoolAttr | bool attribute
| `overcompute` | ::mlir::BoolAttr | bool attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>computeTileSize</code></td><td>::mlir::ArrayAttr</td><td>64-bit integer array attribute</td></tr>
<tr><td><code>aTileSize</code></td><td>::mlir::ArrayAttr</td><td>64-bit integer array attribute</td></tr>
<tr><td><code>bTileSize</code></td><td>::mlir::ArrayAttr</td><td>64-bit integer array attribute</td></tr>
<tr><td><code>cTileSize</code></td><td>::mlir::ArrayAttr</td><td>64-bit integer array attribute</td></tr>
<tr><td><code>simdize</code></td><td>::mlir::BoolAttr</td><td>bool attribute</td></tr>
<tr><td><code>unroll</code></td><td>::mlir::BoolAttr</td><td>bool attribute</td></tr>
<tr><td><code>overcompute</code></td><td>::mlir::BoolAttr</td><td>bool attribute</td></tr>
</table>

#### Operands:

Expand Down Expand Up @@ -876,9 +883,10 @@ Traits: MemRefsNormalizable

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `delayed` | ::mlir::BoolAttr | bool attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>delayed</code></td><td>::mlir::BoolAttr</td><td>bool attribute</td></tr>
</table>

#### Operands:

Expand Down Expand Up @@ -911,27 +919,29 @@ Traits: SingleBlock, SingleBlockImplicitTerminator<KrnlTerminatorOp>

### `krnl.parallel` (KrnlParallelOp)

_Krnl parallel operation_
_Mark Krnl loops as parallel loops_


Syntax:

```
operation ::= `krnl.parallel` $loop attr-dict `:` type($loop)
operation ::= `krnl.parallel` `(` $loops `)` attr-dict `:` type($loops)
```

Parallelize the specified loops. krnl.parallel should be placed as the last
operator before krnl.iterate. Since we do not want to parallelize the loop
until we interpret krnl.block, krnl.permute and krnl.unroll.
Parallelize the specified loops. When multiple loop specifiers are passed
as parameters, there loops can be parallelized as a collapsed loop.
krnl.parallel should be placed as the last operator before krnl.iterate,
Since we do not want to parallelize the loop until we interpret krnl.block,
krnl.permute and krnl.unroll.
```
krnl.parallel %i
krnl.parallel (%i0, %i1) : !Krnl.loop, !Krnl.loop
```

#### Operands:

| Operand | Description |
| :-----: | ----------- |
| `loop` | any type
| `loops` | any type

### `krnl.permute` (KrnlPermuteOp)

Expand Down Expand Up @@ -1001,9 +1011,10 @@ affine.for %arg0 = 0 to 1024 step 4 {

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `map` | ::mlir::ArrayAttr | 64-bit integer array attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>map</code></td><td>::mlir::ArrayAttr</td><td>64-bit integer array attribute</td></tr>
</table>

#### Operands:

Expand All @@ -1023,9 +1034,10 @@ Traits: MemRefsNormalizable

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `format` | ::mlir::StringAttr | string attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>format</code></td><td>::mlir::StringAttr</td><td>string attribute</td></tr>
</table>

#### Operands:

Expand All @@ -1051,9 +1063,10 @@ Traits: MemRefsNormalizable

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `msg` | ::mlir::StringAttr | string attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>msg</code></td><td>::mlir::StringAttr</td><td>string attribute</td></tr>
</table>

#### Operands:

Expand Down Expand Up @@ -1160,9 +1173,10 @@ Interfaces: AllocationOpInterface, MemoryEffectOpInterface

#### Attributes:

| Attribute | MLIR Type | Description |
| :-------: | :-------: | ----------- |
| `copy` | ::mlir::IntegerAttr | 1-bit unsigned integer attribute
<table>
<tr><th>Attribute</th><th>MLIR Type</th><th>Description</th></tr>
<tr><td><code>copy</code></td><td>::mlir::IntegerAttr</td><td>1-bit unsigned integer attribute</td></tr>
</table>

#### Operands:

Expand Down Expand Up @@ -1348,7 +1362,9 @@ successor of the operation enclosing the region.
This operation does _not_ have a custom syntax. However, krnl control
operations omit the terminator in their custom syntax for brevity.

Traits: Terminator
Traits: ReturnLike, Terminator

Interfaces: RegionBranchTerminatorOpInterface

### `krnl.unroll` (KrnlUnrollOp)

Expand Down
Loading
Loading