Skip to content

Commit 378b89e

Browse files
authored
Merge branch 'master' into ck-docfix3.9
2 parents be212a4 + fd04b03 commit 378b89e

File tree

10 files changed

+3
-183
lines changed

10 files changed

+3
-183
lines changed

.circleci/config.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@ commands:
139139
- run:
140140
name: Build
141141
command: make -C opt all SHOW=1
142-
- run:
143-
name: Unit Tests
144-
command: |
145-
make -C opt unit_tests SHOW=1
146-
no_output_timeout: 5m
147142
- run:
148143
name: Test
149144
command: |

.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: 0 additions & 9 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,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)
@@ -321,10 +319,3 @@ ENDIF()
321319
IF (NOT ${installAbs} STREQUAL ${CMAKE_SOURCE_DIR}/install-${DEVICE})
322320
INSTALL_SYMLINK(${installAbs} ${CMAKE_SOURCE_DIR}/install-${DEVICE})
323321
ENDIF()
324-
325-
326-
if(PACKAGE_UNIT_TESTS)
327-
enable_testing()
328-
include(GoogleTest)
329-
add_subdirectory(tests/unit)
330-
endif()

docs/commands.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,9 @@ redis> AI.MODELGET mymodel META
335335
You can also save it to the local file 'model.ext' with [`redis-cli`](https://redis.io/topics/cli) like so:
336336

337337
```
338-
$ redis-cli --raw AI.MODELGET mymodel BLOB > model.ext
338+
$ redis-cli AI.MODELGET mymodel BLOB > model.ext
339339
```
340+
Note that for the time being, redis-cli adds additional linefeed character to redirected output so that the model blob retrieved with redis-cli will have an additional linefeed character.
340341

341342
## AI.MODELDEL
342343
The **`AI.MODELDEL`** deletes a model stored as a key's value.

opt/Makefile

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ make clean # remove build artifacts
4141
ALL=1 # remove entire artifacts directory
4242
make install # create ready-to-run scheme (module and engines)
4343

44-
make test # run test suites (flow an unit)
45-
# same as running make unit_tests flow_tests
46-
47-
make unit_tests # run unit test
44+
make test # run test suites (flow)
4845

4946
make flow_tests # run flow test
5047
TEST=test # run only test `test` with Redis output
@@ -242,13 +239,6 @@ export GEN ?= 1
242239
export SLAVES ?= 1
243240
export CLUSTER ?= 1
244241

245-
define UNIT_TESTS
246-
$(SHOW)echo Running unit tests ...
247-
$(SHOW)\
248-
BINDIR=$(realpath $(BINDIR)) \
249-
$(ROOT)/tests/unit/tests.sh
250-
endef
251-
252242
define FLOW_TESTS
253243
$(SHOW)echo Running flow tests ...
254244
$(SHOW)\
@@ -260,11 +250,6 @@ VALGRIND=$(VALGRIND) \
260250
$(ROOT)/tests/flow/tests_setup/tests.sh
261251
endef
262252

263-
unit_tests: build
264-
$(COVERAGE_RESET)
265-
$(UNIT_TESTS)
266-
$(COVERAGE_COLLECT_REPORT)
267-
268253
flow_tests: build
269254
$(COVERAGE_RESET)
270255
$(SHOW)\
@@ -280,10 +265,6 @@ flow_tests: build
280265

281266
test: build
282267
$(COVERAGE_RESET)
283-
$(UNIT_TESTS)
284-
$(SHOW)\
285-
BINDIR=$(realpath $(BINDIR)) \
286-
$(ROOT)/tests/unit/tests.sh
287268
$(SHOW)\
288269
DEVICE=$(DEVICE) \
289270
MODULE=$(realpath $(INSTALLED_TARGET)) \

opt/googletest

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/unit/CMakeLists.txt

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

tests/unit/rmalloc.h

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

tests/unit/tests.sh

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

tests/unit/unit_tests_err.cpp

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

0 commit comments

Comments
 (0)