actually enable CPU fallback for YoloSession.

Author: jw098

SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp

@@ -78,7 +78,7 @@ YOLOv5Detector::YOLOv5Detector(const std::string& model_path)
     }
     label_file.close();
 
-    m_yolo_session = std::make_unique<YOLOv5Session>(m_model_path, std::move(labels));
+    m_yolo_session = std::make_unique<YOLOv5Session>(m_model_path, std::move(labels), m_use_gpu);
 }
 
 bool YOLOv5Detector::detect(const ImageViewRGB32& screen){
@@ -104,7 +104,7 @@ bool YOLOv5Detector::detect(const ImageViewRGB32& screen){
                 std::cerr << "Warning: YOLO session failed using the GPU. Will reattempt with the CPU.\n" << e.what() << std::endl;
                 m_use_gpu = false;
                 std::vector<std::string> labels = m_yolo_session->get_label_names();
-                m_yolo_session = std::make_unique<YOLOv5Session>(m_model_path, std::move(labels));
+                m_yolo_session = std::make_unique<YOLOv5Session>(m_model_path, std::move(labels), m_use_gpu);
             }else{
                 std::cerr << "Error: YOLO session failed even when using the CPU.\n" << e.what() << std::endl;
                 throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Error: YOLO session failed.");

SerialPrograms/Source/ML/Models/ML_YOLOv5Model.cpp

@@ -58,9 +58,9 @@ std::tuple<int, int, double, double> resize_image_with_border(
 }
 
 
-YOLOv5Session::YOLOv5Session(const std::string& model_path, std::vector<std::string> label_names)
+YOLOv5Session::YOLOv5Session(const std::string& model_path, std::vector<std::string> label_names, bool use_gpu)
 : m_label_names(std::move(label_names))
-, m_session_options(create_session_options(ML_MODEL_CACHE_PATH() + "YOLOv5", true))
+, m_session_options(create_session_options(ML_MODEL_CACHE_PATH() + "YOLOv5", use_gpu))
 , m_session{create_session(m_env, m_session_options, model_path, ML_MODEL_CACHE_PATH() + "YOLOv5")}
 , m_memory_info{Ort::MemoryInfo::CreateCpu(OrtDeviceAllocator, OrtMemTypeCPU)}
 , m_input_names{m_session.GetInputNames()}

SerialPrograms/Source/ML/Models/ML_YOLOv5Model.h

@@ -28,7 +28,7 @@ class YOLOv5Session{
         size_t label_idx;
     };
 
-    YOLOv5Session(const std::string& model_path, std::vector<std::string> label_names);
+    YOLOv5Session(const std::string& model_path, std::vector<std::string> label_names, bool use_gpu);
 
     void run(const cv::Mat& input_image, std::vector<DetectionBox>& detections);