From 35c2f45eabf253619360ec5bab4dc205ceb1e28d Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Fri, 1 Apr 2022 04:22:05 +0900 Subject: [PATCH 1/3] Update Jenkinsfile to point to the new GPU image --- Jenkinsfile | 2 +- jenkins/Jenkinsfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fdcaa63fe2ae..f6a94697b5d9 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,7 +47,7 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> ci_lint = 'tlcpack/ci-lint:v0.69' -ci_gpu = 'tlcpack/ci-gpu:v0.82' +ci_gpu = 'tlcpack/ci-gpu:v0.83' ci_cpu = 'tlcpack/ci-cpu:v0.82' ci_wasm = 'tlcpack/ci-wasm:v0.72' ci_i386 = 'tlcpack/ci-i386:v0.75' diff --git a/jenkins/Jenkinsfile.j2 b/jenkins/Jenkinsfile.j2 index 688552e0fd9d..49b5c692a354 100644 --- a/jenkins/Jenkinsfile.j2 +++ b/jenkins/Jenkinsfile.j2 @@ -49,7 +49,7 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> ci_lint = 'tlcpack/ci-lint:v0.69' -ci_gpu = 'tlcpack/ci-gpu:v0.82' +ci_gpu = 'tlcpack/ci-gpu:v0.83' ci_cpu = 'tlcpack/ci-cpu:v0.82' ci_wasm = 'tlcpack/ci-wasm:v0.72' ci_i386 = 'tlcpack/ci-i386:v0.75' From 2da5ccf60e508c2cee0b0cae5597ff67da4f1b5f Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Thu, 31 Mar 2022 19:34:29 +0900 Subject: [PATCH 2/3] fix onnx test --- tests/python/frontend/onnx/test_forward.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python/frontend/onnx/test_forward.py b/tests/python/frontend/onnx/test_forward.py index 91775d27b2de..8805d4d79c27 100644 --- a/tests/python/frontend/onnx/test_forward.py +++ b/tests/python/frontend/onnx/test_forward.py @@ -2993,7 +2993,7 @@ def forward(self, input): torch.onnx.export(layer, dummy_input, file_name, export_params=True) onnx_model = onnx.load(file_name) - relay.frontend.from_onnx(onnx_model, {"0": input_size}) + relay.frontend.from_onnx(onnx_model, {"onnx::Reshape_0": input_size}) @tvm.testing.parametrize_targets From 02c9df9ee365e15051f1ae8a92ecc82937064a2e Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Thu, 31 Mar 2022 19:48:22 +0900 Subject: [PATCH 3/3] fixed keras tutorial --- gallery/how_to/compile_models/from_keras.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gallery/how_to/compile_models/from_keras.py b/gallery/how_to/compile_models/from_keras.py index 182e769b35b1..1db27799fe4c 100644 --- a/gallery/how_to/compile_models/from_keras.py +++ b/gallery/how_to/compile_models/from_keras.py @@ -39,6 +39,7 @@ import tvm.relay as relay from tvm.contrib.download import download_testdata import keras +import tensorflow as tf import numpy as np ###################################################################### @@ -65,7 +66,7 @@ weights_path = download_testdata(weights_url, weights_file, module="keras") -keras_resnet50 = keras.applications.resnet50.ResNet50( +keras_resnet50 = tf.keras.applications.resnet50.ResNet50( include_top=True, weights=None, input_shape=(224, 224, 3), classes=1000 ) keras_resnet50.load_weights(weights_path) @@ -76,7 +77,7 @@ # A single cat dominates the examples! from PIL import Image from matplotlib import pyplot as plt -from keras.applications.resnet50 import preprocess_input +from tensorflow.keras.applications.resnet50 import preprocess_input img_url = "https://github.com/dmlc/mxnet.js/blob/main/data/cat.png?raw=true" img_path = download_testdata(img_url, "cat.png", module="data")