Merge branch 'master' into gha/android_runner

openvinotoolkit · Nov 5, 2024 · e8be431 · e8be431
2 parents 03acabd + 1221a97
commit e8be431
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 50 deletions.
diff --git a/cmake/packaging/debian.cmake b/cmake/packaging/debian.cmake
@@ -98,6 +98,7 @@ macro(ov_cpack_settings)
         2024.2.0
         2024.3.0
         2024.4.0
+        2024.5.0
         )
 
     ov_check_conflicts_versions(conflicting_versions)

diff --git a/cmake/packaging/rpm.cmake b/cmake/packaging/rpm.cmake
@@ -86,6 +86,7 @@ macro(ov_cpack_settings)
         2024.2.0
         2024.3.0
         2024.4.0
+        2024.5.0
         )
 
     ov_check_conflicts_versions(conflicting_versions)

diff --git a/src/core/include/openvino/core/type/element_type.hpp b/src/core/include/openvino/core/type/element_type.hpp
@@ -129,9 +129,6 @@ class OPENVINO_API Type {
     // Return element type in string representation
     std::string to_string() const;
 
-    OPENVINO_DEPRECATED("This constructor is deprecated. It will be removed in 2025.0")
-    Type(size_t bitwidth, bool is_real, bool is_signed, bool is_quantized, const std::string& cname);
-
 private:
     Type_t m_type{Type_t::undefined};
 };

diff --git a/src/core/include/openvino/core/version.hpp b/src/core/include/openvino/core/version.hpp
@@ -19,8 +19,8 @@
  * @brief Defines OpenVINO patch version
  */
 
-#define OPENVINO_VERSION_MAJOR 2024
-#define OPENVINO_VERSION_MINOR 5
+#define OPENVINO_VERSION_MAJOR 2025
+#define OPENVINO_VERSION_MINOR 0
 #define OPENVINO_VERSION_PATCH 0
 
 namespace ov {

diff --git a/src/core/src/type/element_type.cpp b/src/core/src/type/element_type.cpp
@@ -164,51 +164,6 @@ std::vector<const ov::element::Type*> ov::element::Type::get_known_types() {
     return rc;
 }
 
-ov::element::Type::Type(size_t bitwidth,
-                        bool is_real,
-                        bool is_signed,
-                        bool is_quantized,
-                        const std::string& /* cname */) {
-    const ElementTypes::ElementsMap elements_map{
-        {ov::element::Type_t::undefined,
-         {std::numeric_limits<size_t>::max(), false, false, false, "undefined", "undefined"}},
-        {ov::element::Type_t::dynamic, {0, false, false, false, "dynamic", "dynamic"}},
-        {ov::element::Type_t::boolean, {8, false, true, false, "char", "boolean"}},
-        {ov::element::Type_t::bf16, {16, true, true, false, "bfloat16", "bf16"}},
-        {ov::element::Type_t::f16, {16, true, true, false, "float16", "f16"}},
-        {ov::element::Type_t::f32, {32, true, true, false, "float", "f32"}},
-        {ov::element::Type_t::f64, {64, true, true, false, "double", "f64"}},
-        {ov::element::Type_t::i4, {4, false, true, true, "int4_t", "i4"}},
-        {ov::element::Type_t::i8, {8, false, true, true, "int8_t", "i8"}},
-        {ov::element::Type_t::i16, {16, false, true, false, "int16_t", "i16"}},
-        {ov::element::Type_t::i32, {32, false, true, true, "int32_t", "i32"}},
-        {ov::element::Type_t::i64, {64, false, true, false, "int64_t", "i64"}},
-        {ov::element::Type_t::u1, {1, false, false, false, "uint1_t", "u1"}},
-        {ov::element::Type_t::u2, {2, false, false, false, "uint2_t", "u2"}},
-        {ov::element::Type_t::u3, {3, false, false, false, "uint3_t", "u3"}},
-        {ov::element::Type_t::u4, {4, false, false, false, "uint4_t", "u4"}},
-        {ov::element::Type_t::u6, {6, false, false, false, "uint6_t", "u6"}},
-        {ov::element::Type_t::u8, {8, false, false, true, "uint8_t", "u8"}},
-        {ov::element::Type_t::u16, {16, false, false, false, "uint16_t", "u16"}},
-        {ov::element::Type_t::u32, {32, false, false, false, "uint32_t", "u32"}},
-        {ov::element::Type_t::u64, {64, false, false, false, "uint64_t", "u64"}},
-        {ov::element::Type_t::nf4, {4, false, false, true, "nfloat4", "nf4"}},
-        {ov::element::Type_t::f8e4m3, {8, true, true, true, "f8e4m3", "f8e4m3"}},
-        {ov::element::Type_t::f8e5m2, {8, true, true, true, "f8e5m2", "f8e5m2"}},
-        {ov::element::Type_t::string, {8 * sizeof(std::string), false, false, false, "string", "string"}},
-        {ov::element::Type_t::f4e2m1, {4, true, true, true, "f4e2m1", "f4e2m1"}},
-        {ov::element::Type_t::f8e8m0, {4, true, true, true, "f8e8m0", "f8e8m0"}},
-    };
-    for (const auto& t : elements_map) {
-        const TypeInfo& info = t.second;
-        if (bitwidth == info.m_bitwidth && is_real == info.m_is_real && is_signed == info.m_is_signed &&
-            is_quantized == info.m_is_quantized) {
-            m_type = t.first;
-            return;
-        }
-    }
-}
-
 ov::element::Type::Type(const std::string& type) : Type(type_from_string(type)) {}
 
 std::string ov::element::Type::c_type_string() const {
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,6 +98,7 @@ macro(ov_cpack_settings) @@
 .2.0
 .3.0
 .4.0
+.5.0
             )
         ov_check_conflicts_versions(conflicting_versions)
@@ Expand Down @@