Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ec91017
Fetch test data from s3 instead of using git-lfs
alonre24 Jun 6, 2022
1884e78
Override credentials for getting the test data from s3
alonre24 Jun 6, 2022
99e29a5
Change cp to sync (and loose recursive arg)
alonre24 Jun 6, 2022
5b528e4
Add aws-region
alonre24 Jun 6, 2022
e4e22e9
Add aws-region fix
alonre24 Jun 6, 2022
301c3c2
Add aws-region fix - use env var
alonre24 Jun 6, 2022
c63a254
try copy instead of sync
alonre24 Jun 6, 2022
8ccb02b
use source region arg
alonre24 Jun 6, 2022
0bf1440
use source region arg fix
alonre24 Jun 6, 2022
4f542bb
Use context for jobs that access s3
alonre24 Jun 6, 2022
f7efd2f
change to copy
alonre24 Jun 6, 2022
1afcbde
revert to synk after applying bucket policy
alonre24 Jun 6, 2022
bc59fdb
fix typo
alonre24 Jun 6, 2022
439ced5
Remove orb, use test_data profile for credentials
alonre24 Jun 7, 2022
ca3bfc3
fix var name (use underscore) in aws configure
alonre24 Jun 7, 2022
9ec230f
Use $ for env var
alonre24 Jun 7, 2022
1b39a10
Add test data to git ignore, update cache-key
alonre24 Jun 7, 2022
f6026d0
Fix path is restore cache
alonre24 Jun 7, 2022
fb03105
Move restore cache in gpu to be before build docker step
alonre24 Jun 7, 2022
551cda2
Use different key for GPU
alonre24 Jun 7, 2022
cf61e91
Add context to gpu
alonre24 Jun 7, 2022
e2db09b
Use wget instead of aws sync to allow retrieval of test data from s3 …
alonre24 Jun 8, 2022
115b506
add -q flag for wget
alonre24 Jun 8, 2022
81d4e1f
Revert CI jobs that sync with s3 (it isn't required, tests.sh script …
alonre24 Jun 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,18 @@ commands:
- run:
name: Build
command: make -C opt all SHOW=1
- restore_cache:
keys:
- v1.2-tests_data
- run:
name: Test
command: |
make -C opt test SHOW=1
no_output_timeout: 20m
- save_cache:
paths:
- tests/flow/test_data
key: v1.2-tests_data
- run:
name: Package
command: |
Expand Down Expand Up @@ -182,6 +189,9 @@ commands:
name: Build for valgrind
command: |
make -C opt all VALGRIND=1 SHOW=1
- restore_cache:
keys:
- v1.2-tests_data
- run:
name: Test with valgrind
command: |
Expand All @@ -198,6 +208,9 @@ commands:
- restore_cache:
keys:
- v1.2.5-deps-{{ checksum "get_deps.sh" }}-gpu
- restore_cache:
keys:
- v1.2-tests_data-gpu

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the reason we are having an additional cache key? Should be the same for both modes, no?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, that's how it was before, but I got access denied when restoring cache, so I tried this option instead....

- relocate-docker-storage
- run:
name: Build
Expand All @@ -215,6 +228,10 @@ commands:
mkdir -p $HOME/tests
docker run --gpus all -v $HOME/tests:/build/tests/flow/logs -it --rm redisai-gpu:latest-test
no_output_timeout: 40m
- save_cache:
paths:
- tests/flow/test_data
key: v1.2-tests_data-gpu
- store_artifacts:
path: /home/circleci/tests

Expand Down Expand Up @@ -331,6 +348,9 @@ jobs:
name: Build for coverage
command: |
make -C opt all COV=1 SHOW=1
- restore_cache:
keys:
- v1.2-tests_data
- run:
name: Test with coverage
command: |
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,7 @@ dkms.conf
.idea_modules/

# docs site
site/
site/

# test data
tests/flow/test_data
11 changes: 8 additions & 3 deletions tests/flow/onnx_benchmark.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import os

import subprocess
from RLTest import Env
from includes import *
import shutil
Expand All @@ -25,7 +24,6 @@ def handler(signum, frame):
def _exit():
# remove the logs that were auto generated by redis
shutil.rmtree('logs', ignore_errors=True)
print("from exit\n")
sys.exit(1)


Expand Down Expand Up @@ -172,6 +170,13 @@ def run_bert():
help='The number of parallel clients that send consecutive run requests per model')
args = parser.parse_args()

if not os.path.isdir('tests/flow/test_data'):
print("Downloading tests data from s3...")
with open('tests/flow/test_data_files.txt') as f:
for resource in f.readlines():
subprocess.call(['wget', '-q', '-x', '-nH', '--cut-dirs=2', resource[:-1], '-P', 'tests/flow/test_data'])
print("Done")

terminate_flag = 0
print(f'Running ONNX benchmark on RedisAI, using {args.num_threads} working threads')
env = Env(module='install-cpu/redisai.so',
Expand Down
Binary file removed tests/flow/test_data/Pads.bin
Binary file not shown.
Empty file removed tests/flow/test_data/__init__.py
Empty file.
3 changes: 0 additions & 3 deletions tests/flow/test_data/batchdim_mismatch.onnx

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/batchdim_mismatch.pt

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/bert-base-cased.onnx

This file was deleted.

10,001 changes: 0 additions & 10,001 deletions tests/flow/test_data/creditcard_10K.csv

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/creditcardfraud.pb

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/frozen_bad_model.pb

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/graph.pb

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/graph_v2.pb

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/identity_string.onnx

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/identity_string.pb

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions tests/flow/test_data/imagenet/cat.jpg

This file was deleted.

17 changes: 0 additions & 17 deletions tests/flow/test_data/imagenet/data_processing_script.txt

This file was deleted.

12 changes: 0 additions & 12 deletions tests/flow/test_data/imagenet/data_processing_script_old.txt

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/imagenet/dog.jpg

This file was deleted.

1 change: 0 additions & 1 deletion tests/flow/test_data/imagenet/imagenet_class_index.json

This file was deleted.

32 changes: 0 additions & 32 deletions tests/flow/test_data/imagenet/model_checker.py

This file was deleted.

15 changes: 0 additions & 15 deletions tests/flow/test_data/imagenet/model_saver.py

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/imagenet/resnet50.pb

This file was deleted.

1 change: 0 additions & 1 deletion tests/flow/test_data/imagenet_class_index.json

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/inception-v2-9.onnx

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/linear_iris.onnx

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/logreg_iris.onnx

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/mnist.onnx

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/mnist_batched.onnx

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/mnist_model_quant.tflite

This file was deleted.

Empty file.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/mobilenet/mobilenet_v2_1.4_224_frozen.pb

This file was deleted.

49 changes: 0 additions & 49 deletions tests/flow/test_data/mobilenet/model_saver.py

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/mobilenet_v2_1.4_224_frozen.pb

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/model_with_external_initializers.onnx

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/model_with_infinite_loop.onnx

This file was deleted.

3 changes: 0 additions & 3 deletions tests/flow/test_data/mul_1.onnx

This file was deleted.

5 changes: 0 additions & 5 deletions tests/flow/test_data/old_script.txt

This file was deleted.

Binary file removed tests/flow/test_data/one.png
Binary file not shown.
3 changes: 0 additions & 3 deletions tests/flow/test_data/one.raw

This file was deleted.

38 changes: 0 additions & 38 deletions tests/flow/test_data/onnx_batch.py

This file was deleted.

Loading