Merge branch 'master' into backends_upgrade

Author: DvirDukhan

.circleci/config.yml

@@ -336,6 +336,17 @@ on-master: &on-master
   filters:
     branches:
       only: master
+    tags:
+      ignore: /.*/
+
+on-integ-branch: &on-integ-branch
+  filters:
+    branches:
+      only:
+        - master
+        - /^\d+\.\d+.*$/
+    tags:
+      ignore: /.*/
 
 on-version-tags: &on-version-tags
   filters:
@@ -344,18 +355,20 @@ on-version-tags: &on-version-tags
     tags:
       only: /^v[0-9].*/
 
-on-master-and-version-tags: &on-master-and-version-tags
+on-integ-and-version-tags: &on-integ-and-version-tags
   filters:
     branches:
       only:
         - master
+        - /^\d+\.\d+.*$/
     tags:
       only: /^v[0-9].*/
 
+
 platform-build-defs: &platform-build-defs
   requires:
     - build-debian
-  <<: *on-master-and-version-tags
+  <<: *on-integ-and-version-tags
   # <<: *on-any-branch # debugging
 
 after-platform-builds: &after-platform-builds
@@ -372,7 +385,8 @@ workflows:
   version: 2
   build_and_package:
     jobs:
-      - lint
+      - lint:
+          <<: *on-any-branch
       - build-debian:
           <<: *on-any-branch
           <<: *after-linter
@@ -405,7 +419,7 @@ workflows:
           # <<: *on-version-tags
       - deploy-snapshot:
           <<: *after-platform-builds
-          <<: *on-master
+          <<: *on-integ-branch
       - deploy-release:
           <<: *after-platform-builds
           <<: *on-version-tags
@@ -414,7 +428,9 @@ workflows:
     triggers:
       - schedule:
           cron: "20 17 * * *"
-          <<: *on-master
+          filters:
+            branches:
+              only: master
     jobs:
       - build-macos:
           <<: *never # temporarily disabled

docs/intro.md

@@ -8,6 +8,10 @@ This introduction is intended to present the core concepts it uses and the funct
 !!! important "Prerequisites"
     Before diving into RedisAI please make sure that you are familiar with the basic concepts of machine learning and Redis.
 
+This video will introduce you to RedisAI at a high level. Give it a watch, then keep reading for more details.
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/gbiqF-eyTW4" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
 In broad strokes, RedisAI's looks as follows:
 
 ```

opt/getver

@@ -11,7 +11,7 @@ if [[ $NUMERIC != 1 ]]; then
 		#include "src/version.h"
 
 		int main(int argc, char *argv[]) {
-				printf("%d.%d.%d\n", RAI_ENC_VER / 10000, (RAI_ENC_VER / 100) % 100, RAI_ENC_VER % 100);
+				printf("%d.%d.%d\n", REDISAI_VERSION_MAJOR, REDISAI_VERSION_MINOR, REDISAI_VERSION_PATCH);
 				return 0;
 		}
 		EOF
@@ -22,7 +22,7 @@ else
 		#include "src/version.h"
 
 		int main(int argc, char *argv[]) {
-				printf("%d\n", RAI_ENC_VER);
+				printf("%d%d%d\n", REDISAI_VERSION_MAJOR, REDISAI_VERSION_MINOR, REDISAI_VERSION_PATCH);
 				return 0;
 		}
 		EOF

src/CMakeLists.txt

@@ -29,6 +29,8 @@ ADD_LIBRARY(redisai_obj OBJECT
         config.c
         DAG/dag.c
         DAG/dag_parser.c
+        DAG/dag_builder.c
+        DAG/dag_execute.c
         modelRun_ctx.c
         backends.c
         backends/util.c