Upgrade to onnx 1.9 (#847)

Upgrade python in xenial docker to 3.7 from 3.6 and gcc version to 7

Build onnx with DISABLE_EXTERNAL_INITIALIZERS flag for both CPU and GPU

Update deps cache key in CI

Ignore overlap valgrind errors from onnx lib that was introduced in 1.9.0

Author: alonre24

.circleci/config.yml

@@ -101,7 +101,7 @@ commands:
       - checkout-all
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "get_deps.sh" }}-cpu
+          - v1.2.5-deps-{{ checksum "get_deps.sh" }}-cpu
           # If no exact match is found will get dependencies from source
       - setup-build-system
       - run:
@@ -112,7 +112,7 @@ commands:
       - save_cache:
           paths:
             - deps
-          key: v1-dependencies-{{ checksum "get_deps.sh" }}-cpu
+          key: v1.2.5-deps-{{ checksum "get_deps.sh" }}-cpu
       - run:
           name: Build
           command: make -C opt all SHOW=1
@@ -151,7 +151,7 @@ commands:
       - checkout-all
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "get_deps.sh" }}-cpu
+          - v1.2.5-deps-{{ checksum "get_deps.sh" }}-cpu
           # If no exact match is found will get dependencies from source
       - setup-build-system
       - run:
@@ -178,7 +178,7 @@ commands:
       - checkout-all
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "get_deps.sh" }}-gpu
+          - v1.2.5-deps-{{ checksum "get_deps.sh" }}-gpu
       - relocate-docker-storage
       - run:
           name: Build
@@ -189,7 +189,7 @@ commands:
       - save_cache:
           paths:
             - deps
-          key: v1-dependencies-{{ checksum "get_deps.sh" }}-gpu
+          key: v1.2.5-deps-{{ checksum "get_deps.sh" }}-gpu
       - run:
           name: Test
           command: |
@@ -239,7 +239,7 @@ jobs:
       - checkout-all
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "get_deps.sh" }}-<<parameters.osnick>>-<<parameters.target>>
+          - v1.2.5-deps-{{ checksum "get_deps.sh" }}-<<parameters.osnick>>-<<parameters.target>>
       - setup-automation
 
       # since we run in parallel, we need to generate docker files with different suffixes hence the DOCKER_SUFFIX
@@ -260,7 +260,7 @@ jobs:
       - save_cache:
           paths:
             - deps
-          key: v1-dependencies-{{ checksum "get_deps.sh" }}-<<parameters.osnick>>-<<parameters.target>>
+          key: v1.2.5-deps-{{ checksum "get_deps.sh" }}-<<parameters.osnick>>-<<parameters.target>>
       - persist_to_workspace:
           root: bin/
           paths:
@@ -275,7 +275,7 @@ jobs:
       - checkout-all
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "get_deps.sh" }}-cpu
+          - v1.2.5-deps-{{ checksum "get_deps.sh" }}-cpu
           # If no exact match is found will get dependencies from source
       - setup-build-system
       - run:
@@ -309,7 +309,7 @@ jobs:
       - checkout-all
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "get_deps.sh" }}-cpu
+          - v1.2.5-deps-{{ checksum "get_deps.sh" }}-cpu
           # If no exact match is found will get dependencies from source
       - setup-build-system
       - run:

docs/developer-backends.md

