Skip to content

Commit

Permalink
Merge pull request #2 from mitmul/beta
Browse files Browse the repository at this point in the history
Add many functions and tests
  • Loading branch information
mitmul authored Nov 27, 2017
2 parents 668b0a7 + 2f9e3ff commit 10964bc
Show file tree
Hide file tree
Showing 84 changed files with 1,597 additions and 280 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.vscode/
check_autopep8

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ python:
- "2.7"
- "3.6"
env:
- CHAINER_VERSION="==3.1.0" ONNX_VERSION="==0.2.1"
- CHAINER_VERSION="==4.0.0b1" ONNX_VERSION="==0.2.1"
- CHAINER_VERSION="==3.1.0" ONNX_VERSION="git+git://github.com/onnx/onnx.git@a8bd1facd321ea52f0a6f88600138606711b7a96"
- CHAINER_VERSION="==4.0.0b1" ONNX_VERSION="git+git://github.com/onnx/onnx.git@a8bd1facd321ea52f0a6f88600138606711b7a96"
notifications:
email: false

Expand All @@ -23,7 +23,7 @@ install:
- conda info -a
- conda install protobuf
- hash -r
- CFLAGS="-I$HOME/miniconda/include" pip install "onnx$ONNX_VERSION"
- CFLAGS="-I$HOME/miniconda/include" pip install $ONNX_VERSION
- pip install "chainer$CHAINER_VERSION"
- pip install -e .

Expand Down
19 changes: 19 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## Installation

### On Ubuntu 16.04

```bash
conda install -c conda-forge protobuf numpy pybind11
pip install git+git://github.com/onnx/onnx.git@a8bd1facd321ea52f0a6f88600138606711b7a96
pip install onnx-chainer
```

### On macOS

```bash
brew install protobuf
pip install pybind11
pip install protobuf
pip install git+git://github.com/onnx/onnx.git@a8bd1facd321ea52f0a6f88600138606711b7a96
pip install onnx-chainer
```
56 changes: 53 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ This is an add-on package for ONNX support by Chainer.

## Installation

```bash
pip install onnx-chainer
```
See [INSTALL.md](INSTALL.md)

## Quick Start

Expand All @@ -30,3 +28,55 @@ x = np.zeros((1, 3, 224, 224), dtype=np.float32)

onnx_chainer.export(model, x, filename='VGG16.onnx')
```

## Supported Functions

### Activation

- ELU
- HardSigmoid
- LeakyReLU
- LogSoftmax
- PReLUFunction
- ReLU
- Sigmoid
- Softmax
- Softplus
- Tanh

### Array

- Cast
- Concat
- Depth2Space
- Pad
- Reshape
- Space2Depth
- SplitAxis
- Squeeze
- Tile
- Transpose

### Connection

- Convolution2DFunction
- LinearFunction

### Pooling

- AveragePooling2D
- MaxPooling2D

### Normalization

- BatchNormalization
- FixedBatchNormalization

### Math

- Add
- Sub
- Mul
- Neg
- Absolute
- Div
11 changes: 0 additions & 11 deletions check_autopep8

This file was deleted.

1 change: 1 addition & 0 deletions onnx_chainer/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from .export import convert_parameter # NOQA
from .export import export # NOQA
Loading

0 comments on commit 10964bc

Please sign in to comment.