ci: Fix onnx_model_store resnet_v1 name issues (#8255)

Co-authored-by: Misha Chornyi <99709299+mc-nv@users.noreply.github.com>

Author: yinggeh

qa/L0_long_running_stress/scenarios.py

@@ -203,7 +203,7 @@ def __init__(
         # Add no validation models
         self.options_.append(
             PerfAnalyzerScenario.ModelOption(
-                "resnet_v1_50_def", 32, (1, 4, 1), queue_latency_range_us
+                "resnet_v1_50", 32, (1, 4, 1), queue_latency_range_us
             )
         )
         for trial in sequence_trials:
@@ -334,7 +334,7 @@ def run(self, client_metadata):
 class ResNetScenario(Scenario):
     def __init__(self, name, batch_size=32, verbose=False, out_stream=sys.stdout):
         super().__init__(name, [], verbose, out_stream)
-        self.model_name_ = "resnet_v1_50_def"
+        self.model_name_ = "resnet_v1_50"
         self.batch_size_ = batch_size
 
         img = self.preprocess("../images/vulture.jpeg")
@@ -353,7 +353,7 @@ def preprocess(self, filename):
         return scaled
 
     def postprocess(self, results):
-        output_array = results.as_numpy("resnet_v1_50/predictions/Softmax")
+        output_array = results.as_numpy("resnet_v1_50/predictions/Softmax:0")
         if len(output_array) != self.batch_size_:
             raise Exception(
                 "expected {} results, got {}".format(
@@ -377,12 +377,12 @@ def postprocess(self, results):
     def run(self, client_metadata):
         triton_client = client_metadata[0]
 
-        inputs = [grpcclient.InferInput("input", self.image_data_.shape, "FP32")]
+        inputs = [grpcclient.InferInput("input:0", self.image_data_.shape, "FP32")]
         inputs[0].set_data_from_numpy(self.image_data_)
 
         outputs = [
             grpcclient.InferRequestedOutput(
-                "resnet_v1_50/predictions/Softmax", class_count=1
+                "resnet_v1_50/predictions/Softmax:0", class_count=1
             )
         ]
         res = triton_client.infer(self.model_name_, inputs, outputs=outputs)

qa/L0_long_running_stress/test.sh

@@ -130,9 +130,8 @@ cp -r ../custom_models/custom_zero_1_float32 $MODEL_DIR/custom_zero_1_float32 &&
         echo "{ key: \"execute_delay_ms\"; value: { string_value: \"10000\" }}" >> config.pbtxt && \
         echo "]" >> config.pbtxt)
 
-cp -r $DATADIR/onnx_model_store/resnet_v1_50 $MODEL_DIR/resnet_v1_50_def && \
-  (cd $MODEL_DIR/resnet_v1_50_def && \
-    sed -i 's/^name: "resnet_v1_50"/name: "resnet_v1_50_def"/' config.pbtxt && \
+cp -r $DATADIR/onnx_model_store/resnet_v1_50 $MODEL_DIR/. && \
+  (cd $MODEL_DIR/resnet_v1_50 && \
     echo "optimization { }" >> config.pbtxt)
 
 SERVER_ARGS="--model-repository=`pwd`/$MODEL_DIR"