Skip to content

Commit 7a6f680

Browse files
Remove segment-anything in setup.cfg (#8010)
Fixes #8009 ### Description Remove segment-anything in setup.cfg ### Types of changes <!--- Put an `x` in all the boxes that apply, and remove the not applicable items --> - [x] Non-breaking change (fix or new feature that would not break existing functionality). - [ ] Breaking change (fix or new feature that would cause existing functionality to change). - [ ] New tests added to cover the changes. - [ ] Integration tests passed locally by running `./runtests.sh -f -u --net --coverage`. - [ ] Quick tests passed locally by running `./runtests.sh --quick --unittests --disttests`. - [ ] In-line docstrings updated. - [ ] Documentation updated, tested `make html` command in the `docs/` folder. --------- Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 250c18d commit 7a6f680

File tree

7 files changed

+24
-25
lines changed

7 files changed

+24
-25
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
python-version: ${{ matrix.python-version }}
2525
- name: Install setuptools
2626
run: |
27-
python -m pip install --user --upgrade setuptools wheel
27+
python -m pip install --user --upgrade setuptools wheel packaging
2828
- name: Build and test source archive and wheel file
2929
run: |
3030
find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \;
@@ -104,7 +104,7 @@ jobs:
104104
run: |
105105
find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \;
106106
git describe
107-
python -m pip install --user --upgrade setuptools wheel
107+
python -m pip install --user --upgrade setuptools wheel packaging
108108
python setup.py build
109109
cat build/lib/monai/_version.py
110110
- name: Upload version

setup.cfg

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ all =
8585
nvidia-ml-py
8686
huggingface_hub
8787
pyamg>=5.0.0
88-
segment-anything
8988
nibabel =
9089
nibabel
9190
ninja =
@@ -168,8 +167,8 @@ huggingface_hub =
168167
huggingface_hub
169168
pyamg =
170169
pyamg>=5.0.0
171-
segment-anything =
172-
segment-anything @ git+https://github.com/facebookresearch/segment-anything@6fdee8f2727f4506cfbbe553e23b895e27956588#egg=segment-anything
170+
# segment-anything =
171+
# segment-anything @ git+https://github.com/facebookresearch/segment-anything@6fdee8f2727f4506cfbbe553e23b895e27956588#egg=segment-anything
173172

174173
[flake8]
175174
select = B,C,E,F,N,P,T4,W,B9

tests/ngc_bundle_download.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def test_loading_mmar(self, item):
127127
in_channels=1,
128128
img_size=(96, 96, 96),
129129
patch_size=(16, 16, 16),
130-
pos_embed="conv",
130+
proj_type="conv",
131131
hidden_size=768,
132132
mlp_dim=3072,
133133
)

tests/test_handler_ignite_metric.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import torch
1717
from parameterized import parameterized
1818

19-
from monai.handlers import IgniteMetric, IgniteMetricHandler, from_engine
19+
from monai.handlers import IgniteMetricHandler, from_engine
2020
from monai.losses import DiceLoss
2121
from monai.metrics import LossMetric
2222
from tests.utils import SkipIfNoModule, assert_allclose, optional_import
@@ -172,7 +172,7 @@ def _val_func(engine, batch):
172172
@parameterized.expand(TEST_CASES[0:2])
173173
def test_old_ignite_metric(self, input_param, input_data, expected_val):
174174
loss_fn = DiceLoss(**input_param)
175-
ignite_metric = IgniteMetric(loss_fn=loss_fn, output_transform=from_engine(["pred", "label"]))
175+
ignite_metric = IgniteMetricHandler(loss_fn=loss_fn, output_transform=from_engine(["pred", "label"]))
176176

177177
def _val_func(engine, batch):
178178
pass

tests/test_patchembedding.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"patch_size": (patch_size,) * nd,
4444
"hidden_size": hidden_size,
4545
"num_heads": num_heads,
46-
"pos_embed": proj_type,
46+
"proj_type": proj_type,
4747
"pos_embed_type": pos_embed_type,
4848
"dropout_rate": dropout_rate,
4949
},
@@ -127,7 +127,7 @@ def test_ill_arg(self):
127127
patch_size=(16, 16, 16),
128128
hidden_size=128,
129129
num_heads=12,
130-
pos_embed="conv",
130+
proj_type="conv",
131131
pos_embed_type="sincos",
132132
dropout_rate=5.0,
133133
)
@@ -139,7 +139,7 @@ def test_ill_arg(self):
139139
patch_size=(64, 64, 64),
140140
hidden_size=512,
141141
num_heads=8,
142-
pos_embed="perceptron",
142+
proj_type="perceptron",
143143
pos_embed_type="sincos",
144144
dropout_rate=0.3,
145145
)
@@ -151,7 +151,7 @@ def test_ill_arg(self):
151151
patch_size=(8, 8, 8),
152152
hidden_size=512,
153153
num_heads=14,
154-
pos_embed="conv",
154+
proj_type="conv",
155155
dropout_rate=0.3,
156156
)
157157

