From 060c3b053a8feef40a33e5b776f4247f75d99b1f Mon Sep 17 00:00:00 2001 From: Wei Loon Cheng Date: Mon, 18 Sep 2023 19:13:25 +0800 Subject: [PATCH] Merge divergent branches from release (#164) * Fixed same file error * Fixed TF inference error * Re-Exported Portal to Portal Build * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Removed build files * Removed legacy info --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/workflows/release-workflow.yml | 2 +- src/app/src/components/annotations/model.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index 05a04fbc..eaff5e0a 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -56,7 +56,7 @@ jobs: working-directory: ./src/engine shell: bash run: | - pyinstaller --collect-data ultralytics --hidden-import pydicom.encoders.gdcm --hidden-import pydicom.encoders.pylibjpeg --hidden-import engineio.async_drivers.threading -F run.py --distpath ../../portal_build/dist + pyinstaller --collect-data ultralytics --hidden-import pydicom.encoders.gdcm --hidden-import pydicom.encoders.pylibjpeg --hidden-import engineio.async_drivers.threading --paths ../../portal_build/.venv/Lib/site-packages/cpuinfo -F run.py --distpath ../../portal_build/dist if [ -f ../../portal_build/dist/run ]; then chmod u+x ../../portal_build/dist/run else diff --git a/src/app/src/components/annotations/model.tsx b/src/app/src/components/annotations/model.tsx index c541169d..1376ba63 100644 --- a/src/app/src/components/annotations/model.tsx +++ b/src/app/src/components/annotations/model.tsx @@ -766,7 +766,7 @@ export default class Model extends React.Component { {modelTypes.autodetect}} onClick={() => { const event = { target: { name: "modelType", value: "autodetect" },