Changed framework from dlsdk to openvino in AC configs, added depreca…

…tion warning (openvinotoolkit#3045) * Changed framework from dlsdk to openvino in AC configs, added deprecation warning * Updated framework in README and samples * Bump AC version
avsanjay · Feb 14, 2022 · bf766bd · bf766bd
1 parent e155912
commit bf766bd
Show file tree

Hide file tree

Showing 276 changed files with 301 additions and 297 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -214,7 +214,7 @@ This example uses validation configuration file for [DenseNet-121](models/public
 models:
   - name: densenet-121-tf
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: classification
 
     datasets:

diff --git a/models/intel/action-recognition-0001/accuracy-check.yml b/models/intel/action-recognition-0001/accuracy-check.yml
@@ -10,7 +10,7 @@ evaluations:
           adapter: classification
 
       launchers:
-        - framework: dlsdk
+        - framework: openvino
 
       datasets:
         - name: kinetics-400

diff --git a/models/intel/age-gender-recognition-retail-0013/accuracy-check.yml b/models/intel/age-gender-recognition-retail-0013/accuracy-check.yml
@@ -2,11 +2,11 @@ models:
   - name: age-gender-recognition-retail-0013
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: age_gender
           gender_out: prob
-          age_out: age_conv3
+          age_out: fc3_a
 
     datasets:
       - name: age_gender

diff --git a/models/intel/asl-recognition-0004/accuracy-check.yml b/models/intel/asl-recognition-0004/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: asl-recognition-0004
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: classification
         inputs:
           - type: INPUT

diff --git a/models/intel/bert-large-uncased-whole-word-masking-squad-0001/accuracy-check.yml b/models/intel/bert-large-uncased-whole-word-masking-squad-0001/accuracy-check.yml
@@ -1,7 +1,7 @@
 models:
   - name: bert-large-uncased-whole-word-masking-squad-0001
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: bert_question_answering
           start_token_logits_output: "output_s"

diff --git a/models/intel/bert-large-uncased-whole-word-masking-squad-emb-0001/accuracy-check.yml b/models/intel/bert-large-uncased-whole-word-masking-squad-emb-0001/accuracy-check.yml
@@ -1,7 +1,7 @@
 models:
   - name: bert-large-uncased-whole-word-masking-squad-emb-0001
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         allow_reshape_input: True
         adapter:
           type: bert_question_answering_embedding

diff --git a/models/intel/bert-large-uncased-whole-word-masking-squad-int8-0001/accuracy-check.yml b/models/intel/bert-large-uncased-whole-word-masking-squad-int8-0001/accuracy-check.yml
@@ -1,7 +1,7 @@
 models:
   - name: bert-large-uncased-whole-word-masking-squad-int8-0001
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: bert_question_answering
           start_token_logits_output: "output_s"

diff --git a/models/intel/bert-small-uncased-whole-word-masking-squad-0001/accuracy-check.yml b/models/intel/bert-small-uncased-whole-word-masking-squad-0001/accuracy-check.yml
@@ -1,7 +1,7 @@
 models:
   - name: bert-small-uncased-whole-word-masking-squad-0001
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: bert_question_answering
           start_token_logits_output: "output_s"

diff --git a/models/intel/bert-small-uncased-whole-word-masking-squad-0002/accuracy-check.yml b/models/intel/bert-small-uncased-whole-word-masking-squad-0002/accuracy-check.yml
@@ -1,7 +1,7 @@
 models:
   - name: bert-small-uncased-whole-word-masking-squad-0002
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: bert_question_answering
           start_token_logits_output: "output_s"

diff --git a/models/intel/bert-small-uncased-whole-word-masking-squad-emb-int8-0001/accuracy-check.yml b/models/intel/bert-small-uncased-whole-word-masking-squad-emb-int8-0001/accuracy-check.yml
@@ -1,7 +1,7 @@
 models:
   - name: bert-small-uncased-whole-word-masking-squad-emb-int8-0001
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         allow_reshape_input: True
         adapter:
           type: bert_question_answering_embedding

diff --git a/models/intel/bert-small-uncased-whole-word-masking-squad-int8-0002/accuracy-check.yml b/models/intel/bert-small-uncased-whole-word-masking-squad-int8-0002/accuracy-check.yml
@@ -1,7 +1,7 @@
 models:
   - name: bert-small-uncased-whole-word-masking-squad-int8-0002
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: bert_question_answering
           start_token_logits_output: "output_s"

diff --git a/models/intel/common-sign-language-0002/accuracy-check.yml b/models/intel/common-sign-language-0002/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: common-sign-language-0002
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: classification
         inputs:
           - type: INPUT

diff --git a/models/intel/driver-action-recognition-adas-0002/accuracy-check.yml b/models/intel/driver-action-recognition-adas-0002/accuracy-check.yml
@@ -10,7 +10,7 @@ evaluations:
           adapter: classification
 
       launchers:
-        - framework: dlsdk
+        - framework: openvino
 
       datasets:
         - name: driver_action_recognition_dataset

diff --git a/models/intel/emotions-recognition-retail-0003/accuracy-check.yml b/models/intel/emotions-recognition-retail-0003/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: emotions-recognition-retail-0003
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: classification
 
     datasets:

diff --git a/models/intel/face-detection-0200/accuracy-check.yml b/models/intel/face-detection-0200/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: face-detection-0200
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: ssd
 
     datasets:

diff --git a/models/intel/face-detection-0202/accuracy-check.yml b/models/intel/face-detection-0202/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: face-detection-0202
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: ssd
 
     datasets:

diff --git a/models/intel/face-detection-0204/accuracy-check.yml b/models/intel/face-detection-0204/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: face-detection-0204
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: ssd
 
     datasets:

diff --git a/models/intel/face-detection-0205/accuracy-check.yml b/models/intel/face-detection-0205/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: face-detection-0205
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: class_agnostic_detection
           scale: 0.00240384615

diff --git a/models/intel/face-detection-0206/accuracy-check.yml b/models/intel/face-detection-0206/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: face-detection-0206
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: class_agnostic_detection
           scale: 0.0015625

diff --git a/models/intel/face-detection-adas-0001/accuracy-check.yml b/models/intel/face-detection-adas-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: face-detection-adas-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: ssd
 
     datasets:

diff --git a/models/intel/face-detection-retail-0004/accuracy-check.yml b/models/intel/face-detection-retail-0004/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: face-detection-retail-0004
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: ssd
 
     datasets:

diff --git a/models/intel/face-detection-retail-0005/accuracy-check.yml b/models/intel/face-detection-retail-0005/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: face-detection-retail-0005
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: ssd
 
     datasets:

diff --git a/models/intel/face-reidentification-retail-0095/accuracy-check.yml b/models/intel/face-reidentification-retail-0095/accuracy-check.yml
@@ -1,7 +1,7 @@
 models:
   - name: face-reidentification-retail-0095
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: reid
 
     datasets:

diff --git a/models/intel/facial-landmarks-35-adas-0002/accuracy-check.yml b/models/intel/facial-landmarks-35-adas-0002/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: facial-landmarks-35-adas-0002
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: landmarks_regression
 
     datasets:

diff --git a/models/intel/facial-landmarks-98-detection-0001/accuracy-check.yml b/models/intel/facial-landmarks-98-detection-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: facial-landmarks-98-detection-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: facial_landmarks_detection
           output_blob: 3851

diff --git a/models/intel/faster-rcnn-resnet101-coco-sparse-60-0001/accuracy-check.yml b/models/intel/faster-rcnn-resnet101-coco-sparse-60-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: faster-rcnn-resnet101-coco-sparse-60-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: ssd
         inputs:

diff --git a/models/intel/formula-recognition-medium-scan-0001/accuracy-check.yml b/models/intel/formula-recognition-medium-scan-0001/accuracy-check.yml
@@ -8,7 +8,7 @@ evaluations:
       max_seq_len: '192'
 
       launchers:
-        - framework: dlsdk
+        - framework: openvino
 
       datasets:
         - name: im2latex_medium_photographed

diff --git a/models/intel/formula-recognition-polynomials-handwritten-0001/accuracy-check.yml b/models/intel/formula-recognition-polynomials-handwritten-0001/accuracy-check.yml
@@ -8,7 +8,7 @@ evaluations:
       max_seq_len: "192"
 
       launchers:
-        - framework: dlsdk
+        - framework: openvino
 
       datasets:
         - name: im2latex_polynomials_handwritten

diff --git a/models/intel/gaze-estimation-adas-0002/accuracy-check.yml b/models/intel/gaze-estimation-adas-0002/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: gaze-estimation-adas-0002
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         inputs:
           - name: left_eye_image
             type: INPUT

diff --git a/models/intel/handwritten-english-recognition-0001/accuracy-check.yml b/models/intel/handwritten-english-recognition-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: handwritten-english-recognition-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: ctc_greedy_search_decoder
           logits_output: output

diff --git a/models/intel/handwritten-japanese-recognition-0001/accuracy-check.yml b/models/intel/handwritten-japanese-recognition-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: handwritten-japanese-recognition-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: ctc_greedy_search_decoder
 
     datasets:

diff --git a/models/intel/handwritten-score-recognition-0003/accuracy-check.yml b/models/intel/handwritten-score-recognition-0003/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: handwritten-score-recognition-0003
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: beam_search_decoder
 
     datasets:

diff --git a/models/intel/handwritten-simplified-chinese-recognition-0001/accuracy-check.yml b/models/intel/handwritten-simplified-chinese-recognition-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: handwritten-simplified-chinese-recognition-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: ctc_greedy_search_decoder
 
     datasets:

diff --git a/models/intel/head-pose-estimation-adas-0001/accuracy-check.yml b/models/intel/head-pose-estimation-adas-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: head-pose-estimation-adas-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: head_pose
           angle_yaw: angle_y_fc

diff --git a/models/intel/horizontal-text-detection-0001/accuracy-check.yml b/models/intel/horizontal-text-detection-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: horizontal-text-detection-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter:
           type: class_agnostic_detection
           scale: 0.0014204

diff --git a/models/intel/human-pose-estimation-0001/accuracy-check.yml b/models/intel/human-pose-estimation-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: human-pose-estimation-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         allow_reshape_input: True
         adapter:
           type: human_pose_estimation

diff --git a/models/intel/human-pose-estimation-0005/accuracy-check.yml b/models/intel/human-pose-estimation-0005/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: human-pose-estimation-0005
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         allow_reshape_input: True
         adapter:
           type: human_pose_estimation_ae

diff --git a/models/intel/human-pose-estimation-0006/accuracy-check.yml b/models/intel/human-pose-estimation-0006/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: human-pose-estimation-0006
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         allow_reshape_input: True
         adapter:
           type: human_pose_estimation_ae

diff --git a/models/intel/human-pose-estimation-0007/accuracy-check.yml b/models/intel/human-pose-estimation-0007/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: human-pose-estimation-0007
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         allow_reshape_input: True
         adapter:
           type: human_pose_estimation_ae

diff --git a/models/intel/icnet-camvid-ava-0001/accuracy-check.yml b/models/intel/icnet-camvid-ava-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: icnet-camvid-ava-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: segmentation
     datasets:
       - name: CamVid

diff --git a/models/intel/icnet-camvid-ava-sparse-30-0001/accuracy-check.yml b/models/intel/icnet-camvid-ava-sparse-30-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: icnet-camvid-ava-sparse-30-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: segmentation
     datasets:
       - name: CamVid

diff --git a/models/intel/icnet-camvid-ava-sparse-60-0001/accuracy-check.yml b/models/intel/icnet-camvid-ava-sparse-60-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: icnet-camvid-ava-sparse-60-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: segmentation
     datasets:
       - name: CamVid

diff --git a/models/intel/image-retrieval-0001/accuracy-check.yml b/models/intel/image-retrieval-0001/accuracy-check.yml
@@ -2,7 +2,7 @@ models:
   - name: image-retrieval-0001
 
     launchers:
-      - framework: dlsdk
+      - framework: openvino
         adapter: reid
 
     datasets: