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

Jump to bottom

Feature/single folder build #19

Merged
merged 41 commits into from Jul 10, 2021
Merged

Feature/single folder build #19

merged 41 commits into from Jul 10, 2021

Conversation

beesaycheese
Copy link
Contributor

@beesaycheese beesaycheese commented Jul 6, 2021 •
edited

Mac:

git clone https://github.com/datature/portal
chmod u+x ./setup-virtualenv.sh && ./setup-virtualenv.sh
. portal-build/.venv/bin/activate
python3 portal-build/portal.py (additional flags include --electron and --gpu)

Win:

git clone https://github.com/datature/portal
setup-virtualenv.sh
portal-build\.venv\Scripts\activate
python portal-build\portal.py  (additional flags include --electron and --gpu)

Additional Stuff changed:

  1. Toaster logic (On browser mode, the blue toaster will stay forever until it detects the backend)
  2. Set a global isConnected state
  3. Disable inference buttons when there is no loaded model. On hover, a tooltip info will appear
  4. OnComponentDidMount, the model component will call the get model list api until it gets a postive ans. During the wait, the model button is in skeleton mode
  5. GPU feature to request for a restart

@beesaycheese
Change location of next export to portal-build/out
21bd05b
@beesaycheese
Update piplock file
a95b1d1
@beesaycheese
Adjust main script to accomodate for portalbuild
c7af8d0
@beesaycheese
Create a setup-virtuelenv bash script
c39ae60
@beesaycheese
add portal-build to gitignore
2c86ebc
@beesaycheese
adjust root package.json for running electron in portal-build
75004ff
@beesaycheese
portal.py and setup.sh
7f40c02
@beesaycheese
Remove unnecessary imports
953c0f6
@beesaycheese
Update setup python command for windows
2c905c7
@beesaycheese
Adjust runtime to consider non-electron cases
75be42c
@beesaycheese
Adjust the portal.py to run with the one port only
38e7ea9
@beesaycheese
Shift portal.py to the root folder
8eec93a
@beesaycheese
Add portal.py to portal-build for global setup
245c4dd
@beesaycheese
Generalise toast to add additional feature
37721c9
@beesaycheese
Adjust runtime toast and set a global isConnected state
dc262f6
@beesaycheese
Fix logic error in the disable button
d0bb1ae
@beesaycheese
Add ToolTip hint for inference
f896d8e
@beesaycheese
Add styling for the tooltip icon
008b029
@beesaycheese
Remove hint icon and replace it with a hover
0b26909
@beesaycheese
Retain the blue toaster forever on the browser mode
3399964
@beesaycheese
Fix backend error
4a9d432
@beesaycheese
Set model's skeleton state
4ad6fb4
virtuoso98
virtuoso98 reviewed Jul 8, 2021
View reviewed changes
src/app/pages/index.js Outdated
useDarkTheme: false,
useDarkTheme: true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the default now dark theme?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeap

src/app/src/components/annotations/menu.jsx Outdated Show resolved Hide resolved
@virtuoso98
Copy link
Contributor

approving this PR

beesaycheese and others added 2 commits July 8, 2021 11:23
@beesaycheese
Remove unused import
fe6a1a8
@marcus-neo
gpu switch support
f91cec4 
added routes to set/clear/get gpu flag
based on gpu flag, alter the cuda_visible environment variable.
marcus-neo and others added 16 commits July 8, 2021 14:53
@marcus-neo
accommodate front-end crashes but backend didn't crash scenario
4e72739
@beesaycheese
Merge pull request #22 from datature/origin/feature/gpu-switch
adb3338 
Backend GPU implementation
@beesaycheese
Change the route of the use_gpu
5c25b64
@beesaycheese
DEfault to gpu if there is no use_gpu file
7364333
@beesaycheese
Add new api call
ba11e12
@beesaycheese
Handle gpu on the frontend for electron and browser
6230bc7
@beesaycheese
Fix logic error
8a16d09
@beesaycheese
Fix gpu to accommodate for portal-build
fd20158
@beesaycheese
Fix relative pathing issues
d04b52f
@beesaycheese
Conditional delete cache in shutdown route
5a369db
@beesaycheese
Merge branch 'develop' of https://github.com/datature/portal into fea…
a2fae5b 
…ture/single-folder-build
@beesaycheese
Bugfix for unnecesssary gpu calls
1c0f98d
@beesaycheese
Merge branch 'develop' of https://github.com/datature/portal into fea…
1f5ddb6 
…ture/single-folder-build
@beesaycheese
Fix DArk mode styling
0966b23
@beesaycheese
remove progress toast for selectAsset
05f4bc7
@beesaycheese
Fix bulk analysis bug
7f06c27
@beesaycheese beesaycheese merged commit f05749a into develop Jul 10, 2021
@beesaycheese beesaycheese deleted the feature/single-folder-build branch July 10, 2021 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@virtuoso98 virtuoso98 virtuoso98 approved these changes

@gkeechin gkeechin Awaiting requested review from gkeechin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@beesaycheese @virtuoso98 @marcus-neo