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.

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

removing fiftyone as a hard dependency #1055

Merged
merged 5 commits into from
Feb 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/build-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ jobs:
- name: Install package
run: |
pip install numpy
pip install fiftyone
pip install -e .
python -c "from icevision.all import *"
1 change: 1 addition & 0 deletions .github/workflows/ci-all-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
run: |
sh ./icevision_install.sh cpu
pip install -e ".[all,dev]"
pip install fiftyone

- name: Lint with flake8
run: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/mk-docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
run: |
sh ./icevision_install.sh cpu
pip install -e ".[all,dev]"
pip install fiftyone


- name: Prepare the docs
Expand Down
5 changes: 4 additions & 1 deletion icevision/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
from icevision.data.dataset import *
from icevision.data.prediction import *
from icevision.data.convert_records_to_coco_style import *
from icevision.data.convert_records_to_fo import *
from icevision.soft_dependencies import SoftDependencies

if SoftDependencies.fiftyone:
from icevision.data.convert_records_to_fo import *
29 changes: 28 additions & 1 deletion notebooks/SAHI_inference.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,13 @@
"id": "tDqKafel8YYC"
}
},
{
"cell_type": "markdown",
"source": [
"Install from pypi..."
],
"metadata": {}
},
{
"cell_type": "code",
"execution_count": null,
Expand All @@ -1421,13 +1428,33 @@
"!wget https://raw.githubusercontent.com/airctic/icevision/master/icevision_install.sh\n",
"\n",
"# Choose your installation target: cuda11 or cuda10 or cpu\n",
"!bash icevision_install.sh cuda11 master"
"!bash icevision_install.sh cuda11"
],
"outputs": [],
"metadata": {
"id": "Hj0HbxBKVZzr"
}
},
{
"cell_type": "markdown",
"source": [
"... or from icevision master"
],
"metadata": {}
},
{
"cell_type": "code",
"execution_count": null,
"source": [
"# # Torch - Torchvision - IceVision - IceData - MMDetection - YOLOv5 - EfficientDet Installation\n",
"# !wget https://raw.githubusercontent.com/airctic/icevision/master/icevision_install.sh\n",
"\n",
"# # Choose your installation target: cuda11 or cuda10 or cpu\n",
"# !bash icevision_install.sh cuda11 master"
],
"outputs": [],
"metadata": {}
},
{
"cell_type": "markdown",
"source": [
Expand Down
Loading