Skip to content

Commit 7ded23a

Browse files
committed
Merge branch 'master' into update.performance.docs
2 parents 92bd5c4 + 3e8d7a1 commit 7ded23a

File tree

180 files changed

+12919
-7794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+12919
-7794
lines changed

.circleci/config.yml

Lines changed: 329 additions & 201 deletions
Large diffs are not rendered by default.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve RedisAI
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. ...
16+
2. ....
17+
18+
**Expected behavior**
19+
A clear and concise description of what you expected to happen.
20+
21+
**Screenshots**
22+
If applicable, add screenshots to help explain your problem.
23+
24+
**Environment (please complete the following information):**
25+
- OS: [e.g. ubuntu 20.04]
26+
- Version [e.g. 1.2.2]
27+
- Platfrom [e.g. x86, Jetson, ARM]
28+
- Runtime [e.g. CPU, CUDA]
29+
30+
**Additional context**
31+
Add any other context about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for pushing RedisAI further
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/release-drafter-config.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name-template: 'Version $NEXT_PATCH_VERSION'
2+
tag-template: 'v$NEXT_PATCH_VERSION'
3+
categories:
4+
- title: 'Features'
5+
labels:
6+
- 'feature'
7+
- 'enhancement'
8+
- title: 'Bug Fixes'
9+
labels:
10+
- 'fix'
11+
- 'bugfix'
12+
- 'bug'
13+
- title: 'Maintenance'
14+
label: 'chore'
15+
change-template: '- $TITLE (#$NUMBER)'
16+
exclude-labels:
17+
- 'skip-changelog'
18+
template: |
19+
## Changes
20+
21+
$CHANGES
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
# branches to consider in the event; optional, defaults to all
6+
branches:
7+
- master
8+
9+
jobs:
10+
update_release_draft:
11+
runs-on: ubuntu-latest
12+
steps:
13+
# Drafts your next Release notes as Pull Requests are merged into "master"
14+
- uses: release-drafter/release-drafter@v5
15+
with:
16+
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
17+
config-name: release-drafter-config.yml
18+
env:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# https://github.com/marketplace/actions/run-circle-ci-on-label
2+
name: build-and-test-gpu
3+
4+
on:
5+
pull_request:
6+
types:
7+
- labeled
8+
- synchronize
9+
- assigned
10+
11+
jobs:
12+
valgrind_general:
13+
if: github.event.label.name == 'ci-test'
14+
runs-on: ubuntu-latest
15+
name: Run build and test gpu
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: circle-ci job runner
20+
id: curl-circle-ci
21+
uses: Open-Source-Contrib/circle-ci-trigger-action@latest
22+
with:
23+
circle_ci_token: ${{ secrets.CIRCLE_CI_SECRET}}
24+
circle_ci_job: build-and-test-gpu
25+
circle_ci_project_url: ${{ github.event.pull_request.head.ref }}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# https://github.com/marketplace/actions/run-circle-ci-on-label
2+
name: valgrind-general-run
3+
4+
on:
5+
pull_request:
6+
types:
7+
- labeled
8+
- synchronize
9+
- assigned
10+
11+
jobs:
12+
valgrind_general:
13+
if: github.event.label.name == 'ci-test'
14+
runs-on: ubuntu-latest
15+
name: Run valgrind general
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: circle-ci job runner
20+
id: curl-circle-ci
21+
uses: Open-Source-Contrib/circle-ci-trigger-action@latest
22+
with:
23+
circle_ci_token: ${{ secrets.CIRCLE_CI_SECRET}}
24+
circle_ci_job: valgrind-general
25+
circle_ci_project_url: ${{ github.event.pull_request.head.ref }}

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ option(BUILD_TF "Build the TensorFlow backend" ON)
5555
option(BUILD_TFLITE "Build the TensorFlow Lite backend" ON)
5656
option(BUILD_ORT "Build the ONNXRuntime backend" ON)
5757
option(BUILD_TORCH "Build the PyTorch backend" ON)
58-
58+
option(BUILD_REDISAI_LITE "Build the RedisAI Lite Varient" OFF)
5959
#----------------------------------------------------------------------------------------------
6060

6161
FUNCTION(ADD_LDFLAGS _TARGET NEW_FLAGS)
@@ -114,6 +114,9 @@ ENDIF()
114114

115115
SET(CMAKE_C_STANDARD 11)
116116
ADD_DEFINITIONS(-DREDISMODULE_EXPERIMENTAL_API)
117+
if(BUILD_REDISAI_LITE)
118+
ADD_DEFINITIONS(-DREDISAI_LITE)
119+
ENDIF()
117120

118121
# SET(CUDA_TOOLKIT_ROOT_DIR /usr/local/cuda-10.0)
119122

Dockerfile

Lines changed: 0 additions & 85 deletions
This file was deleted.

Dockerfile.arm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BUILD redisfab/redisai:${VERSION}-cpu-${ARCH}-${OSNICK}
22

3-
ARG REDIS_VER=6.0.9
3+
ARG REDIS_VER=6.2.4
44

55
# OSNICK=bionic|stretch|buster
66
ARG OSNICK=buster
@@ -12,6 +12,7 @@ ARG OS=debian:buster-slim
1212
ARG ARCH=arm64v8
1313

1414
ARG PACK=0
15+
ARG REDISAI_LITE=0
1516
ARG TEST=0
1617

1718
#----------------------------------------------------------------------------------------------
@@ -31,7 +32,7 @@ WORKDIR /build
3132
COPY --from=redis /usr/local/ /usr/local/
3233

3334
COPY ./opt/ opt/
34-
COPY ./tests/flow/test_requirements.txt tests/flow
35+
COPY ./tests/flow/tests_setup/test_requirements.txt tests/flow
3536

3637
RUN ./opt/readies/bin/getpy3
3738
RUN ./opt/system-setup.py
@@ -66,7 +67,7 @@ ARG REDIS_VER
6667
ARG PACK
6768

6869
RUN if [ ! -z $(command -v apt-get) ]; then apt-get -qq update; apt-get -q install -y libgomp1; fi
69-
RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi
70+
RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi
7071

7172
ENV REDIS_MODULES /usr/lib/redis/modules
7273
ENV LD_LIBRARY_PATH $REDIS_MODULES

0 commit comments

Comments
 (0)