Skip to content

Commit 3c9e855

Browse files
author
DvirDukhan
authored
Merge branch 'master' into redis-cli-modelget-limitation
2 parents bacadd7 + ec0d906 commit 3c9e855

File tree

227 files changed

+12793
-11878
lines changed

Some content is hidden

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

227 files changed

+12793
-11878
lines changed

.circleci/config.yml

Lines changed: 274 additions & 203 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 }}

.github/workflows/trigger-build-and-test-gpu.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ on:
55
pull_request:
66
types:
77
- labeled
8+
- synchronize
9+
- assigned
810

911
jobs:
1012
valgrind_general:
1113
if: github.event.label.name == 'ci-test'
1214
runs-on: ubuntu-latest
13-
name: Run build and test cpu
15+
name: Run build and test gpu
1416

1517
steps:
1618
- uses: actions/checkout@v2

.github/workflows/trigger-valgrind.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
pull_request:
66
types:
77
- labeled
8+
- synchronize
9+
- assigned
810

911
jobs:
1012
valgrind_general:

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "opt/readies"]
22
path = opt/readies
33
url = https://github.com/RedisLabsModules/readies.git
4-
[submodule "opt/googletest"]
5-
path = opt/googletest
6-
url = https://github.com/google/googletest.git

CMakeLists.txt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ PROJECT(RedisAI)
33

44
# CMake modules should be included in ${PROJECT_SOURCE_DIR}/opt/cmake/modules
55
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/opt/cmake/modules)
6-
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/opt/GoogleTest)
76

87
# Set a default build type if none was specified
98
set(default_build_type "Release")
@@ -50,12 +49,11 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_COMMON_FLAGS_DEBUG}"
5049

5150
#----------------------------------------------------------------------------------------------
5251

53-
option(PACKAGE_UNIT_TESTS "Build unit tests" ON)
5452
option(BUILD_TF "Build the TensorFlow backend" ON)
5553
option(BUILD_TFLITE "Build the TensorFlow Lite backend" ON)
5654
option(BUILD_ORT "Build the ONNXRuntime backend" ON)
5755
option(BUILD_TORCH "Build the PyTorch backend" ON)
58-
56+
option(BUILD_REDISAI_LITE "Build the RedisAI Lite Varient" OFF)
5957
#----------------------------------------------------------------------------------------------
6058

6159
FUNCTION(ADD_LDFLAGS _TARGET NEW_FLAGS)
@@ -114,6 +112,9 @@ ENDIF()
114112

115113
SET(CMAKE_C_STANDARD 11)
116114
ADD_DEFINITIONS(-DREDISMODULE_EXPERIMENTAL_API)
115+
if(BUILD_REDISAI_LITE)
116+
ADD_DEFINITIONS(-DREDISAI_LITE)
117+
ENDIF()
117118

118119
# SET(CUDA_TOOLKIT_ROOT_DIR /usr/local/cuda-10.0)
119120

@@ -157,6 +158,7 @@ ENDIF()
157158
IF(BUILD_ORT)
158159
FIND_LIBRARY(ORT_LIBRARIES NAMES onnxruntime
159160
PATHS ${depsAbs}/onnxruntime/lib)
161+
ADD_SUBDIRECTORY(src/backends/onnx_allocator)
160162
MESSAGE(STATUS "Found ONNXRuntime Libraries: \"${ORT_LIBRARIES}\")")
161163
IF (NOT ORT_LIBRARIES)
162164
MESSAGE(FATAL_ERROR "Could not find ONNXRuntime")
@@ -290,6 +292,7 @@ ENDIF()
290292

291293
IF(BUILD_ORT)
292294
ADD_LIBRARY(redisai_onnxruntime SHARED $<TARGET_OBJECTS:redisai_onnxruntime_obj>)
295+
TARGET_LINK_LIBRARIES(redisai_onnxruntime onnx_allocator ${ORT_LIBRARIES})
293296
TARGET_LINK_LIBRARIES(redisai_onnxruntime ${ORT_LIBRARIES})
294297
SET_TARGET_PROPERTIES(redisai_onnxruntime PROPERTIES PREFIX "")
295298
SET_TARGET_PROPERTIES(redisai_onnxruntime PROPERTIES SUFFIX ".so")
@@ -316,10 +319,3 @@ ENDIF()
316319
IF (NOT ${installAbs} STREQUAL ${CMAKE_SOURCE_DIR}/install-${DEVICE})
317320
INSTALL_SYMLINK(${installAbs} ${CMAKE_SOURCE_DIR}/install-${DEVICE})
318321
ENDIF()
319-
320-
321-
if(PACKAGE_UNIT_TESTS)
322-
enable_testing()
323-
include(GoogleTest)
324-
add_subdirectory(tests/unit)
325-
endif()

Dockerfile

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

0 commit comments

Comments
 (0)