From 7fb956ceb0a405c39c5bc754d34c17a3e1b9f26f Mon Sep 17 00:00:00 2001
From: Trevor Morris <trevmorr@amazon.com>
Date: Mon, 9 Nov 2020 15:53:45 -0800
Subject: [PATCH] Update test models for DLR 1.5, Run C++ tests in CI after CPU
 build (#279)

* Run C++ tests after CPU build

* Update RelayVM model for DLR 1.5

* Update data transform test models for TVM 1.5

* Update pipeline skl xgb test for DLR 1.5
---
 CMakeLists.txt                         | 18 +++++++++---------
 Jenkinsfile                            |  1 +
 tests/cpp/dlr_pipeline_skl_xgb_test.cc |  4 ----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01ad7c6c5..14c763f0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -424,15 +424,15 @@ if(NOT(AAR_BUILD))
     file(REMOVE /tmp/xgboost_test.tar.gz)
   endif()
 
-  set(RELAYVM_MODEL ssd_mobilenet_v1_ppn_shared_box_predictor_300x300_coco14_sync_2018_07_03-ml_m4.tar.gz)
+  set(RELAYVM_MODEL ssd_mobilenet_v1_ppn_shared_box_predictor_300x300_coco14_sync_2018_07_03-LINUX_X86_64.tar.gz)
   set(RELAYVM_MODEL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ssd_mobilenet_v1)
   if(NOT IS_DIRECTORY ${RELAYVM_MODEL_DIR})
     file(MAKE_DIRECTORY ${RELAYVM_MODEL_DIR})
     download_file(
-      https://neo-ai-dlr-test-artifacts.s3-us-west-2.amazonaws.com/compiled-models/release-1.4.0/${RELAYVM_MODEL}
+      https://neo-ai-dlr-test-artifacts.s3-us-west-2.amazonaws.com/compiled-models/release-1.5.0/${RELAYVM_MODEL}
       /tmp/${RELAYVM_MODEL}
       SHA1
-      dae8551b9e099059aa59d6974e63c20026632342
+      49ddd9e815c6cc14ef0e9a594c8c2d0d129e5e91
     )
     # this is OS-agnostic
     execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf /tmp/${RELAYVM_MODEL}
@@ -445,10 +445,10 @@ if(NOT(AAR_BUILD))
   if(NOT IS_DIRECTORY ${AUTOML_MODEL_DIR})
     file(MAKE_DIRECTORY ${AUTOML_MODEL_DIR})
     download_file(
-      https://neo-ai-dlr-test-artifacts.s3-us-west-2.amazonaws.com/compiled-models/release-1.4.0/${AUTOML_MODEL}
+      https://neo-ai-dlr-test-artifacts.s3-us-west-2.amazonaws.com/compiled-models/release-1.5.0/${AUTOML_MODEL}
       /tmp/${AUTOML_MODEL}
       SHA1
-      6d0fdda6b3d5040507ac321adb69cd644ed39f66
+      a17df0b2d980051fb39a72dc61265b97ea0e4639
     )
     # this is OS-agnostic
     execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf /tmp/${AUTOML_MODEL}
@@ -475,10 +475,10 @@ if(NOT(AAR_BUILD))
   if(NOT IS_DIRECTORY ${PIPELINE_MODEL2})
     file(MAKE_DIRECTORY ${PIPELINE_MODEL2})
     download_file(
-      https://neo-ai-dlr-test-artifacts.s3-us-west-2.amazonaws.com/compiled-models/pipeline_model2-LINUX_X86_64.tar.gz
+      https://neo-ai-dlr-test-artifacts.s3-us-west-2.amazonaws.com/compiled-models/release-1.5.0/pipeline_model2-LINUX_X86_64.tar.gz
       /tmp/pipeline_model2-LINUX_X86_64.tar.gz
       SHA1
-      94e76f23ccc8d3beb29e620988ae5d02e870bedc
+      4c480e66f243db9b0fdb5528babb606091eabaad
     )
     # this is OS-agnostic
     execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf /tmp/pipeline_model2-LINUX_X86_64.tar.gz
@@ -491,10 +491,10 @@ if(NOT(AAR_BUILD))
   if(NOT IS_DIRECTORY ${INVERSELABEL_MODEL_DIR})
     file(MAKE_DIRECTORY ${INVERSELABEL_MODEL_DIR})
     download_file(
-      https://neo-ai-dlr-test-artifacts.s3-us-west-2.amazonaws.com/compiled-models/release-1.4.0/${INVERSELABEL_MODEL}
+      https://neo-ai-dlr-test-artifacts.s3-us-west-2.amazonaws.com/compiled-models/release-1.5.0/${INVERSELABEL_MODEL}
       /tmp/${INVERSELABEL_MODEL}
       SHA1
-      3343b54f1290fcbbccae80c4f03c1b1d9fb0145c
+      055f9606c97d781f0468ad839ff42b3d41474315
     )
     # this is OS-agnostic
     execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf /tmp/${INVERSELABEL_MODEL}
diff --git a/Jenkinsfile b/Jenkinsfile
index 1b3807c08..7bbe17bc7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -75,6 +75,7 @@ pipeline {
             mkdir -p build
             cd build
             cmake .. && make -j16
+            make test
             cd ..
             tests/ci_build/create_wheel.sh manylinux1_x86_64
             """
diff --git a/tests/cpp/dlr_pipeline_skl_xgb_test.cc b/tests/cpp/dlr_pipeline_skl_xgb_test.cc
index 931a96c61..83420f8b3 100644
--- a/tests/cpp/dlr_pipeline_skl_xgb_test.cc
+++ b/tests/cpp/dlr_pipeline_skl_xgb_test.cc
@@ -55,10 +55,6 @@ TEST(PipelineTest, TestSetDLRInput) {
   int ndim = 1;
   const char* input_name = "input";
   EXPECT_EQ(SetDLRInput(&model, input_name, shape, in_data.c_str(), ndim), 0);
-  std::vector<float> exp_data = {0.5, 0.6, 0.55, 0.66, 0.73, 0.83};
-  std::vector<float> in_data2(6);
-  EXPECT_EQ(GetDLRInput(&model, input_name, in_data2.data()), 0);
-  EXPECT_EQ(exp_data, in_data2);
   DeleteDLRModel(&model);
 }