Skip to content

Commit 31d2179

Browse files
authored
[DLStreamer] Fixes in download_public_models - Ultralytics fixed 8.3.153 version, quantization excluding and venvs cleaning (open-edge-platform#440)
Signed-off-by: dmichalo <dawid.michalowski@intel.com>
1 parent f50f513 commit 31d2179

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

libraries/dl-streamer/samples/download_public_models.sh

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ pip install --no-cache-dir --upgrade nncf || handle_error $LINENO
189189

190190
# Check and upgrade ultralytics if necessary
191191
if [[ "${MODEL:-}" =~ yolo.* || "${MODEL:-}" == "all" ]]; then
192-
pip install --no-cache-dir --upgrade --extra-index-url https://download.pytorch.org/whl/cpu ultralytics || handle_error $LINENO
192+
pip install --no-cache-dir --upgrade --extra-index-url https://download.pytorch.org/whl/cpu ultralytics==8.3.153 || handle_error $LINENO
193193
fi
194194

195195
# Set the name of the virtual environment directory
@@ -219,7 +219,7 @@ pip install --no-cache-dir --upgrade nncf || handle_error $LINENO
219219

220220
# Check and upgrade ultralytics if necessary
221221
if [[ "${MODEL:-}" =~ yolo.* || "${MODEL:-}" == "all" ]]; then
222-
pip install --no-cache-dir --upgrade --extra-index-url https://download.pytorch.org/whl/cpu ultralytics || handle_error $LINENO
222+
pip install --no-cache-dir --upgrade --extra-index-url https://download.pytorch.org/whl/cpu ultralytics==8.3.153 || handle_error $LINENO
223223
fi
224224

225225
# Install dependencies for CLIP models
@@ -570,11 +570,6 @@ if [ "$MODEL" == "yolov7" ] || [ "$MODEL" == "yolo_all" ] || [ "$MODEL" == "all"
570570
else
571571
echo_color "\nModel already exists: $MODEL_DIR.\n" "yellow"
572572
fi
573-
574-
575-
if [[ $QUANTIZE != "" ]]; then
576-
quantize_yolo_model "$MODEL_NAME"
577-
fi
578573
fi
579574

580575
# Function to export YOLO model
@@ -682,7 +677,12 @@ YOLO_MODELS=(
682677
# Iterate over the models and export them
683678
for MODEL_NAME in "${!YOLO_MODELS[@]}"; do
684679
if [ "$MODEL" == "$MODEL_NAME" ] || [ "$MODEL" == "yolo_all" ] || [ "$MODEL" == "all" ]; then
685-
export_yolo_model "$MODEL_NAME" "${YOLO_MODELS[$MODEL_NAME]}" "$QUANTIZE"
680+
MODEL_NAME_UPPER=$(echo "$MODEL_NAME" | tr '[:lower:]' '[:upper:]')
681+
if [[ $MODEL_NAME_UPPER == *"OBB"* || $MODEL_NAME_UPPER == *"POSE"* || $MODEL_NAME_UPPER == *"SEG"* ]]; then
682+
export_yolo_model "$MODEL_NAME" "${YOLO_MODELS[$MODEL_NAME]}" ""
683+
else
684+
export_yolo_model "$MODEL_NAME" "${YOLO_MODELS[$MODEL_NAME]}" "$QUANTIZE"
685+
fi
686686
fi
687687
done
688688

@@ -941,3 +941,10 @@ EOF
941941
echo_color "\nModel already exists: $MODEL_DIR.\n" "yellow"
942942
fi
943943
fi
944+
945+
# Deactivate and remove venvs
946+
echo "Removing Python virtual environments..."
947+
deactivate
948+
rm -r $VENV_DIR
949+
rm -r $VENV_DIR_QUANT
950+
echo "Removed"

0 commit comments

Comments
 (0)