Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update mxnet version to fix CI error #863

Merged
merged 10 commits into from
Aug 3, 2019
Merged

Update mxnet version to fix CI error #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8ae4288
update ci mxnet version
xinyu-intel Jul 13, 2019
1081252
refactor BilinearResize2D testcase
xinyu-intel Jul 13, 2019
4bd170a
trigger
xinyu-intel Jul 13, 2019
1031e31
trigger ci
xinyu-intel Jul 15, 2019
19312ef
pick model_store from #863
xinyu-intel Jul 16, 2019
a63526d
hybridize yolo
xinyu-intel Jul 19, 2019
71fc868
use mkl
xinyu-intel Jul 19, 2019
aa6cfbd
add nd waitall
xinyu-intel Jul 19, 2019
bf8a43d
pin to latest release
xinyu-intel Aug 3, 2019
f30d41d
update pip in build.yml
xinyu-intel Aug 3, 2019
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
2 changes: 1 addition & 1 deletion docs/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- pip:
- https://github.com/mli/mx-theme/tarball/0.3.1
- sphinx-gallery
- mxnet-cu92mkl==1.5.0b20190711
- mxnet-cu92mkl==1.6.0b20190802
# - guzzle_sphinx_theme
- recommonmark
- Image
Expand Down
2 changes: 1 addition & 1 deletion tests/py2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- tqdm
- pillow
- pip:
- mxnet-cu92==1.5.0b20190711
- mxnet-cu92mkl==1.6.0b20190802
- coverage-badge
- awscli
- nose-timer
Expand Down
2 changes: 1 addition & 1 deletion tests/py3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- tqdm
- pillow
- pip:
- mxnet-cu92==1.5.0b20190711
- mxnet-cu92mkl==1.6.0b20190802
- coverage-badge
- awscli
- nose-timer
Expand Down
9 changes: 4 additions & 5 deletions tests/unittests/test_model_zoo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from __future__ import print_function

import warnings
import unittest

import mxnet as mx
from common import try_gpu, with_cpu
Expand All @@ -31,8 +30,6 @@
def test_get_all_models():
names = gcv.model_zoo.get_model_list()
for name in names:
if 'int8' in name:
continue
kwargs = {}
if 'custom' in name:
kwargs['classes'] = ['a', 'b']
Expand Down Expand Up @@ -206,8 +203,10 @@ def test_yolo3_reset_class():
x = mx.random.uniform(shape=(1, 3, 512, 544), ctx=ctx) # allow non-squre and larger inputs
model_name = 'yolo3_darknet53_voc'
net = gcv.model_zoo.get_model(model_name, pretrained=True, ctx=ctx)
net.hybridize()
net.reset_class(["bus", "car", "bird"], reuse_weights=["bus", "car", "bird"])
net(x)
mx.nd.waitall()

# for GPU
ctx = mx.gpu(0)
Expand All @@ -216,8 +215,10 @@ def test_yolo3_reset_class():
except Exception:
return
net = gcv.model_zoo.get_model(model_name, pretrained=True, ctx=ctx)
net.hybridize()
net.reset_class(["bus", "car", "bird"])
net(x)
mx.nd.waitall()


def test_faster_rcnn_reset_class():
Expand Down Expand Up @@ -393,15 +394,13 @@ def test_mobilenet_sync_bn():
norm_kwargs={'num_devices': 2})
net.load_parameters(model_name + '.params')

@unittest.skip("temporarily disabled to fallback to non-mkl version")
@with_cpu(0)
def test_quantized_imagenet_models():
model_list = ['mobilenet1.0_int8', 'resnet50_v1_int8']
ctx = mx.context.current_context()
x = mx.random.uniform(shape=(1, 3, 224, 224), ctx=ctx)
_test_model_list(model_list, ctx, x)

@unittest.skip("temporarily disabled to fallback to non-mkl version")
@with_cpu(0)
def test_quantized_ssd_models():
model_list = ['ssd_300_vgg16_atrous_voc_int8', 'ssd_512_mobilenet1.0_voc_int8',
Expand Down