Skip to content

Commit a197b9f

Browse files
alonre24alonre24
committed
- Copy Install gears script to docker-gpu
- Install gears from flow test (instead of deps) - Add gears suppressions to valgrind.sup
1 parent d48406b commit a197b9f

File tree

6 files changed

+119
-7
lines changed

6 files changed

+119
-7
lines changed

‎Dockerfile.gpu-test‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ COPY --from=redis /usr/local/ /usr/local/
2929

3030
COPY ./opt/ opt/
3131
COPY ./tests/flow/test_requirements.txt tests/flow/
32+
COPY ./tests/flow/Install_RedisGears.sh tests/flow/
3233

3334
RUN PIP=1 VENV=1 FORCE=1 ./opt/readies/bin/getpy3
3435

‎get_deps.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,3 @@ if [[ $WITH_ORT != 0 ]]; then
330330
else
331331
echo "Skipping ONNXRuntime."
332332
fi # WITH_ORT
333-
334-
################################################################################### REDISGEARS
335-
336-
OS=bionic /bin/bash $HERE/Install_RedisGears.sh

‎opt/redis_valgrind.sup‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,110 @@
6868
fun:RAI_LoadBackend
6969
}
7070

71+
{
72+
<ignore_py_error0>
73+
Memcheck:Cond
74+
fun:lzf_compress
75+
}
76+
{
77+
<ignore_py_error0.1>
78+
Memcheck:Cond
79+
...
80+
fun:Py_InitializeEx
81+
...
82+
}
83+
{
84+
<ignore_py_error0.2>
85+
Memcheck:Cond
86+
...
87+
fun:_PyEval_EvalFrameDefault
88+
...
89+
}
90+
{
91+
<ignore_py_error0.3>
92+
Memcheck:Leak
93+
...
94+
fun:_imp_exec_builtin
95+
...
96+
}
97+
{
98+
<ignore_py_error0.4>
99+
Memcheck:Cond
100+
...
101+
fun:PySys_SetArgvEx
102+
...
103+
}
104+
{
105+
<ignore_py_error0.5>
106+
Memcheck:Cond
107+
...
108+
fun:_PyMethodDef_RawFastCallKeywords
109+
...
110+
}
111+
{
112+
<ignore_py_error0>
113+
Memcheck:Value8
114+
fun:lzf_compress
115+
}
116+
{
117+
<ignore_py_error1>
118+
Memcheck:Addr4
119+
obj:*libpython2.7*
120+
}
121+
{
122+
<ignore_py_error1>
123+
Memcheck:Addr8
124+
obj:*libpython2.7*
125+
}
126+
{
127+
<ignore_py_error2>
128+
Memcheck:Value8
129+
obj:*libpython2.7*
130+
}
131+
{
132+
<ignore_py_error3>
133+
Memcheck:Cond
134+
obj:*libpython2.7*
135+
}
136+
{
137+
<ignore_py_error4>
138+
Memcheck:Leak
139+
...
140+
obj:*libpython2.7*
141+
...
142+
}
143+
{
144+
<ignore_libevent_issues>
145+
Memcheck:Leak
146+
...
147+
fun:redisLibeventAttach
148+
...
149+
}
150+
{
151+
<ignore_compiler_visit_expr_for_now>
152+
Memcheck:Leak
153+
...
154+
fun:compiler_visit_expr
155+
...
156+
}
157+
{
158+
<ignore_compiler_visit_expr_for_now>
159+
Memcheck:Leak
160+
...
161+
fun:redisConnectNonBlock
162+
...
163+
}
164+
{
165+
<ignore_connection_leak_for_now>
166+
Memcheck:Leak
167+
...
168+
fun:_redisContextConnectTcp
169+
...
170+
}
171+
{
172+
Libuv_epoll_ctl
173+
Memcheck:Param
174+
epoll_ctl(event)
175+
fun:epoll_ctl
176+
...
177+
}

Install_RedisGears.sh renamed to tests/flow/Install_RedisGears.sh

File renamed without changes.

‎tests/flow/tests.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ install_git_lfs() {
5252

5353
#----------------------------------------------------------------------------------------------
5454

55+
install_redis_gears() {
56+
57+
OS=bionic /bin/bash $HERE/Install_RedisGears.sh
58+
}
59+
60+
#----------------------------------------------------------------------------------------------
5561
check_redis_server() {
5662
if ! command -v redis-server > /dev/null; then
5763
echo "Cannot find redis-server. Aborting."
@@ -136,6 +142,8 @@ cd $ROOT/tests/flow
136142

137143
install_git_lfs
138144
check_redis_server
145+
install_redis_gears
146+
139147

140148
[[ ! -z $REDIS ]] && RL_TEST_ARGS+=" --env exiting-env --existing-env-addr $REDIS" run_tests "redis-server: $REDIS"
141149
[[ $GEN == 1 ]] && run_tests

‎tests/flow/tests_withGears.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ def wrapper(env, *args, **kwargs):
1313
if b'rg' in [module[1] for module in modules]:
1414
return f(env, *args, **kwargs)
1515
try:
16-
redisgears_path = os.path.join(os.path.dirname(__file__), '../../deps/linux-x64-cpu/bin/RedisGears/redisgears.so')
17-
python_plugin_path = os.path.join(os.path.dirname(__file__), '../../deps/linux-x64-cpu/bin/RedisGears/plugin/gears_python.so')
18-
python_env_path = os.path.join(os.path.dirname(__file__), '../../deps/linux-x64-cpu/bin/RedisGears')
16+
redisgears_path = os.path.join(os.path.dirname(__file__), 'bin/RedisGears/redisgears.so')
17+
python_plugin_path = os.path.join(os.path.dirname(__file__), 'bin/RedisGears/plugin/gears_python.so')
18+
python_env_path = os.path.join(os.path.dirname(__file__), 'bin/RedisGears')
1919
ret = con.execute_command('MODULE', 'LOAD', redisgears_path, 'Plugin', python_plugin_path, 'CreateVenv',
2020
0, 'PythonInstallationDir', python_env_path)
2121
env.assertEqual(ret, b'OK')

0 commit comments

Comments
 (0)