Skip to content

Commit 0afe986

Browse files
author
DvirDukhan
authored
Merge branch 'master' into backend_version
2 parents bd235ed + aab7c36 commit 0afe986

File tree

5 files changed

+15
-21
lines changed

5 files changed

+15
-21
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ commands:
1717
- run:
1818
name: Setup automation
1919
command: |
20-
PIP=1 ./opt/readies/bin/getpy3
20+
./opt/readies/bin/getpy3
2121
./opt/system-setup.py
2222
2323
build-steps:
@@ -125,6 +125,7 @@ jobs:
125125
- run:
126126
name: Submodule checkout
127127
command: git submodule update --init --recursive
128+
- setup-automation
128129
- run:
129130
name: lint
130131
command: |

docs/intro.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ This introduction is intended to present the core concepts it uses and the funct
88
!!! important "Prerequisites"
99
Before diving into RedisAI please make sure that you are familiar with the basic concepts of machine learning and Redis.
1010

11+
This video will introduce you to RedisAI at a high level. Give it a watch, then keep reading for more details.
12+
13+
<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>
14+
1115
In broad strokes, RedisAI's looks as follows:
1216

1317
```

opt/system-setup.py

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,28 @@ def __init__(self, nop=False):
1818

1919
def common_first(self):
2020
self.install_downloaders()
21-
self.setup_pip()
22-
self.pip_install("wheel virtualenv")
21+
self.pip_install("wheel")
2322

24-
if self.os == 'linux':
25-
self.install("ca-certificates")
26-
self.install("git unzip wget patchelf")
23+
self.install("git unzip patchelf")
2724
self.install("coreutils") # for realpath
2825

2926
def debian_compat(self):
3027
self.install("gawk")
3128
self.install("build-essential")
3229
self.install("libssl-dev")
33-
self.install("clang-format")
3430
self.install("python3-regex")
3531
self.install("python3-psutil python3-networkx python3-numpy")
36-
if self.arch == 'arm64v8' or self.arch == 'arm32v7':
32+
if self.platform.is_arm():
3733
self.install("python3-dev") # python3-skimage
3834
self.install("libmpich-dev libopenblas-dev") # for libtorch
3935
self.install_git_lfs_on_linux()
4036

4137
def redhat_compat(self):
4238
self.install("redhat-lsb-core")
43-
self.run("%s/readies/bin/enable-utf8" % HERE)
39+
self.run("%s/bin/enable-utf8" % READIES)
4440

45-
self.group_install("'Development Tools'")
4641
self.run("%s/bin/getgcc --modern" % READIES)
47-
self.install("llvm-toolset-7")
42+
# self.install("llvm-toolset-7")
4843

4944
if self.arch == 'x64':
5045
self.install_linux_gnu_tar()
@@ -63,7 +58,6 @@ def redhat_compat(self):
6358
def fedora(self):
6459
self.group_install("'Development Tools'")
6560
self.install("python3 python3-psutil python3-networkx")
66-
self.install("clang")
6761
self.install_git_lfs_on_linux()
6862

6963
def linux_last(self):
@@ -73,18 +67,13 @@ def macos(self):
7367
self.install_gnu_utils()
7468
self.install("git-lfs")
7569
self.install("redis")
76-
self.install("clang-format")
7770

7871
def common_last(self):
72+
self.run("%s/bin/getclang --format" % READIES)
7973
self.run("%s/bin/getcmake" % READIES)
8074

81-
self.run("python3 -m pip uninstall -y ramp-packer RLTest || true")
82-
# redis-py-cluster should be installed from git due to redis-py dependency
83-
self.pip_install("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master")
84-
self.pip_install("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master")
85-
self.pip_install("--no-cache-dir git+https://github.com/RedisLabs/RAMP@master")
75+
self.run("{PYTHON} {READIES}/bin/getrmpytools".format(PYTHON=self.python, READIES=READIES))
8676

87-
self.pip_install("-r %s/readies/paella/requirements.txt" % HERE)
8877
self.pip_install("-r %s/tests/flow/test_requirements.txt" % ROOT)
8978

9079
self.pip_install("awscli")

src/backends.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ int RAI_LoadBackend_TensorFlow(RedisModuleCtx *ctx, const char *path) {
122122
}
123123

124124
backend.model_serialize = (int (*)(RAI_Model *, char **, size_t *, RAI_Error *))(
125-
unsigned long)dlsym(handle, "RAI_ModelSerializeTF");
125+
(unsigned long)dlsym(handle, "RAI_ModelSerializeTF"));
126126
if (backend.model_serialize == NULL) {
127127
dlclose(handle);
128128
RedisModule_Log(ctx, "warning",

0 commit comments

Comments
 (0)