Revert merge conflicts #167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marcus-datature
approved these changes
Sep 19, 2023
weiloon-datature
added a commit
that referenced
this pull request
Sep 19, 2023
* Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Hot fixes v0.5.8 (#162) * Fixed same file error for Windows release build * Fixed TF inference error * 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> * Update release workflow (#166) * 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 * Update release workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert merge conflicts (#167) * Revert "Merge divergent branches from release (#164)" This reverts commit 060c3b0. * Revert "Hot fixes v0.5.8 (#162)" This reverts commit 389eeec. * Fixes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
weiloon-datature
added a commit
that referenced
this pull request
Sep 19, 2023
* Conflict fixes (#165) * Hot fixes v0.5.8 (#163) * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Hot fixes v0.5.8 (#162) * Fixed same file error for Windows release build * Fixed TF inference error * 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> * Update release workflow (#166) * 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 * Update release workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert merge conflicts (#167) * Revert "Merge divergent branches from release (#164)" This reverts commit 060c3b0. * Revert "Hot fixes v0.5.8 (#162)" This reverts commit 389eeec. * Fixes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
weiloon-datature
added a commit
that referenced
this pull request
Mar 12, 2024
* Update requirements.txt * Update requirements.txt * Update requirements.txt * Re-Exported Portal to Portal Build * Support Inference with YOLOv8 Models (#160) * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Conflict fixes (#165) * Hot fixes v0.5.8 (#163) * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Hot fixes v0.5.8 (#162) * Fixed same file error for Windows release build * Fixed TF inference error * 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> * Update release workflow (#166) * 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 * Update release workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert merge conflicts (#167) * Revert "Merge divergent branches from release (#164)" This reverts commit 060c3b0. * Revert "Hot fixes v0.5.8 (#162)" This reverts commit 389eeec. * Fixes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Keechin <1712699+gkeechin@users.noreply.github.com> Co-authored-by: Denzel <61901756+denzel-datature@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <81731201+marcus-datature@users.noreply.github.com>
weiloon-datature
added a commit
that referenced
this pull request
Mar 12, 2024
* updated to match v0.5.6 * update engine-workflow * minor fixes * FIX: Added Support for M1 Chip * FIX: Windows compatibility issues (#154) * Update requirements.txt * Update requirements.txt * Update requirements.txt * Re-Exported Portal to Portal Build * Fixed Windows incompatibility issues * Removed release build files --------- Co-authored-by: Keechin <1712699+gkeechin@users.noreply.github.com> Co-authored-by: Denzel <61901756+denzel-datature@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <81731201+marcus-datature@users.noreply.github.com> * Fixed electron build for MacOS * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Hot fixes v0.5.8 (#162) * Fixed same file error for Windows release build * Fixed TF inference error * 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> * Update release workflow (#166) * 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 * Update release workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert merge conflicts (#167) * Revert "Merge divergent branches from release (#164)" This reverts commit 060c3b0. * Revert "Hot fixes v0.5.8 (#162)" This reverts commit 389eeec. * Fixes * Create Support for Datature API (#169) * Add Support for Python SDK v1.6.0 (#170) * Support SDK v1.6.0 * Fixed endpoint issues for Inference API * Update dependencies and setup * Upgrade to minimum Python 3.8 * Fix YAML parsing issue in workflow * Parity for release <> develop (#173) * Update requirements.txt * Update requirements.txt * Update requirements.txt * Re-Exported Portal to Portal Build * Support Inference with YOLOv8 Models (#160) * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Conflict fixes (#165) * Hot fixes v0.5.8 (#163) * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Hot fixes v0.5.8 (#162) * Fixed same file error for Windows release build * Fixed TF inference error * 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> * Update release workflow (#166) * 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 * Update release workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert merge conflicts (#167) * Revert "Merge divergent branches from release (#164)" This reverts commit 060c3b0. * Revert "Hot fixes v0.5.8 (#162)" This reverts commit 389eeec. * Fixes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Keechin <1712699+gkeechin@users.noreply.github.com> Co-authored-by: Denzel <61901756+denzel-datature@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <81731201+marcus-datature@users.noreply.github.com> --------- Co-authored-by: marcus-datature <marcus.neo418@gmail.com> Co-authored-by: Koh Quan Wei Ivan <ivan@datature.io> Co-authored-by: Denzel <61901756+denzel-datature@users.noreply.github.com> Co-authored-by: Keechin <1712699+gkeechin@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <81731201+marcus-datature@users.noreply.github.com>
weiloon-datature
added a commit
that referenced
this pull request
Mar 12, 2024
* Merge from develop branch (#174) * updated to match v0.5.6 * update engine-workflow * minor fixes * FIX: Added Support for M1 Chip * FIX: Windows compatibility issues (#154) * Update requirements.txt * Update requirements.txt * Update requirements.txt * Re-Exported Portal to Portal Build * Fixed Windows incompatibility issues * Removed release build files --------- Co-authored-by: Keechin <1712699+gkeechin@users.noreply.github.com> Co-authored-by: Denzel <61901756+denzel-datature@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <81731201+marcus-datature@users.noreply.github.com> * Fixed electron build for MacOS * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Hot fixes v0.5.8 (#162) * Fixed same file error for Windows release build * Fixed TF inference error * 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> * Update release workflow (#166) * 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 * Update release workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert merge conflicts (#167) * Revert "Merge divergent branches from release (#164)" This reverts commit 060c3b0. * Revert "Hot fixes v0.5.8 (#162)" This reverts commit 389eeec. * Fixes * Create Support for Datature API (#169) * Add Support for Python SDK v1.6.0 (#170) * Support SDK v1.6.0 * Fixed endpoint issues for Inference API * Update dependencies and setup * Upgrade to minimum Python 3.8 * Fix YAML parsing issue in workflow * Parity for release <> develop (#173) * Update requirements.txt * Update requirements.txt * Update requirements.txt * Re-Exported Portal to Portal Build * Support Inference with YOLOv8 Models (#160) * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Conflict fixes (#165) * Hot fixes v0.5.8 (#163) * Support loading and predicting using YOLOv8 models * Fixed model format inference * Fixed py-cpuinfo import errors * Update docs * Update release workflow * Fixed eslint issues * Revert legacy icons * Hot fixes v0.5.8 (#162) * Fixed same file error for Windows release build * Fixed TF inference error * 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> * Update release workflow (#166) * 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 * Update release workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Revert merge conflicts (#167) * Revert "Merge divergent branches from release (#164)" This reverts commit 060c3b0. * Revert "Hot fixes v0.5.8 (#162)" This reverts commit 389eeec. * Fixes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Keechin <1712699+gkeechin@users.noreply.github.com> Co-authored-by: Denzel <61901756+denzel-datature@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <81731201+marcus-datature@users.noreply.github.com> --------- Co-authored-by: marcus-datature <marcus.neo418@gmail.com> Co-authored-by: Koh Quan Wei Ivan <ivan@datature.io> Co-authored-by: Denzel <61901756+denzel-datature@users.noreply.github.com> Co-authored-by: Keechin <1712699+gkeechin@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <81731201+marcus-datature@users.noreply.github.com> * Re-Exported Portal to Portal Build --------- Co-authored-by: marcus-datature <marcus.neo418@gmail.com> Co-authored-by: Koh Quan Wei Ivan <ivan@datature.io> Co-authored-by: Denzel <61901756+denzel-datature@users.noreply.github.com> Co-authored-by: Keechin <1712699+gkeechin@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marcus Neo <81731201+marcus-datature@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.