已合并
[Bugfix] support CANN version with beta string #3493
Ganon创建于 24 天前
[Bugfix] support CANN version with beta string #3493
已合并
共 2 个文件变更+8-2
| @@ -102,5 +102,5 @@ at::Tensor empty_with_format(c10::IntArrayRef sizes, const c10::TensorOptions &o | |||
| 102 | } // namespace at_npu | 102 | } // namespace at_npu |
| 103 | 103 | ||
| 104 | std::string GetCANNVersion(const std::string &module) { | 104 | std::string GetCANNVersion(const std::string &module) { |
| 105 | - return "8.1.RC1.alpha1"; | 105 | + return "9.2.0.beta1"; |
| 106 | } | 106 | } |
| @@ -322,6 +322,7 @@ int64_t VersionToNum(std::string versionStr) { | |||
| 322 | int64_t RCVersion = -51L; | 322 | int64_t RCVersion = -51L; |
| 323 | int64_t TVersion = -1L; | 323 | int64_t TVersion = -1L; |
| 324 | int64_t alphaVersion = 0L; | 324 | int64_t alphaVersion = 0L; |
| 325 | + int64_t betaVersion = 100L; | ||
| 325 | if (std::regex_match(versionStr, results, std::regex("([0-9]+).([0-9]+).RC([0-9]+)"))) { | 326 | if (std::regex_match(versionStr, results, std::regex("([0-9]+).([0-9]+).RC([0-9]+)"))) { |
| 326 | major = stoll(results[kVersionIndex1]); | 327 | major = stoll(results[kVersionIndex1]); |
| 327 | minor = stoll(results[kVersionIndex2]); | 328 | minor = stoll(results[kVersionIndex2]); |
| @@ -339,12 +340,17 @@ int64_t VersionToNum(std::string versionStr) { | |||
| 339 | minor = stoll(results[kVersionIndex2]); | 340 | minor = stoll(results[kVersionIndex2]); |
| 340 | RCVersion = stoll(results[kVersionIndex3]); | 341 | RCVersion = stoll(results[kVersionIndex3]); |
| 341 | alphaVersion = stoll(results[kVersionIndex4]); | 342 | alphaVersion = stoll(results[kVersionIndex4]); |
| 343 | + } else if (std::regex_match(versionStr, results, std::regex("([0-9]+).([0-9]+).([0-9]+).beta([0-9]+)"))) { | ||
| 344 | + major = stoll(results[kVersionIndex1]); | ||
| 345 | + minor = stoll(results[kVersionIndex2]); | ||
| 346 | + release = stoll(results[kVersionIndex3]); | ||
| 347 | + betaVersion = stoll(results[kVersionIndex4]); | ||
| 342 | } else { | 348 | } else { |
| 343 | return 0L; | 349 | return 0L; |
| 344 | } | 350 | } |
| 345 | 351 | ||
| 346 | int64_t num = ((major + 1) * 100000000) + ((minor + 1) * 1000000) + ((release + 1) * 10000) + | 352 | int64_t num = ((major + 1) * 100000000) + ((minor + 1) * 1000000) + ((release + 1) * 10000) + |
| 347 | - ((RCVersion + 1) * 100 + 5000) + ((TVersion + 1) * 100) - (100 - alphaVersion); | 353 | + ((RCVersion + 1) * 100 + 5000) + ((TVersion + 1) * 100) - (100 - alphaVersion) - (100 - betaVersion); |
| 348 | return num; | 354 | return num; |
| 349 | } | 355 | } |
| 350 | 356 | ||