diff --git a/PyTorch/contrib/cv/others/ADNet/test.py b/PyTorch/contrib/cv/others/ADNet/test.py index 9dc6d4283947a683c6a9958a82aaa53c348f0d7a..ec765c266cf4b4542ab94d39a252304589835922 100644 --- a/PyTorch/contrib/cv/others/ADNet/test.py +++ b/PyTorch/contrib/cv/others/ADNet/test.py @@ -24,7 +24,7 @@ from models import ADNet from utils import * from collections import OrderedDict import torch.distributed as dist -if torch.__version__ >= '1.8.1': +if torch.__version__ >= '1.8': import torch_npu parser = argparse.ArgumentParser(description="ADNet_Test") diff --git a/PyTorch/contrib/cv/others/ADNet/train.py b/PyTorch/contrib/cv/others/ADNet/train.py index aa9feb2b96a916d942eb665cd04ca865705264f6..c67ca1d4c0ce136f73be8b07fdca0b78e89f9117 100644 --- a/PyTorch/contrib/cv/others/ADNet/train.py +++ b/PyTorch/contrib/cv/others/ADNet/train.py @@ -31,7 +31,7 @@ from models import ADNet from dataset import prepare_data, Dataset from collections import OrderedDict from utils import * -if torch.__version__ >= '1.8.1': +if torch.__version__ >= '1.8': import torch_npu parser = argparse.ArgumentParser(description="DnCNN") diff --git a/PyTorch/contrib/cv/others/GAN_Pytorch/main.py b/PyTorch/contrib/cv/others/GAN_Pytorch/main.py index 456824a1dfede5863828d300b175fed09e0f878d..3b1a36b70be4fd30494961056d53d998b46d8cc4 100644 --- a/PyTorch/contrib/cv/others/GAN_Pytorch/main.py +++ b/PyTorch/contrib/cv/others/GAN_Pytorch/main.py @@ -13,7 +13,7 @@ # limitations under the License. # ============================================================================ import torch -if torch.version>="1.8.0": +if torch.version>="1.8": try: import torch_npu except: diff --git a/PyTorch/contrib/cv/others/SRGAN/test_benchmark.py b/PyTorch/contrib/cv/others/SRGAN/test_benchmark.py index 66e1ea9f6cc8ecc9d9cad08bfb5f54a876c3bca8..d03ca4949a06dfe29f1ac8d3ba80c0075de8da4b 100644 --- a/PyTorch/contrib/cv/others/SRGAN/test_benchmark.py +++ b/PyTorch/contrib/cv/others/SRGAN/test_benchmark.py @@ -19,7 +19,7 @@ from math import log10 import numpy as np import torch -if torch.__version__>= "1.8.1": +if torch.__version__>= "1.8": print("import torch_npu") import torch_npu import torchvision.utils as utils diff --git a/PyTorch/contrib/cv/others/SRGAN/train1p.py b/PyTorch/contrib/cv/others/SRGAN/train1p.py index 5dd49122ffd6130bda1694b0f37ec4eeda772800..b7bcb51bc2bc5dfbbe5f1c475fde673881128afc 100644 --- a/PyTorch/contrib/cv/others/SRGAN/train1p.py +++ b/PyTorch/contrib/cv/others/SRGAN/train1p.py @@ -18,7 +18,7 @@ import os from math import log10 import time import torch -if torch.__version__>= "1.8.1": +if torch.__version__>= "1.8": print("import torch_npu") import torch_npu diff --git a/PyTorch/contrib/cv/others/SRGAN/train8p.py b/PyTorch/contrib/cv/others/SRGAN/train8p.py index 123dd647e964775788acd6bd9dbe929cd4bce87c..7e90aecf3395119b339f1d76595473f1462bfb53 100644 --- a/PyTorch/contrib/cv/others/SRGAN/train8p.py +++ b/PyTorch/contrib/cv/others/SRGAN/train8p.py @@ -23,7 +23,7 @@ import tempfile import math import torch -if torch.__version__>= "1.8.1": +if torch.__version__>= "1.8": #print("import torch_npu") import torch_npu import torch.nn.parallel diff --git a/PyTorch/contrib/cv/others/Srcnn_x2_for_Pytorch/train.py b/PyTorch/contrib/cv/others/Srcnn_x2_for_Pytorch/train.py index a9c89e5b3f3e3eb1cd66d306e4ba8307f86932fa..bb53ee94234ad4ae2610cb39ec91d12ec8ad5084 100644 --- a/PyTorch/contrib/cv/others/Srcnn_x2_for_Pytorch/train.py +++ b/PyTorch/contrib/cv/others/Srcnn_x2_for_Pytorch/train.py @@ -27,7 +27,7 @@ import torch.backends.cudnn as cudnn from torch.utils.data.dataloader import DataLoader from skimage.metrics import peak_signal_noise_ratio -if torch.__version__ >= '1.8.1': +if torch.__version__ >= '1.8': import torch_npu import torch.npu import random diff --git a/PyTorch/contrib/cv/others/Super-Resolution_CNN_ID3003_for_Pytorch/train.py b/PyTorch/contrib/cv/others/Super-Resolution_CNN_ID3003_for_Pytorch/train.py index 019b11f3d9acbd46affb98f84f1b5ee255d63b4d..5b6f113c62c45dea5ece3bd18e941cecd47c2757 100644 --- a/PyTorch/contrib/cv/others/Super-Resolution_CNN_ID3003_for_Pytorch/train.py +++ b/PyTorch/contrib/cv/others/Super-Resolution_CNN_ID3003_for_Pytorch/train.py @@ -41,8 +41,8 @@ import os import copy import torch -# if torch.__version__>= '1.8.1': -# import torch_npu +if torch.__version__>= '1.8': + import torch_npu from torch import nn import torch.optim as optim import torch.backends.cudnn as cudnn diff --git a/PyTorch/contrib/cv/others/edsr_x2/main.py b/PyTorch/contrib/cv/others/edsr_x2/main.py index 2524d20a0ac868b17078b175fbb9c4109bc1f47f..7d0b138f173c6692eb83c0de99ac8a3b573fac31 100644 --- a/PyTorch/contrib/cv/others/edsr_x2/main.py +++ b/PyTorch/contrib/cv/others/edsr_x2/main.py @@ -30,7 +30,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ============================================================================ import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import data import loss diff --git a/PyTorch/contrib/cv/others/edsr_x2/main_8p.py b/PyTorch/contrib/cv/others/edsr_x2/main_8p.py index e1b0a2063f2a9f4f31f12ff0a505d97a980802cf..93d45a8f67cbe000023bf6d163a3c6d46c8b0bac 100644 --- a/PyTorch/contrib/cv/others/edsr_x2/main_8p.py +++ b/PyTorch/contrib/cv/others/edsr_x2/main_8p.py @@ -37,7 +37,7 @@ from apex import amp from tqdm import tqdm import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu from torch import nn import torch.multiprocessing as mp diff --git a/PyTorch/contrib/cv/pose_estimation/Lightweight_OpenPose/train.py b/PyTorch/contrib/cv/pose_estimation/Lightweight_OpenPose/train.py index ff124c2acfe04b8177d46c95c7287b6f8d6eb43f..d9c9173cbfc7727979187d5fdc998166d51dcd84 100644 --- a/PyTorch/contrib/cv/pose_estimation/Lightweight_OpenPose/train.py +++ b/PyTorch/contrib/cv/pose_estimation/Lightweight_OpenPose/train.py @@ -18,7 +18,7 @@ import shutil import time import cv2 import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import torch.optim from torch.utils.data import DataLoader diff --git a/PyTorch/contrib/cv/semantic_segmentation/PraNet/Test.py b/PyTorch/contrib/cv/semantic_segmentation/PraNet/Test.py index bda6648a159c478ee7c349bc4cf7be0d2b3c3e90..b01acef486a85cdb9b907e1957a29f3a5848866a 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/PraNet/Test.py +++ b/PyTorch/contrib/cv/semantic_segmentation/PraNet/Test.py @@ -13,7 +13,7 @@ # limitations under the License. # ============================================================================ import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import torch.nn.functional as F import numpy as np diff --git a/PyTorch/contrib/cv/semantic_segmentation/PraNet/Train.py b/PyTorch/contrib/cv/semantic_segmentation/PraNet/Train.py index 22b3584f8e018c0f9c3a8b1f5cf918bfaae0eca8..db50d47452f53561b245f1d00fe33a365548d7f4 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/PraNet/Train.py +++ b/PyTorch/contrib/cv/semantic_segmentation/PraNet/Train.py @@ -13,7 +13,7 @@ # limitations under the License. # ============================================================================ import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu from torch.autograd import Variable import os diff --git a/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/PraNet_Res2Net.py b/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/PraNet_Res2Net.py index bd17035fa834e6fd3b550f2232746a256aedebde..7fcfcc6a937db5230aa7f9fdfc50c6e57db2b8b8 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/PraNet_Res2Net.py +++ b/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/PraNet_Res2Net.py @@ -16,7 +16,7 @@ import torch import torch.nn as nn import torch.nn.functional as F from .Res2Net_v1b import res2net50_v1b_26w_4s -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu class BasicConv2d(nn.Module): diff --git a/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/PraNet_ResNet.py b/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/PraNet_ResNet.py index 8f0723c6c48aacc44240993d40f0a3ad5ba25116..be55533bfefe1233c1d0bc910e471ebc3a8dd82d 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/PraNet_ResNet.py +++ b/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/PraNet_ResNet.py @@ -18,7 +18,7 @@ import torchvision.models as models import torch.nn.functional as F from .ResNet import ResNet import math -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu class BasicConv2d(nn.Module): diff --git a/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/Res2Net_v1b.py b/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/Res2Net_v1b.py index 543bf1eb5b17e05e43cd094d75b0eb10557959c1..86ec6296ae13f5f6ffcba2a6459a1e8a59580b95 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/Res2Net_v1b.py +++ b/PyTorch/contrib/cv/semantic_segmentation/PraNet/lib/Res2Net_v1b.py @@ -17,7 +17,7 @@ import math import torch.utils.model_zoo as model_zoo import torch import torch.nn.functional as F -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu __all__ = ['Res2Net', 'res2net50_v1b', 'res2net101_v1b', 'res2net50_v1b_26w_4s'] diff --git a/PyTorch/contrib/cv/semantic_segmentation/PraNet/utils/utils.py b/PyTorch/contrib/cv/semantic_segmentation/PraNet/utils/utils.py index f019b6ab74146c97a5b595f3b2de7cb3b4eebd6f..4abacc79e57831ba9da737ed58ddee9eb997990b 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/PraNet/utils/utils.py +++ b/PyTorch/contrib/cv/semantic_segmentation/PraNet/utils/utils.py @@ -16,7 +16,7 @@ import torch import numpy as np from thop import profile from thop import clever_format -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu def clip_gradient(optimizer, grad_clip): diff --git a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/models/refinenet.py b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/models/refinenet.py index ed42ccbde9a4d6f6f8ffbc4a129c5bd668b4e256..0316856d994ef8a2b8df9dac0b172d8de6e29436 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/models/refinenet.py +++ b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/models/refinenet.py @@ -15,7 +15,7 @@ import torch.nn as nn import torch.nn.functional as F import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import numpy as np diff --git a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/data.py b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/data.py index fce5339eb68e84ee5fa87314433a573050d2a2fe..a9c33ebb6363f248c9393beac9255b92a975c86b 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/data.py +++ b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/data.py @@ -15,7 +15,7 @@ import cv2 import numpy as np import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import densetorch as dt from albumentations import Compose diff --git a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/load_dataset.py b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/load_dataset.py index 1cbed9c2237f21ad9d74a08aa4ec0d7c551332fd..4e8e33582ea14a991986a7b89bf893e24850c0e9 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/load_dataset.py +++ b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/load_dataset.py @@ -24,7 +24,7 @@ import numpy as np # pytorch libs import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import torch.nn as nn import torch.nn.functional as F diff --git a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/optimisers.py b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/optimisers.py index ffd4e4179c745a62846a7e9a3121bf480cbd84ca..d5b059744403e5ab2c7d3c9a2247ddeebc10a552 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/optimisers.py +++ b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/optimisers.py @@ -14,7 +14,7 @@ # ============================================================================ import numpy as np import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import densetorch as dt diff --git a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/train.py b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/train.py index dfea0058b7993d12bc7e43d2055f0ee1a988dfff..dbbb411b54c3d3a595ed8c0369cd66bc8d8c83a7 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/train.py +++ b/PyTorch/contrib/cv/semantic_segmentation/RefineNet/src/train.py @@ -24,7 +24,7 @@ import numpy as np # pytorch libs import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import ctypes libgcc_s = ctypes.CDLL("libgcc_s.so.1") diff --git a/PyTorch/contrib/cv/semantic_segmentation/Ultra-Fast-Lane-Detection/test.py b/PyTorch/contrib/cv/semantic_segmentation/Ultra-Fast-Lane-Detection/test.py index 7e0b9815c8b34b175a7641089797a318ace76f17..fb7518cef630eb13b9842f477fbd1bdd8abaf8fd 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/Ultra-Fast-Lane-Detection/test.py +++ b/PyTorch/contrib/cv/semantic_segmentation/Ultra-Fast-Lane-Detection/test.py @@ -14,7 +14,7 @@ import sklearn # sklearn一定要在torch前面import否则会报错 import torch, os -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu from model.model import parsingNet from utils.common import merge_config diff --git a/PyTorch/contrib/cv/semantic_segmentation/Ultra-Fast-Lane-Detection/train.py b/PyTorch/contrib/cv/semantic_segmentation/Ultra-Fast-Lane-Detection/train.py index db365cccf43d516cbf1b0ad1712d0eb6fc0ca701..f31511bf762d6f374d48c17bf66e3fcb5612b2fd 100644 --- a/PyTorch/contrib/cv/semantic_segmentation/Ultra-Fast-Lane-Detection/train.py +++ b/PyTorch/contrib/cv/semantic_segmentation/Ultra-Fast-Lane-Detection/train.py @@ -15,7 +15,7 @@ print("+-" * 50) import torch, os, datetime -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import numpy as np diff --git a/PyTorch/contrib/nlp/TextCNN/run.py b/PyTorch/contrib/nlp/TextCNN/run.py index b3166f3623489d7222a61fab89ba474741bc8d6e..797b3b3206b21b56bf97505375db3c854566d48e 100644 --- a/PyTorch/contrib/nlp/TextCNN/run.py +++ b/PyTorch/contrib/nlp/TextCNN/run.py @@ -23,7 +23,7 @@ import os from apex import amp import apex -if torch.__version__ >= '1.8.1': +if torch.__version__ >= '1.8': import torch_npu parser = argparse.ArgumentParser(description='Chinese Text Classification') diff --git a/PyTorch/contrib/nlp/albert/run_classifier.py b/PyTorch/contrib/nlp/albert/run_classifier.py index 86d24e4f7edefded5b36398f4ccd414d071c6c87..426d7206021a858aef775c0ab10d28d56a752637 100644 --- a/PyTorch/contrib/nlp/albert/run_classifier.py +++ b/PyTorch/contrib/nlp/albert/run_classifier.py @@ -24,7 +24,7 @@ import glob import numpy as np import apex import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu from torch.utils.data import DataLoader, RandomSampler, SequentialSampler, TensorDataset from torch.utils.data.distributed import DistributedSampler diff --git a/PyTorch/contrib/nlp/roberta/fairseq/distributed/utils.py b/PyTorch/contrib/nlp/roberta/fairseq/distributed/utils.py index 3fb95ed686234629be98d4e1c777e579bf9298f6..1a14168095bbcff9560cc2a847d1e0832c4a34e3 100644 --- a/PyTorch/contrib/nlp/roberta/fairseq/distributed/utils.py +++ b/PyTorch/contrib/nlp/roberta/fairseq/distributed/utils.py @@ -28,7 +28,7 @@ from dataclasses import dataclass from typing import Any, Dict, List, Mapping, Optional import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import torch.distributed as dist from fairseq.dataclass.configs import DistributedTrainingConfig, FairseqConfig diff --git a/PyTorch/contrib/others/C51/deep_rl/utils/misc.py b/PyTorch/contrib/others/C51/deep_rl/utils/misc.py index 4552db7573ad9ffa218fdb0edaaa634167405c9b..d6ba2010cd0374a394d65a3fda4dca371e6eb4eb 100644 --- a/PyTorch/contrib/others/C51/deep_rl/utils/misc.py +++ b/PyTorch/contrib/others/C51/deep_rl/utils/misc.py @@ -22,7 +22,7 @@ import pickle import os import datetime import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import time from .torch_utils import * diff --git a/PyTorch/contrib/others/C51/deep_rl/utils/torch_utils.py b/PyTorch/contrib/others/C51/deep_rl/utils/torch_utils.py index a97fc200e0fb03962f805ae97dcc0c20c8e5eb5e..bf539ca8aabf449dae26ed8e983f633ed0051929 100644 --- a/PyTorch/contrib/others/C51/deep_rl/utils/torch_utils.py +++ b/PyTorch/contrib/others/C51/deep_rl/utils/torch_utils.py @@ -19,7 +19,7 @@ from .config import * import torch -if torch.__version__ >= "1.8.1": +if torch.__version__ >= "1.8": import torch_npu import os