DRAFT use onnx2circle for one-import-onnx

on-going draft to use onnx2circle for one-import-onnx and deprecate onnx-tf.

Signed-off-by: SaeHie Park <saehie.park@gmail.com>

Author: seanshpark

circle-mlir/Makefile.sample

@@ -24,7 +24,7 @@ CIRCLEMLIR_EXTS_REL?=build/externals/release
 CIRCLEMLIR_PY3_ROOT?=$(PYTHON3_PATH)
 CIRCLEMLIR_BUILD_JOBS?=4
 
-ONE_COMPILER_INSTALL?=$(CURDIR)/../build/install
+ONE_COMPILER_INSTALL?=build/install
 
 .PHONY: help all overlay \
 	prep cfg debug test clean \
@@ -44,7 +44,7 @@ help:
 	@echo "make cfgr     : configure circle-mlir for release build"
 	@echo "make rel      : build for release"
 	@echo "make testr    : test for release"
-	@echo "make install  : install release build to (ONE)/build/install"
+	@echo "make install  : install release build"
 	@echo "make cleanr   : clean release build"
 	@echo "make prepcov  : prepare submodules for coverage test (needed only once)"
 	@echo "make cfgcov   : configure circle-mlir for debug build with coverage test"

circle-mlir/README.md

@@ -99,12 +99,10 @@ Test build
 make testr
 ```
 
-Install tools into `(ONE)/build/install`
+Install tools into `build/install`
 ```
 make install
 ```
-- `onnx2circle` is going to be the default converter of `one-import-onnx` tool
-- this will install `onnx2circle` to `build/install` of compiler
 
 ### Docker build
 

compiler/one-cmds/CMakeLists.txt

@@ -91,6 +91,26 @@ foreach(ONE_COMMAND IN ITEMS ${ONE_COMMAND_FILES})
 
 endforeach(ONE_COMMAND)
 
+# if ONE_ONNX2CIRCLE_PATH is set, install that file to bin folder
+if(DEFINED ENV{ONE_ONNX2CIRCLE_PATH})
+  message(STATUS "ONNX2CIRCLE from env-var $ENV{ONE_ONNX2CIRCLE_PATH}")
+  install(FILES $ENV{ONE_ONNX2CIRCLE_PATH}
+          PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE
+                      GROUP_READ GROUP_EXECUTE
+                      WORLD_READ WORLD_EXECUTE
+          DESTINATION bin)
+else()
+  set(ONNX2CIRCLE_PATH "${NNAS_PROJECT_SOURCE_DIR}/circle-mlir/build/install/bin/onnx2circle")
+  if (EXISTS ${ONNX2CIRCLE_PATH})
+    message(STATUS "ONNX2CIRCLE from ${ONNX2CIRCLE_PATH}")
+    install(FILES ${ONNX2CIRCLE_PATH}
+            PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE
+                        GROUP_READ GROUP_EXECUTE
+                        WORLD_READ WORLD_EXECUTE
+            DESTINATION bin)
+  endif()
+endif()
+
 set(ONE_UTILITY_FILES
     one-build.template.cfg
     onecc.template.cfg

compiler/one-cmds/one-import-onnx

@@ -288,9 +288,23 @@ def _check_ext():
     return None
 
 
+def _check_onnx2circle():
+    # check if onnx2circle exist
+    dir_path = os.path.dirname(os.path.realpath(__file__))
+    o2c_path = os.path.join(dir_path, 'onnx2circle')
+    if not os.path.isfile(o2c_path):
+        o2c_path = '/usr/share/circletools/bin/onnx2circle'
+        if not os.path.isfile(o2c_path):
+            print("one-import-onnx: onnx2circle converter not found")
+            sys.exit(1)
+    return o2c_path
+
+
 def _convert(args):
     _apply_verbosity(args.verbose)
 
+    onnx2cicle_path = _check_onnx2circle()
+
     # get file path to log
     dir_path = os.path.dirname(os.path.realpath(__file__))
     logfile_path = os.path.realpath(args.output_path) + '.log'

docs/howto/how-to-build-compiler.md

@@ -116,6 +116,61 @@ $ NNCC_WORKSPACE=build/release ./nncc build
 ```
 will build release version in `build/release` folder.
 
+## Local install and command line tests
+
+Local install test is to make an local installation in `build/install` path
+and check the build artifacts and run compiler command line test with `onecc`
+and others.
+
+### How to make local installation
+```
+NNAS_BUILD_PREFIX=build/setup \
+BUILD_TYPE=Release \
+./nnas create-package --preset 20230907 --prefix build/install
+```
+This will configure and build necessary modules and install files in
+`build/install` path.
+
+### Build and install onnx2circle
+
+`one-import-onnx` tool now uses `onnx2circle` tool from `circle-mlir`.
+
+Please read [README.md](../circle-mlir/README.md) for details.
+
+As `circle-mlir` uses lots of storage(about 150~200GB) and time,
+developers may not want to build from source.
+For this case, we can install from Debian package from `launchpad.net`
+```
+sudo -E add-apt-repository ppa:circletools/nightly
+sudo apt update
+sudo apt install onnx2circle
+```
+- this will install `onnx2circle` tool to `/usr/share/circletools` folder
+- you can make a copy or let `one-import-onnx` use this if `onnx2circle` is not
+present in the same folder
+
+### Command line tests
+
+To run command line tests, python virtual envirnment is necessary with
+test models.
+
+Prepare python virtual environment:
+```
+cd build/install/bin
+bash ./one-prepare-venv
+```
+
+Download test models:
+```
+cd ../test
+bash ./prepare_test_materials.sh
+```
+
+Run command line tests:
+```
+bash ./runtestall.sh
+```
+
 ## Build for Windows
 
 To build for Windows, we use MinGW(Minimalist GNU for Windows). [Here](https://github.com/git-for-windows/build-extra/releases) you can download a tool that includes it.