@@ -0,0 +1,47 @@
+# RedisAI Development Backends
+
+This document describes how a backend for RedisAI can be built, from this repository. It highlights the supported compilation devices on a per-backend basis, and highlights the tools and commands required.  Unless indicated otherwise, a backend is compiled in a docker, which is responsible for the configuration and installation of all tools required for a given backend on a per-platform basis.
+
+To follow these instructions, this repository must be cloned with all of its submodules (i.e *git clone --recursive https://github.com/redisai/redisai*)
+
+GNU Make is used as a runner for the dockerfile generator. Python is the language used for the generator script, and jinja is the templating library used to create the docker file from a template *dockerfile.tmpl* that can be found in the directory of a given backend listed below.
+
+## Tools
+
+Building the backends requires installation of the following tools:
+
+1. gnu make
+1. python (3.0 or higher)
+1. docker
+1. jinja2
+
+On ubuntu bionic these can be installed by running the following steps, to install python3, create a virtual environment, and install the jinja templating dependency. Replace */path/to/venv* with your desired virtualenv location.
+
+```
+sudo apt install python3 python3-dev make docker
+python3 -m venv /path/to/venv
+source /path/to/venv/bin/activate
+pip install jinja
+```
+
+-------
+
+## Backends
+
+### onnxruntime
+
+We build Onnxruntime library with DISABLE_EXTERNAL_INITIALIZERS=ON build flag. This means that loading ONNX models that use external files to store the initial (usually very large) values of the model's operations, is invalid. That is, initializers values must be part of the serialized model, which is also the standard use case.
+
+**Compilation target devices:**
+
+1. x86\_64 bit linux systems
+
+1. x86\_64 bit linux systems with a GPU
+
+**Directory:** opt/build/onnxruntime
+
+**Build options:**
+
+1. To build run *make*
+
+1. To build with GPU support on x86\_64 run *make GPU=1*

docs/developer.md

@@ -172,6 +172,8 @@ sudo ./opt/system-setup.py
 
 To compile RedisAI, run *make -C opt all*, from the root of the repository.
 
+Build the backends is described in [this document](developer-backends.md).
+
 ### Testing
 
 **Running Tests**

get_deps.sh

@@ -289,7 +289,7 @@ fi
 
 ################################################################################### ONNXRUNTIME
 
-ORT_VERSION="1.7.1"
+ORT_VERSION="1.9.0"
 
 if [[ $WITH_ORT != 0 ]]; then
 	[[ $FORCE == 1 ]] && rm -rf $ONNXRUNTIME

opt/build/backends.rules

@@ -0,0 +1,65 @@
+# PRODUCT var is the backend name, without any other configuration (set in each backend's corresponding makefile)
+
+# default is x64
+ARCH=$(shell ${READIES}/bin/platform --arch)
+OS=$(shell ${READIES}/bin/platform --os)
+REDIS_CMAKE_ARCH=x86_64
+DOCKER_ORG=redislabs
+
+# jetson
+ifeq ($(shell test -e /usr/share/doc/nvidia-l4t-jetson-io && echo -n yes),yes)
+ARCH=jetson
+REDIS_CMAKE_ARCH=aarch64
+GPU=1
+endif
+export REDIS_CMAKE_ARCH
+
+# override if necessary in top-level make files
+DEFAULT_DOCKER_TAG=${DOCKER_ORG}/${PRODUCT}:build
+CIDFILE=${PRODUCT}.${ARCH}.cid
+
+ifeq ($(GPU),1)
+REDIS_GPU=1
+VARIANT=gpu
+CIDFILE=${PRODUCT}.${ARCH}.gpu.cid  # this way we can build from the same tree across platforms
+export REDIS_GPU
+endif
+
+ifeq ($(VARIANT),)
+BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${VERSION}.tgz
+else
+BACKEND_NAME=${PRODUCT}-${OS}-${ARCH}-${VARIANT}-${VERSION}.tgz
+endif
+
+S3_URL=redismodules/${PRODUCT}
+
+build:
+	@rm -f ${BACKEND_NAME} *.cid
+	REDIS_ARCH=${ARCH} \
+	REDIS_OSNICK=${OSNICK} \
+	${READIES}/bin/dockerwrapper \
+		-d ${CURDIR}/Dockerfile${DOCKER_SUFFIX} \
+		-t ${DEFAULT_DOCKER_TAG} \
+        -S ../dockerparts \
+		-e REDIS \
+		-D "${DOCKER_OPTS}" \
+		${DOCKER_ARGS}
+	docker create --cidfile ${CIDFILE} ${DEFAULT_DOCKER_TAG}
+	docker cp `cat ${CIDFILE}`:/build/${BACKEND_NAME} .
+
+publish:
+	@aws s3 cp ${BACKEND_NAME} s3://$(S3_URL)/ --acl public-read
+
+# ---------------------------------------------------------------------------------------------------
+define HELP
+make build> # build the backend, tagging the docker image so that the files can be copied out of it
+	OSNICK=<>			# optional base operating system (xenial, bionic, etc)
+	REDIS_CUDA_VERSION=<>		# optional cuda version to override
+	DOCKER_SUFFIX=<>		# optional suffix for the generated dockerfile
+	GPU=1				# if set, build the GPU
+make publish > # upload the generated artifacts to s3 same
+	GPU=1				# if set, upload the GPU artifact (defaults to cpu)
+endef
+# ---------------------------------------------------------------------------------------------------
+include ${READIES}/mk/help.defs
+include ${READIES}/mk/help.rules

opt/build/dockerparts/apt.yml

@@ -0,0 +1,26 @@
+RUN apt-get update -qq
+RUN DEBIAN_NONINTERACTIVE=y1 apt-get install -y software-properties-common
+
+{% if REDIS_OSNICK == 'xenial' %}
+RUN add-apt-repository ppa:deadsnakes/ppa
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test
+{% endif %}
+
+RUN apt-get update -qq
+RUN DEBIAN_NONINTERACTIVE=1 apt-get install -y curl wget tar git patch  \
+	build-essential libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev \
+    python3.7 python3-pip python3-dev python3-numpy \
+    gcc-7 g++-7
+
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 60
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7
+
+RUN python3 -m pip install --upgrade pip setuptools wheel
+
+ENV LANG=en_US.UTF-8
+RUN apt-get install -y locales && \
+    sed -i -e "s/# $LANG.*/$LANG UTF-8/" /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=$LANG
+
+

opt/build/dockerparts/cmake.yml

@@ -0,0 +1,9 @@
+{% set cmake_version = "3.19.7" %}
+RUN wget -q https://github.com/Kitware/CMake/releases/download/v{{cmake_version}}/cmake-{{cmake_version}}-Linux-{{REDIS_CMAKE_ARCH}}.tar.gz -O /tmp/cmake.tgz
+
+WORKDIR /tmp
+RUN tar -zxpf /tmp/cmake.tgz
+RUN mv /tmp/cmake*/bin/* /usr/bin
+RUN mv /tmp/cmake-*/share/cmake* /usr/share/
+
+

opt/build/onnxruntime/.gitignore

@@ -0,0 +1,2 @@
+Dockerfile
+onnxruntime.x64.cid