Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into mbencer/ReshapeAv…
Browse files Browse the repository at this point in the history
…oidCopy
  • Loading branch information
mbencer committed Nov 29, 2024
2 parents 732e33b + c6c8c0d commit 848e272
Show file tree
Hide file tree
Showing 200 changed files with 26,940 additions and 946 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/pub-tools-mec-pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Publish model-explorer-circle to pypi

on:
workflow_dispatch:

jobs:
build-and-publish:
runs-on: ubuntu-latest
permissions:
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Install build dependencies
run: python -m pip install -U setuptools wheel build

- name: Build
run: |
cd tools/model_explorer_circle/
python -m build .
- name: Publish
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: tools/model_explorer_circle/dist/
skip-existing: true
73 changes: 73 additions & 0 deletions .github/workflows/run-onert-gbs-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: Run ONERT Tizen GBS Build

on:
pull_request:
branches:
- master
- release/*
paths:
- '.github/workflows/run-onert-gbs-build.yml'
- 'nncc'
- 'nnfw'
- 'compiler/luci/**'
- 'compiler/loco/**'
- 'compiler/logo/**'
- 'compute/**'
- 'infra/nnfw/**'
- 'infra/cmake/**'
- 'runtime/**'
- 'tests/**'
- '!**.md'
push:
branches:
- master
- release/*
paths:
- '.github/workflows/run-onert-gbs-build.yml'
- 'nncc'
- 'nnfw'
- 'compiler/luci/**'
- 'compiler/loco/**'
- 'compiler/logo/**'
- 'compute/**'
- 'infra/nnfw/**'
- 'infra/cmake/**'
- 'runtime/**'
- 'tests/**'
- '!**.md'

defaults:
run:
shell: bash

jobs:
build:
strategy:
matrix:
arch: ['armv7l'] # TODO: Add aarch64, x86_64, etc
profile: ['tizen_8'] # TODO: Add tizen_9, etc
runs-on: ubuntu-22.04
steps:
# Install binfmt support for gbs
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Install GBS
run: |
sudo apt-get update && sudo add-apt-repository -y 'deb [trusted=yes] http://download.tizen.org/tools/latest-release/Ubuntu_22.04/ /'
sudo apt-get update && sudo apt-get -qqy install gbs
- name: Checkout
uses: actions/checkout@v4

- name: Caching GBS repository
uses: actions/cache@v4
with:
path: .gbs/local/repos/${{ matrix.profile }}/${{ matrix.arch }}
key: gbs-repo-${{ matrix.profile }}-${{ matrix.arch }}-${{ hashFiles('packaging/*.spec') }}
restore-keys: |
gbs-repo-${{ matrix.profile }}-${{ matrix.arch }}-
- name: Build
run: |
gbs -c infra/nnfw/config/gbs.conf build -A ${{ matrix.arch }} --profile ${{ matrix.profile }} --buildroot .gbs
51 changes: 51 additions & 0 deletions .github/workflows/run-tools-mec-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Run tools/model-explorer-circle build

on:
push:
branches:
- master
- release/*
paths:
- '.github/workflows/run-tools-mec-build.yml'
- 'tools/model_explorer_circle/**'
- '!**/*.md'
pull_request:
branches:
- master
- release/*
paths:
- '.github/workflows/run-tools-mec-build.yml'
- 'tools/model_explorer_circle/**'
- '!**/*.md'

defaults:
run:
shell: bash

jobs:
test:
strategy:
matrix:
# TODO add more versions
python: ['3.10']
# TODO add more platforms
platform: [ubuntu-latest]

runs-on: ${{ matrix.platform }}

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}

- name: Install test dependencies
run: python -m pip install --upgrade nox

- name: Test
run: |
cd tools/model_explorer_circle
python -m nox -s tests-${{ matrix.python }}
4 changes: 2 additions & 2 deletions compiler/angkor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

## Purpose

_angkor_ is a `nncc` core library
_angkor_ is an `nncc` core library

## How to use

_angkor_ implements abstract data type(ADT) for feature, kernel, tensor.
_angkor_ implements abstract data type (ADT) for feature, kernel, tensor.
There are layout, shape information and enumerator and so on.

To use some of these things, just insert `include`!
Expand Down
8 changes: 4 additions & 4 deletions compiler/caffegen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
## How caffegen works

Some of commands in `caffegen` use standard input for reading data and standard output for exporting result.
In this case, we strongly recommand you to use pipe, not copy & paste the content of file itself.
In this case, we strongly recommend you to use pipe, not copy & paste the content of file itself.

Otherwise, `caffegen` use arguments to pass some directories.

## Supported command

Basically, caffgen command is used as `caffegen [COMMAND]` and there are four `COMMAND` types.
Basically, caffegen command is used as `caffegen [COMMAND]` and there are four `COMMAND` types:
- init : initialize parameters using prototxt.
- encode : make a binary file(caffemodel) using initialized data
- decode : decode a binary file(caffemodel) and reproduce the initialized data
- encode : make a binary file (caffemodel) using initialized data
- decode : decode a binary file (caffemodel) and reproduce the initialized data
- merge : copy the trained weights from a caffemodel into a prototxt file

## How to use each command
Expand Down
10 changes: 10 additions & 0 deletions compiler/circle-interpreter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@ target_link_libraries(circle-interpreter PRIVATE safemain)
target_link_libraries(circle-interpreter PRIVATE vconone)

install(TARGETS circle-interpreter DESTINATION bin)

set(INTERPRETER_CFFI
src/CircleInterpreter_cffi.cpp
)

add_library(circle_interpreter_cffi SHARED ${INTERPRETER_CFFI})
target_link_libraries(circle_interpreter_cffi PRIVATE luci_import)
target_link_libraries(circle_interpreter_cffi PRIVATE luci_interpreter)

install(TARGETS circle_interpreter_cffi DESTINATION lib)
Loading

0 comments on commit 848e272

Please sign in to comment.