Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge divergent branches from release #164

Merged
merged 8 commits into from
Sep 18, 2023
Merged

Merge divergent branches from release #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df7dd65
Fixed same file error
weiloon-datature Sep 18, 2023
721845c
Fixed TF inference error
weiloon-datature Sep 18, 2023
c7b832d
Re-Exported Portal to Portal Build
github-actions[bot] May 16, 2023
b24a65c
Support loading and predicting using YOLOv8 models
weiloon-datature Jul 19, 2023
bfce13a
Fixed model format inference
weiloon-datature Jul 19, 2023
3f27323
Fixed py-cpuinfo import errors
weiloon-datature Jul 26, 2023
d7f7698
Removed build files
weiloon-datature Sep 18, 2023
aa45db3
Removed legacy info
weiloon-datature Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/release-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,11 @@ 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
mv ../../portal_build/dist/run ../../portal_build/dist/run.exe
else
chmod u+x ../../portal_build/dist/run.exe
fi
chmod u+x ../../portal_build/dist/run.exe

Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/annotations/model.tsx
View file
Open in desktop
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
1 change: 1 addition & 0 deletions src/engine/server/models/model_utils/predict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,4 @@ def tf_predict(model, model_format, output_name, image_array):
detections_output = bboxes, masks, scores, classes
else:
detections_output = np.array(detections_output[output_name][0])
return detections_output
Loading