Remove deprecated option and enable compilation without device

openvinotoolkit · Jun 18, 2021 · ef95552 · ef95552
1 parent 9dd0531
commit ef95552
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 65 deletions.
diff --git a/inference-engine/include/vpu/myriad_plugin_config.hpp b/inference-engine/include/vpu/myriad_plugin_config.hpp
@@ -54,8 +54,6 @@ DECLARE_VPU_MYRIAD_CONFIG_KEY(PLATFORM);
  * @brief Supported keys definition for VPU_MYRIAD_CONFIG_KEY(PLATFORM) option.
  */
 INFERENCE_ENGINE_DEPRECATED("")
-DECLARE_VPU_MYRIAD_CONFIG_VALUE(2450);
-INFERENCE_ENGINE_DEPRECATED("")
 DECLARE_VPU_MYRIAD_CONFIG_VALUE(2480);
 
 /**

diff --git a/inference-engine/src/vpu/myriad_plugin/myriad_config.cpp b/inference-engine/src/vpu/myriad_plugin/myriad_config.cpp
@@ -69,7 +69,6 @@ IE_SUPPRESS_DEPRECATED_END
 void MyriadConfig::parse(const std::map<std::string, std::string>& config) {
 IE_SUPPRESS_DEPRECATED_START
     static const std::unordered_map<std::string, ncDevicePlatform_t> platformsDeprecated = {
-        { VPU_MYRIAD_CONFIG_VALUE(2450), NC_MYRIAD_2 },
         { VPU_MYRIAD_CONFIG_VALUE(2480), NC_MYRIAD_X },
         { std::string(),                 NC_ANY_PLATFORM }
     };

diff --git a/inference-engine/src/vpu/myriad_plugin/myriad_executor.cpp b/inference-engine/src/vpu/myriad_plugin/myriad_executor.cpp
@@ -266,15 +266,15 @@ DevicePtr MyriadExecutor::openDevice(std::vector<DevicePtr>& devicePool,
                 return device->isBooted() && device->isNotFull()
                        && device->isSuitableForConfig(config);
             });
-
         // Return mock device. If try infer with it, exception will be thrown
-        if (availableDevices.empty() && config.platform() != NC_ANY_PLATFORM) {
+        if (availableDevices.empty()) {
+            if (config.platform() == NC_ANY_PLATFORM) {
+                _log->warning("No booted device");
+            }
             DeviceDesc device;
             device._platform = config.platform();
             device._protocol = config.protocol();
             return std::make_shared<DeviceDesc>(device);
-        } else if (availableDevices.empty()) {
-            IE_THROW() << "Can not init Myriad device: " << ncStatusToStr(nullptr, booted);
         }
 
         auto deviceWithMinExecutors = std::min_element(availableDevices.begin(), availableDevices.end(),
@@ -376,7 +376,7 @@ void MyriadExecutor::allocateGraph(DevicePtr &device, GraphDesc &graphDesc,
         IE_THROW() << "Failed to get output description: " << ncStatusToStr(graphDesc._graphHandle, status);
     }
 
-    unsigned int fifo_elements = (device->_platform == NC_MYRIAD_2 && executors == 1) ? 4 : 2 * executors;
+    unsigned int fifo_elements = (executors == 1) ? 4 : 2 * executors;
 
     status = ncFifoCreate("input", NC_FIFO_HOST_WO, &graphDesc._inputFifoHandle);
     if (status != NC_OK) {

diff --git a/inference-engine/src/vpu/myriad_plugin/myriad_executor.h b/inference-engine/src/vpu/myriad_plugin/myriad_executor.h
@@ -65,8 +65,7 @@ struct DeviceDesc {
     }
 
     ncDevicePlatform_t revision() const {
-        VPU_THROW_UNLESS(_platform != NC_ANY_PLATFORM, "Cannot get a revision from not booted device");
-        return _platform;
+        return ncDevicePlatform_t::NC_MYRIAD_X;
     }
 };
 

diff --git a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_load_network_tests.cpp b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_load_network_tests.cpp
@@ -55,27 +55,3 @@ TEST_F(MyriadLoadNetworkTestCase, smoke_ThrowsExeptionWhenNameIsInvalid) {
     ASSERT_ANY_THROW(ExeNetwork exe_network =
         ie->LoadNetwork(cnnNetwork, "MYRIAD", config));
 }
-
-TEST_F(MyriadLoadNetworkTestCase, smoke_ThrowsExeptionWhenPlatformConflictWithProtocol) {
-    std::string wrong_platform;
-    auto devices = getDevicesList();
-    ASSERT_TRUE(devices.size());
-
-    auto device_to_load = devices[0];
-
-    IE_SUPPRESS_DEPRECATED_START
-    if(isMyriadXDevice(device_to_load)) {
-        wrong_platform = VPU_MYRIAD_2450;
-    } else {
-        wrong_platform = VPU_MYRIAD_2480;
-    }
-    IE_SUPPRESS_DEPRECATED_END
-
-    std::map<std::string, std::string> config = {
-        {KEY_DEVICE_ID, device_to_load},
-        {KEY_VPU_MYRIAD_PLATFORM, wrong_platform},
-    };
-
-    ASSERT_ANY_THROW(ExeNetwork exe_network =
-        ie->LoadNetwork(cnnNetwork, "MYRIAD", config));
-}
diff --git a/...ngine/tests_deprecated/behavior/vpu/shared_tests_instances/plugin_tests/vpu_test_data.hpp b/...ngine/tests_deprecated/behavior/vpu/shared_tests_instances/plugin_tests/vpu_test_data.hpp
@@ -82,7 +82,6 @@ const std::vector<BehTestParams> deviceSpecificConfigurations = {
     BEH_MYRIAD.withConfig({{InferenceEngine::MYRIAD_PROTOCOL, InferenceEngine::MYRIAD_PCIE}}),
 
     // Deprecated
-    BEH_MYRIAD.withConfig({{VPU_MYRIAD_CONFIG_KEY(PLATFORM), VPU_MYRIAD_CONFIG_VALUE(2450)}}),
     BEH_MYRIAD.withConfig({{VPU_MYRIAD_CONFIG_KEY(PLATFORM), VPU_MYRIAD_CONFIG_VALUE(2480)}}),
 
     BEH_MYRIAD.withConfig({{VPU_MYRIAD_CONFIG_KEY(PROTOCOL), VPU_MYRIAD_CONFIG_VALUE(USB)}}),

diff --git a/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_configs_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_configs_tests.cpp
@@ -72,7 +72,6 @@ TEST_P(myriadIncorrectModelsConfigsTests_nightly, LoadNetworkWithIncorrectConfig
 //------------------------------------------------------------------------------
 
 static const std::vector<config_t> myriadCorrectPlatformConfigValues = {
-        {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), VPU_MYRIAD_CONFIG_VALUE(2450)}},
         {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), VPU_MYRIAD_CONFIG_VALUE(2480)}},
         {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), ""}}
 };

diff --git a/inference-engine/tests_deprecated/helpers/tests_vpu_common.hpp b/inference-engine/tests_deprecated/helpers/tests_vpu_common.hpp
@@ -66,11 +66,9 @@ static bool hasAppropriateStick(const config_t &config) {
     if (platform == config.end() || platform->second.empty()) {
         suitsConfig = hasMyriad2() || hasMyriadX();
     } else {
-        bool hasRequestedMyriad2 =
-                platform->second == VPU_MYRIAD_CONFIG_VALUE(2450) && hasMyriad2();
         bool hasRequestedMyriadX =
                 platform->second == VPU_MYRIAD_CONFIG_VALUE(2480) && hasMyriadX();
-        suitsConfig = hasRequestedMyriad2 || hasRequestedMyriadX;
+        suitsConfig = hasRequestedMyriadX;
     }
 
     return suitsConfig;

diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_engine_tests.cpp b/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_engine_tests.cpp
@@ -21,7 +21,6 @@ IE_SUPPRESS_DEPRECATED_START
 
 static const std::vector<config_t> myriadCorrectPlatformConfigValues = {
     // Deprecated
-    {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), VPU_MYRIAD_CONFIG_VALUE(2450)}},
     {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), VPU_MYRIAD_CONFIG_VALUE(2480)}},
     {{VPU_MYRIAD_CONFIG_KEY(PLATFORM), ""}}
 };
@@ -47,12 +46,10 @@ static const std::vector<config_t> myriadCorrectProtocolConfigValues = {
 static const std::vector<config_t> myriadIncorrectProtocolConfigValues = {
     // Protocols
     {{InferenceEngine::MYRIAD_PROTOCOL, "0"}},
-    {{InferenceEngine::MYRIAD_PROTOCOL, "2450"}},
     {{InferenceEngine::MYRIAD_PROTOCOL, "PCI"}},
 
     // Deprecated
     {{VPU_MYRIAD_CONFIG_KEY(PROTOCOL), "0"}},
-    {{VPU_MYRIAD_CONFIG_KEY(PROTOCOL), "2450"}},
     {{VPU_MYRIAD_CONFIG_KEY(PROTOCOL), "PCI"}},
 };
 

diff --git a/inference-engine/thirdparty/movidius/mvnc/include/mvnc.h b/inference-engine/thirdparty/movidius/mvnc/include/mvnc.h
@@ -126,7 +126,6 @@ typedef enum {
 
 typedef enum {
     NC_ANY_PLATFORM = 0,
-    NC_MYRIAD_2 = 2450,
     NC_MYRIAD_X = 2480,
 } ncDevicePlatform_t;
 

diff --git a/inference-engine/thirdparty/movidius/mvnc/src/mvnc_api.c b/inference-engine/thirdparty/movidius/mvnc/src/mvnc_api.c
@@ -152,7 +152,6 @@ char* ncProtocolToStr(const ncDeviceProtocol_t deviceProtocol) {
 
 char* ncPlatformToStr(const ncDevicePlatform_t platform) {
     switch(platform) {
-        case NC_MYRIAD_2:              return "NC_MYRIAD_2";
         case NC_MYRIAD_X:              return "NC_MYRIAD_X";
         default:                    return "NC_ANY_PLATFORM";
     }
@@ -2670,8 +2669,6 @@ static ncStatus_t getDeviceOption(struct _devicePrivate_t *d,
     case NC_RO_DEVICE_PLATFORM:
         if (d->dev_attr.fw_version[1] == 0x2480){
             *(ncDevicePlatform_t *) data = NC_MYRIAD_X;
-        } else if (d->dev_attr.fw_version[1] == 0x2450) {
-            *(ncDevicePlatform_t *) data = NC_MYRIAD_2;
         } else {
             *(ncDevicePlatform_t *) data = NC_ANY_PLATFORM;
         }

diff --git a/inference-engine/thirdparty/movidius/mvnc/src/mvnc_data.c b/inference-engine/thirdparty/movidius/mvnc/src/mvnc_data.c
@@ -39,7 +39,6 @@ XLinkPlatform_t convertPlatformToXlink(
     const ncDevicePlatform_t ncProtocol) {
     switch (ncProtocol) {
         case NC_ANY_PLATFORM: return X_LINK_ANY_PLATFORM;
-        case NC_MYRIAD_2:     return X_LINK_MYRIAD_2;
         case NC_MYRIAD_X:     return X_LINK_MYRIAD_X;
         default:           return X_LINK_ANY_PLATFORM;
     }
@@ -49,7 +48,6 @@ ncDevicePlatform_t convertPlatformToNC(
     const XLinkPlatform_t xLinkProtocol) {
     switch (xLinkProtocol) {
         case X_LINK_ANY_PLATFORM:   return NC_ANY_PLATFORM;
-        case X_LINK_MYRIAD_2:       return NC_MYRIAD_2;
         case X_LINK_MYRIAD_X:       return NC_MYRIAD_X;
         default:
             mvLog(MVLOG_WARN, "This convertation not supported, set to NC_ANY_PLATFORM");

diff --git a/inference-engine/thirdparty/movidius/mvnc/tests/cases/mvnc_common_test_cases.h b/inference-engine/thirdparty/movidius/mvnc/tests/cases/mvnc_common_test_cases.h
@@ -138,7 +138,6 @@ static const std::vector<ncDeviceProtocol_t> myriadProtocols = {
 };
 
 static const std::vector<ncDevicePlatform_t> myriadPlatforms = {
-        NC_MYRIAD_2,
         NC_MYRIAD_X
 };
 

diff --git a/inference-engine/thirdparty/movidius/mvnc/tests/helpers/mvnc_test_helper.cpp b/inference-engine/thirdparty/movidius/mvnc/tests/helpers/mvnc_test_helper.cpp
@@ -28,10 +28,6 @@ long getAmountOfMyriadXDevices(ncDeviceProtocol_t deviceProtocol) {
     return getAmountOfDevices(deviceProtocol, NC_MYRIAD_X);
 }
 
-long getAmountOfMyriad2Devices(ncDeviceProtocol_t deviceProtocol) {
-    return getAmountOfDevices(deviceProtocol, NC_MYRIAD_2);
-}
-
 long getAmountOfBootedDevices(ncDeviceProtocol_t deviceProtocol) {
     return getAmountOfDevices(deviceProtocol, NC_ANY_PLATFORM, X_LINK_BOOTED);
 }
@@ -114,7 +110,6 @@ bool isSameProtocolDevice(const std::string &deviceName, const ncDeviceProtocol_
 bool
 isSamePlatformUSBDevice(const std::string &deviceName, const ncDevicePlatform_t expectedPlatform) {
     switch (expectedPlatform) {
-        case NC_MYRIAD_2:  return isMyriad2USBDevice(deviceName);
         case NC_MYRIAD_X:  return isMyriadXUSBDevice(deviceName);
         case NC_ANY_PLATFORM:
             return isMyriad2USBDevice(deviceName) || isMyriadXUSBDevice(deviceName);

diff --git a/inference-engine/thirdparty/movidius/mvnc/tests/mvnc_tests_usb.cpp b/inference-engine/thirdparty/movidius/mvnc/tests/mvnc_tests_usb.cpp
@@ -180,9 +180,7 @@ TEST_F(MvncOpenUSBDevice, CheckErrorWhenPlatformConflictWithName) {
 
     ASSERT_TRUE(availableDevices.size());
 
-    if(isMyriadXUSBDevice(availableDevices[0])) {
-        wrongPlatform = NC_MYRIAD_2;
-    } else {
+    if(!isMyriadXUSBDevice(availableDevices[0])) {
         wrongPlatform = NC_MYRIAD_X;
     }
 

diff --git a/inference-engine/tools/compile_tool/main.cpp b/inference-engine/tools/compile_tool/main.cpp
@@ -184,10 +184,6 @@ static std::map<std::string, std::string> configure() {
     auto config = parseConfigFile();
 
     if (isMYRIAD) {
-IE_SUPPRESS_DEPRECATED_START
-        config[VPU_MYRIAD_CONFIG_KEY(PLATFORM)] = "VPU_MYRIAD_2480";
-IE_SUPPRESS_DEPRECATED_END
-
         if (!FLAGS_VPU_NUMBER_OF_SHAVES.empty()) {
             config[InferenceEngine::MYRIAD_NUMBER_OF_SHAVES] = FLAGS_VPU_NUMBER_OF_SHAVES;
         }

diff --git a/inference-engine/tools/vpu/vpu_compile/main.cpp b/inference-engine/tools/vpu/vpu_compile/main.cpp
@@ -105,10 +105,6 @@ static bool parseCommandLine(int *argc, char ***argv) {
 static std::map<std::string, std::string> configure(const std::string &configFile, const std::string &xmlFileName) {
     auto config = parseConfig(configFile);
 
-    IE_SUPPRESS_DEPRECATED_START
-        config[VPU_MYRIAD_CONFIG_KEY(PLATFORM)] = "VPU_MYRIAD_2480";
-    IE_SUPPRESS_DEPRECATED_END
-
     if (!FLAGS_VPU_NUMBER_OF_SHAVES.empty()) {
         config[InferenceEngine::MYRIAD_NUMBER_OF_SHAVES] = FLAGS_VPU_NUMBER_OF_SHAVES;
     }
-Original file line number
+Diff line change
@@ Expand Up @@
     };
     static const std::vector<ncDevicePlatform_t> myriadPlatforms = {
-            NC_MYRIAD_2,
             NC_MYRIAD_X
     };
@@ Expand Down @@