@@ -162,7 +162,7 @@ def test_ill_arg(self):
162162
patch_size=(4, 4, 4),
163163
hidden_size=768,
164164
num_heads=8,
165-
pos_embed="perceptron",
165+
proj_type="perceptron",
166166
dropout_rate=0.3,
167167
)
168168
with self.assertRaises(ValueError):
@@ -183,7 +183,7 @@ def test_ill_arg(self):
183183
patch_size=(16, 16, 16),
184184
hidden_size=768,
185185
num_heads=12,
186-
pos_embed="perc",
186+
proj_type="perc",
187187
dropout_rate=0.3,
188188
)
189189

tests/test_unetr.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
for num_heads in [8]:
3131
for mlp_dim in [3072]:
3232
for norm_name in ["instance"]:
33-
for pos_embed in ["perceptron"]:
33+
for proj_type in ["perceptron"]:
3434
for nd in (2, 3):
3535
test_case = [
3636
{
@@ -42,7 +42,7 @@
4242
"norm_name": norm_name,
4343
"mlp_dim": mlp_dim,
4444
"num_heads": num_heads,
45-
"pos_embed": pos_embed,
45+
"proj_type": proj_type,
4646
"dropout_rate": dropout_rate,
4747
"conv_block": True,
4848
"res_block": False,
@@ -75,7 +75,7 @@ def test_ill_arg(self):
7575
hidden_size=128,
7676
mlp_dim=3072,
7777
num_heads=12,
78-
pos_embed="conv",
78+
proj_type="conv",
7979
norm_name="instance",
8080
dropout_rate=5.0,
8181
)
@@ -89,7 +89,7 @@ def test_ill_arg(self):
8989
hidden_size=512,
9090
mlp_dim=3072,
9191
num_heads=12,
92-
pos_embed="conv",
92+
proj_type="conv",
9393
norm_name="instance",
9494
dropout_rate=0.5,
9595
)
@@ -103,7 +103,7 @@ def test_ill_arg(self):
103103
hidden_size=512,
104104
mlp_dim=3072,
105105
num_heads=14,
106-
pos_embed="conv",
106+
proj_type="conv",
107107
norm_name="batch",
108108
dropout_rate=0.4,
109109
)
@@ -117,7 +117,7 @@ def test_ill_arg(self):
117117
hidden_size=768,
118118
mlp_dim=3072,
119119
num_heads=12,
120-
pos_embed="perc",
120+
proj_type="perc",
121121
norm_name="instance",
122122
dropout_rate=0.2,
123123
)

tests/test_vitautoenc.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
for in_channels in [1, 4]:
2424
for img_size in [64, 96, 128]:
2525
for patch_size in [16]:
26-
for pos_embed in ["conv", "perceptron"]:
26+
for proj_type in ["conv", "perceptron"]:
2727
for nd in [2, 3]:
2828
test_case = [
2929
{
@@ -34,7 +34,7 @@
3434
"mlp_dim": 3072,
3535
"num_layers": 4,
3636
"num_heads": 12,
37-
"pos_embed": pos_embed,
37+
"proj_type": proj_type,
3838
"dropout_rate": 0.6,
3939
"spatial_dims": nd,
4040
},
@@ -54,7 +54,7 @@
5454
"mlp_dim": 3072,
5555
"num_layers": 4,
5656
"num_heads": 12,
57-
"pos_embed": "conv",
57+
"proj_type": "conv",
5858
"dropout_rate": 0.6,
5959
"spatial_dims": 3,
6060
},
@@ -93,7 +93,7 @@ def test_shape(self, input_param, input_shape, expected_shape):
9393
]
9494
)
9595
def test_ill_arg(
96-
self, in_channels, img_size, patch_size, hidden_size, mlp_dim, num_layers, num_heads, pos_embed, dropout_rate
96+
self, in_channels, img_size, patch_size, hidden_size, mlp_dim, num_layers, num_heads, proj_type, dropout_rate
9797
):
9898
with self.assertRaises(ValueError):
9999
ViTAutoEnc(
@@ -104,7 +104,7 @@ def test_ill_arg(
104104
mlp_dim=mlp_dim,
105105
num_layers=num_layers,
106106
num_heads=num_heads,
107-
pos_embed=pos_embed,
107+
proj_type=proj_type,
108108
dropout_rate=dropout_rate,
109109
)
110110

0 commit comments

Comments
 (0)