From b9b0fd8bf409c822b7fcb21d65722b242f5307fc Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 18 Oct 2023 14:53:58 +0100 Subject: [PATCH] `ultralytics 8.0.200` move `on_val_start` callback for training (#5790) Co-authored-by: Myyura --- .github/workflows/ci.yaml | 2 +- examples/YOLOv8-ONNXRuntime-CPP/inference.cpp | 14 +++++++++++--- ultralytics/__init__.py | 2 +- ultralytics/engine/validator.py | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 30d36ff6..6b05e1c4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -247,7 +247,7 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} Conda: - if: github.repository == 'ultralytics/ultralytics' && (github.event_name == 'schedule' || github.event.inputs.conda == 'true') + if: github.repository == 'ultralytics/ultralytics' && (github.event_name == 'schedule_disabled' || github.event.inputs.conda == 'true') runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/examples/YOLOv8-ONNXRuntime-CPP/inference.cpp b/examples/YOLOv8-ONNXRuntime-CPP/inference.cpp index 6a772c77..7e9d0aa5 100644 --- a/examples/YOLOv8-ONNXRuntime-CPP/inference.cpp +++ b/examples/YOLOv8-ONNXRuntime-CPP/inference.cpp @@ -175,10 +175,18 @@ char *DCSP_CORE::TensorProcess(clock_t &starttime_1, cv::Mat &iImg, N &blob, std std::vector class_ids; std::vector confidences; std::vector boxes; - cv::Mat rowData(signalResultNum, strideNum, CV_32F, output); - rowData = rowData.t(); - float *data = (float *) rowData.data; + cv::Mat rawData; + if (modelType == 1) { + // FP32 + rawData = cv::Mat(signalResultNum, strideNum, CV_32F, output); + } else { + // FP16 + rawData = cv::Mat(signalResultNum, strideNum, CV_16F, output); + rawData.convertTo(rawData, CV_32F); + } + rawData = rawData.t(); + float *data = (float *) rawData.data; float x_factor = iImg.cols / 640.; float y_factor = iImg.rows / 640.; diff --git a/ultralytics/__init__.py b/ultralytics/__init__.py index 0b882285..1d67da98 100644 --- a/ultralytics/__init__.py +++ b/ultralytics/__init__.py @@ -1,6 +1,6 @@ # Ultralytics YOLO 🚀, AGPL-3.0 license -__version__ = '8.0.199' +__version__ = '8.0.200' from ultralytics.models import RTDETR, SAM, YOLO from ultralytics.models.fastsam import FastSAM diff --git a/ultralytics/engine/validator.py b/ultralytics/engine/validator.py index 5ad69546..e50cebd5 100644 --- a/ultralytics/engine/validator.py +++ b/ultralytics/engine/validator.py @@ -119,7 +119,6 @@ class BaseValidator: model.eval() else: callbacks.add_integration_callbacks(self) - self.run_callbacks('on_val_start') model = AutoBackend(model or self.args.model, device=select_device(self.args.device, self.args.batch), dnn=self.args.dnn, @@ -152,6 +151,7 @@ class BaseValidator: model.eval() model.warmup(imgsz=(1 if pt else self.args.batch, 3, imgsz, imgsz)) # warmup + self.run_callbacks('on_val_start') dt = Profile(), Profile(), Profile(), Profile() bar = TQDM(self.dataloader, desc=self.get_desc(), total=len(self.dataloader)) self.init_metrics(de_parallel(model))