Skip to content

Commit 9c17564

Browse files
FraPochettiFrancesco Pochetti
and
Francesco Pochetti
authored
removing fiftyone as a hard dependency (#1055)
* removing fiftyone as a hard dependency * removing fiftyone from ci * wip * adding Colab disclaimer to fiftyone nb + make sure all nbs install icevision from pypi * add master install script in nbs Co-authored-by: Francesco Pochetti <[email protected]>
1 parent 411101d commit 9c17564

21 files changed

+4131
-3685
lines changed

.github/workflows/build-pkg.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ jobs:
2424
- name: Install package
2525
run: |
2626
pip install numpy
27-
pip install fiftyone
2827
pip install -e .
2928
python -c "from icevision.all import *"

.github/workflows/ci-all-testing.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
run: |
2727
sh ./icevision_install.sh cpu
2828
pip install -e ".[all,dev]"
29+
pip install fiftyone
2930
3031
- name: Lint with flake8
3132
run: |

.github/workflows/mk-docs-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
run: |
3030
sh ./icevision_install.sh cpu
3131
pip install -e ".[all,dev]"
32-
pip install fiftyone
3332
3433
3534
- name: Prepare the docs

icevision/data/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
from icevision.data.dataset import *
44
from icevision.data.prediction import *
55
from icevision.data.convert_records_to_coco_style import *
6-
from icevision.data.convert_records_to_fo import *
6+
from icevision.soft_dependencies import SoftDependencies
7+
8+
if SoftDependencies.fiftyone:
9+
from icevision.data.convert_records_to_fo import *

notebooks/SAHI_inference.ipynb

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1413,6 +1413,13 @@
14131413
"id": "tDqKafel8YYC"
14141414
}
14151415
},
1416+
{
1417+
"cell_type": "markdown",
1418+
"source": [
1419+
"Install from pypi..."
1420+
],
1421+
"metadata": {}
1422+
},
14161423
{
14171424
"cell_type": "code",
14181425
"execution_count": null,
@@ -1421,13 +1428,33 @@
14211428
"!wget https://raw.githubusercontent.com/airctic/icevision/master/icevision_install.sh\n",
14221429
"\n",
14231430
"# Choose your installation target: cuda11 or cuda10 or cpu\n",
1424-
"!bash icevision_install.sh cuda11 master"
1431+
"!bash icevision_install.sh cuda11"
14251432
],
14261433
"outputs": [],
14271434
"metadata": {
14281435
"id": "Hj0HbxBKVZzr"
14291436
}
14301437
},
1438+
{
1439+
"cell_type": "markdown",
1440+
"source": [
1441+
"... or from icevision master"
1442+
],
1443+
"metadata": {}
1444+
},
1445+
{
1446+
"cell_type": "code",
1447+
"execution_count": null,
1448+
"source": [
1449+
"# # Torch - Torchvision - IceVision - IceData - MMDetection - YOLOv5 - EfficientDet Installation\n",
1450+
"# !wget https://raw.githubusercontent.com/airctic/icevision/master/icevision_install.sh\n",
1451+
"\n",
1452+
"# # Choose your installation target: cuda11 or cuda10 or cpu\n",
1453+
"# !bash icevision_install.sh cuda11 master"
1454+
],
1455+
"outputs": [],
1456+
"metadata": {}
1457+
},
14311458
{
14321459
"cell_type": "markdown",
14331460
"source": [

0 commit comments

Comments
 (0)