Browse Source

removed chainer-dependency

Dimitri Korsch 2 năm trước cách đây
mục cha
commit
324607e79a

+ 1 - 1
cvdatasets/_version.py

@@ -1 +1 @@
-__version__ = "0.11.0"
+__version__ = "0.12.0"

+ 2 - 0
cvdatasets/annotation/types/__init__.py

@@ -16,6 +16,8 @@ class AnnotationArgs(typing.NamedTuple):
 	parts: str
 	feature_model: str
 
+	test_fold_id: int = 0
+
 class AnnotationType(BaseChoiceType):
 	FOLDER = FolderAnnotations
 	FILE_LIST = FileListAnnotations

+ 13 - 3
cvdatasets/dataset/mixins/transform.py

@@ -1,5 +1,15 @@
 import abc
-import chainer
+
+try:
+	import chainer
+	def is_train() -> bool:
+		return chainer.config.train
+except ImportError as e:
+	""" other frameworks (e.g., PyTorch) do not have this global flag """
+	def is_train() -> bool:
+		return False
+
+
 
 from cvdatasets.dataset.image.size import Size
 from cvdatasets.dataset.mixins.base import BaseMixin
@@ -22,7 +32,7 @@ class TransformMixin(BaseMixin):
 
 	@property
 	def size(self):
-		if chainer.config.train:
+		if is_train():
 			return self._size // 0.875
 		else:
 			return self._size
@@ -33,7 +43,7 @@ class TransformMixin(BaseMixin):
 
 	@property
 	def part_size(self):
-		if chainer.config.train:
+		if is_train():
 			return self._part_size // 0.875
 		else:
 			return self._part_size

+ 3 - 0
requirements.txt

@@ -3,5 +3,8 @@ numpy
 pillow~=9.0
 matplotlib
 pyyaml
+simplejson
+networkx
+scikit-image
 
 cvargparse~=0.5