Skip to content

Commit a93c6bc

Browse files
authored
Merge pull request #867 from RedisAI/v1.2.5
V1.2.5
2 parents 53efa26 + 98c3cf1 commit a93c6bc

File tree

141 files changed

+4178
-6703
lines changed

Some content is hidden

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

141 files changed

+4178
-6703
lines changed

.circleci/config.yml

+119-86
Large diffs are not rendered by default.

.github/release-drafter-config.yml

+21
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

.github/workflows/deploy-docs.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Deploy docs to website
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- master
@@ -16,9 +17,9 @@ jobs:
1617
steps:
1718
- uses: actions/checkout@v2.1.1
1819
- name: Set up Python 3.x
19-
uses: actions/setup-python@v1
20+
uses: actions/setup-python@v2
2021
with:
21-
python-version: '3.x'
22+
python-version: '3.9'
2223
- name: Display Python version
2324
run: python -c "import sys; print(sys.version)"
2425
- name: Install docs dependencies

.github/workflows/release-drafter.yml

+19
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 }}

.gitmodules

-3
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

+3-10
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")
@@ -23,7 +22,7 @@ ENDIF()
2322

2423
#----------------------------------------------------------------------------------------------
2524

26-
SET(CMAKE_CC_COMMON_FLAGS "-fPIC")
25+
SET(CMAKE_CC_COMMON_FLAGS "-fPIC -fcommon")
2726
IF (USE_PROFILE)
2827
SET(CMAKE_CC_COMMON_FLAGS "${CMAKE_CC_COMMON_FLAGS} -g -ggdb -fno-omit-frame-pointer")
2928
ENDIF()
@@ -50,7 +49,6 @@ 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)
@@ -160,6 +158,7 @@ ENDIF()
160158
IF(BUILD_ORT)
161159
FIND_LIBRARY(ORT_LIBRARIES NAMES onnxruntime
162160
PATHS ${depsAbs}/onnxruntime/lib)
161+
ADD_SUBDIRECTORY(src/backends/onnx_allocator)
163162
MESSAGE(STATUS "Found ONNXRuntime Libraries: \"${ORT_LIBRARIES}\")")
164163
IF (NOT ORT_LIBRARIES)
165164
MESSAGE(FATAL_ERROR "Could not find ONNXRuntime")
@@ -293,6 +292,7 @@ ENDIF()
293292

294293
IF(BUILD_ORT)
295294
ADD_LIBRARY(redisai_onnxruntime SHARED $<TARGET_OBJECTS:redisai_onnxruntime_obj>)
295+
TARGET_LINK_LIBRARIES(redisai_onnxruntime onnx_allocator ${ORT_LIBRARIES})
296296
TARGET_LINK_LIBRARIES(redisai_onnxruntime ${ORT_LIBRARIES})
297297
SET_TARGET_PROPERTIES(redisai_onnxruntime PROPERTIES PREFIX "")
298298
SET_TARGET_PROPERTIES(redisai_onnxruntime PROPERTIES SUFFIX ".so")
@@ -319,10 +319,3 @@ ENDIF()
319319
IF (NOT ${installAbs} STREQUAL ${CMAKE_SOURCE_DIR}/install-${DEVICE})
320320
INSTALL_SYMLINK(${installAbs} ${CMAKE_SOURCE_DIR}/install-${DEVICE})
321321
ENDIF()
322-
323-
324-
if(PACKAGE_UNIT_TESTS)
325-
enable_testing()
326-
include(GoogleTest)
327-
add_subdirectory(tests/unit)
328-
endif()

Dockerfile.arm

-83
This file was deleted.

Dockerfile.jetson

-102
This file was deleted.

0 commit comments

Comments
 (0)