Skip to content

Commit

Permalink
Merge divergent branches from release (#164)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
weiloon-datature and github-actions[bot] authored Sep 18, 2023
1 parent 389eeec commit 060c3b0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/annotations/model.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ export default class Model extends React.Component<ModelProps, ModelState> {
<Menu>
<Menu.Item
shouldDismissPopover={false}
text={modelTypes.autodetect}
text={<>{modelTypes.autodetect}</>}
onClick={() => {
const event = {
target: { name: "modelType", value: "autodetect" },
Expand Down

0 comments on commit 060c3b0

Please sign in to comment.