amend file head description and fix deeplabv3 bug

model_zoo/official/cv/alexnet/postprocess.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/deeplabv3/ascend310_infer/inc/utils.h

@@ -25,6 +25,7 @@
 #include "include/api/types.h"
 
 std::vector<std::string> GetAllFiles(std::string_view dirName);
+std::vector<std::string> GetImagesById(const std::string &idFile, const std::string &dirName);
 DIR *OpenDir(std::string_view dirName);
 std::string RealPath(std::string_view path);
 mindspore::MSTensor ReadFileToTensor(const std::string &file);

model_zoo/official/cv/deeplabv3/ascend310_infer/src/main.cc

@@ -51,6 +51,7 @@ using mindspore::dataset::vision::Decode;
 
 
 DEFINE_string(mindir_path, "", "mindir path");
+DEFINE_string(image_list, "", "image list");
 DEFINE_string(dataset_path, ".", "dataset path");
 DEFINE_string(fusion_switch_path, ".", "fusion switch path");
 DEFINE_int32(device_id, 0, "device id");
@@ -149,7 +150,7 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-  auto all_files = GetAllFiles(FLAGS_dataset_path);
+  auto all_files = GetImagesById(FLAGS_image_list, FLAGS_dataset_path);
   if (all_files.empty()) {
   std::cout << "ERROR: no input data." << std::endl;
   return 1;

model_zoo/official/cv/deeplabv3/ascend310_infer/src/utils.cc

@@ -43,6 +43,25 @@ std::vector<std::string> GetAllFiles(std::string_view dirName) {
   return res;
 }
 
+std::vector<std::string> GetImagesById(const std::string &idFile, const std::string &dirName) {
+    std::ifstream readFile(idFile);
+    std::string line;
+    std::vector<std::string> result;
+
+    if (!readFile.is_open()) {
+        std::cout << "can not open image id txt file" << std::endl;
+        return result;
+    }
+
+    while (getline(readFile, line)) {
+        std::size_t pos = line.find(" ");
+        std::string id = line.substr(0, pos);
+        result.emplace_back(dirName + "/" + id);
+    }
+
+    return result;
+}
+
 int WriteResult(const std::string& imageFile, const std::vector<MSTensor> &outputs) {
   std::string homePath = "./result_Files";
   for (size_t i = 0; i < outputs.size(); ++i) {

model_zoo/official/cv/deeplabv3/postprocess.py

@@ -16,104 +16,57 @@
 import os
 import argparse
 import numpy as np
+from PIL import Image
 import cv2
 
-from eval import cal_hist, pre_process
+parser = argparse.ArgumentParser(description="deeplabv3 accuracy calculation")
+parser.add_argument('--data_root', type=str, default='', help='root path of val data')
+parser.add_argument('--data_lst', type=str, default='', help='list of val data')
+parser.add_argument('--crop_size', type=int, default=513, help='crop size')
+parser.add_argument('--num_classes', type=int, default=21, help='number of classes')
+parser.add_argument('--result_path', type=str, default='./result_Files', help='result Files path')
+args, _ = parser.parse_known_args()
 
-def parse_args():
+def get_img_size(file_name):
-    parser = argparse.ArgumentParser(description="deeplabv3 accuracy calculation")
+    img = Image.open(file_name)
-    parser.add_argument('--data_root', type=str, default='', help='root path of val data')
+    return img.size
-    parser.add_argument('--data_lst', type=str, default='', help='list of val data')
-    parser.add_argument('--batch_size', type=int, default=1, help='batch size')
-    parser.add_argument('--crop_size', type=int, default=513, help='crop size')
-    parser.add_argument('--scales', type=float, action='append', help='scales of evaluation')
-    parser.add_argument('--flip', action='store_true', help='perform left-right flip')
-    parser.add_argument('--ignore_label', type=int, default=255, help='ignore label')
-    parser.add_argument('--num_classes', type=int, default=21, help='number of classes')
-    parser.add_argument('--result_path', type=str, default='./result_Files', help='result Files path')
-    args, _ = parser.parse_known_args()
-    return args
 
-def eval_batch(args, result_file, img_lst, crop_size=513, flip=True):
+def get_resized_size(org_h, org_w, long_size=513):
-    result_lst = []
+    if org_h > org_w:
-    batch_size = len(img_lst)
+        new_h = long_size
-    batch_img = np.zeros((args.batch_size, 3, crop_size, crop_size), dtype=np.float32)
+        new_w = int(1.0 * long_size * org_w / org_h)
-    resize_hw = []
+    else:
-    for l in range(batch_size):
+        new_w = long_size
-        img_ = img_lst[l]
+        new_h = int(1.0 * long_size * org_h / org_w)
-        img_, resize_h, resize_w = pre_process(args, img_, crop_size)
-        batch_img[l] = img_
-        resize_hw.append([resize_h, resize_w])
 
-    batch_img = np.ascontiguousarray(batch_img)
+    return new_h, new_w
-    net_out = np.fromfile(result_file, np.float32).reshape(args.batch_size, args.num_classes, crop_size, crop_size)
-
-    for bs in range(batch_size):
-        probs_ = net_out[bs][:, :resize_hw[bs][0], :resize_hw[bs][1]].transpose((1, 2, 0))
-        ori_h, ori_w = img_lst[bs].shape[0], img_lst[bs].shape[1]
-        probs_ = cv2.resize(probs_, (ori_w, ori_h))
-        result_lst.append(probs_)
-
-    return result_lst
-
-
-def eval_batch_scales(args, eval_net, img_lst, scales,
-                      base_crop_size=513, flip=True):
-    sizes_ = [int((base_crop_size - 1) * sc) + 1 for sc in scales]
-    probs_lst = eval_batch(args, eval_net, img_lst, crop_size=sizes_[0], flip=flip)
-    print(sizes_)
-    for crop_size_ in sizes_[1:]:
-        probs_lst_tmp = eval_batch(args, eval_net, img_lst, crop_size=crop_size_, flip=flip)
-        for pl, _ in enumerate(probs_lst):
-            probs_lst[pl] += probs_lst_tmp[pl]
-
-    result_msk = []
-    for i in probs_lst:
-        result_msk.append(i.argmax(axis=2))
-    return result_msk
 
+def cal_hist(a, b, n):
+    k = (a >= 0) & (a < n)
+    return np.bincount(n * a[k].astype(np.int32) + b[k], minlength=n ** 2).reshape(n, n)
 
 def acc_cal():
-    args = parse_args()
+    hist = np.zeros((args.num_classes, args.num_classes))
-    args.image_mean = [103.53, 116.28, 123.675]
-    args.image_std = [57.375, 57.120, 58.395]
-    # data list
     with open(args.data_lst) as f:
         img_lst = f.readlines()
-    # evaluate
+
-    hist = np.zeros((args.num_classes, args.num_classes))
+    for line in enumerate(img_lst):
-    batch_img_lst = []
+        img_path, msk_path = line[1].strip().split(' ')
-    batch_msk_lst = []
+        img_file_path = os.path.join(args.data_root, img_path)
-    bi = 0
+        org_width, org_height = get_img_size(img_file_path)
-    image_num = 0
+        resize_h, resize_w = get_resized_size(org_height, org_width)
-    for i, line in enumerate(img_lst):
+
-        img_path, msk_path = line.strip().split(' ')
         result_file = os.path.join(args.result_path, os.path.basename(img_path).split('.jpg')[0] + '_0.bin')
-        img_path = os.path.join(args.data_root, img_path)
+        net_out = np.fromfile(result_file, np.float32).reshape(args.num_classes, args.crop_size, args.crop_size)
+        probs_ = net_out[:, :resize_h, :resize_w].transpose((1, 2, 0))
+        probs_ = cv2.resize(probs_, (org_width, org_height))
+
+        result_msk = probs_.argmax(axis=2)
+
         msk_path = os.path.join(args.data_root, msk_path)
-        img_ = cv2.imread(img_path)
+        mask = cv2.imread(msk_path, cv2.IMREAD_GRAYSCALE)
-        msk_ = cv2.imread(msk_path, cv2.IMREAD_GRAYSCALE)
-        batch_img_lst.append(img_)
-        batch_msk_lst.append(msk_)
-        bi += 1
-        if bi == args.batch_size:
-            batch_res = eval_batch_scales(args, result_file, batch_img_lst, scales=args.scales,
-                                          base_crop_size=args.crop_size, flip=args.flip)
-            for mi in range(args.batch_size):
-                hist += cal_hist(batch_msk_lst[mi].flatten(), batch_res[mi].flatten(), args.num_classes)
 
-            bi = 0
+        hist += cal_hist(mask.flatten(), result_msk.flatten(), args.num_classes)
-            batch_img_lst = []
-            batch_msk_lst = []
-            print('processed {} images'.format(i+1))
-        image_num = i
-
-    if bi > 0:
-        batch_res = eval_batch_scales(args, result_file, batch_img_lst, scales=args.scales,
-                                      base_crop_size=args.crop_size, flip=args.flip)
-        for mi in range(bi):
-            hist += cal_hist(batch_msk_lst[mi].flatten(), batch_res[mi].flatten(), args.num_classes)
-        print('processed {} images'.format(image_num + 1))
 
     print(hist)
     iu = np.diag(hist) / (hist.sum(1) + hist.sum(0) - np.diag(hist))

model_zoo/official/cv/deeplabv3/scripts/run_infer_310.sh

@@ -75,7 +75,7 @@ function infer()
     fi
     mkdir result_Files
     mkdir time_Result
-    ../ascend310_infer/out/main --mindir_path=$model --dataset_path=$data_path --device_id=$device_id --fusion_switch_path=../ascend310_infer/fusion_switch.cfg &> infer.log
+    ../ascend310_infer/out/main --mindir_path=$model --dataset_path=$data_root --image_list=$data_list_path --device_id=$device_id --fusion_switch_path=../ascend310_infer/fusion_switch.cfg &> infer.log
 }
 
 function cal_acc()

model_zoo/official/cv/dpn/postprocess.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/mobilenetv1/postprocess.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/resnet152/postprocess.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/resnext50/create_imagenet2012_label.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/resnext50/postprocess.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/unet/scripts/run_standalone_eval_gpu.sh

@@ -7,7 +7,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/unet/scripts/run_standalone_train_gpu.sh

@@ -7,7 +7,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/unet3d/eval.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/unet3d/src/loss.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/unet3d/src/unet3d_model.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/unet3d/src/unet3d_parts.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/unet3d/src/utils.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/unet3d/train.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/cv/vgg16/postprocess.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/official/recommend/naml/postprocess.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/research/cv/retinanet_resnet101/eval.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/research/cv/retinanet_resnet152/eval.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/research/cv/ssd_mobilenetV2/eval.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/research/cv/ssd_mobilenetV2/train.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/research/cv/ssd_mobilenetV2_FPNlite/eval.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and

model_zoo/research/cv/ssd_mobilenetV2_FPNlite/train.py

@@ -6,7 +6,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# less required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and