quadra 2.2.2__tar.gz → 2.2.3rc1__tar.gz

{quadra-2.2.2 → quadra-2.2.3rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quadra
-Version: 2.2.2
+Version: 2.2.3rc1
 Summary: Deep Learning experiment orchestration library
 Home-page: https://orobix.github.io/quadra
 License: Apache-2.0
@@ -21,9 +21,9 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: onnx
 Requires-Dist: albumentations (>=1.3,<1.4)
-Requires-Dist: anomalib-orobix (==0.7.0.dev140)
+Requires-Dist: anomalib-orobix (==0.7.0.dev141)
 Requires-Dist: boto3 (>=1.26,<1.27)
-Requires-Dist: grad_cam (==1.4.6)
+Requires-Dist: grad-cam-orobix (==1.5.3.dev001)
 Requires-Dist: h5py (>=3.8,<3.9)
 Requires-Dist: hydra_colorlog (>=1.2,<1.3)
 Requires-Dist: hydra_core (>=1.3,<1.4)

{quadra-2.2.2 → quadra-2.2.3rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "quadra"
-version = "2.2.2"
+version = "2.2.3-rc1"
 description = "Deep Learning experiment orchestration library"
 authors = [
 	"Federico Belotti <federico.belotti@orobix.com>",
@@ -60,7 +60,7 @@ python_dotenv = "~0.21"
 rich = "~13.2"
 scikit_learn = "~1.2"
 pydantic = "1.10.10"
-grad_cam = "1.4.6"
+grad-cam-orobix = "1.5.3.dev001"
 matplotlib = "~3.6"
 seaborn = "~0.12"
 albumentations = "~1.3"
@@ -72,7 +72,7 @@ h5py = "~3.8"
 timm = "0.9.12"
 
 segmentation_models_pytorch-orobix = "0.3.3.dev1"
-anomalib-orobix = "0.7.0.dev140"
+anomalib-orobix = "0.7.0.dev141"
 xxhash = "~3.2"
 torchinfo = "~1.8"
 typing_extensions = { version = "4.11.0", python = "<3.10" }

{quadra-2.2.2 → quadra-2.2.3rc1}/quadra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.2"
+__version__ = "2.2.3"
 
 
 def get_version():

{quadra-2.2.2 → quadra-2.2.3rc1}/quadra/modules/classification/base.py

@@ -138,13 +138,9 @@ class ClassificationModule(BaseLightningModule):
         if isinstance(self.model.features_extractor, timm.models.resnet.ResNet):
             target_layers = [cast(BaseNetworkBuilder, self.model).features_extractor.layer4[-1]]
 
-            # Get model current device
-            device = next(self.model.parameters()).device
-
             self.cam = GradCAM(
                 model=self.model,
                 target_layers=target_layers,
-                use_cuda=device.type == "cuda",
             )
             # Activating gradients
             for p in self.model.features_extractor.layer4[-1].parameters():
@@ -262,7 +258,7 @@ class MultilabelClassificationModule(BaseLightningModule):
                 self.gradcam = False
             else:
                 target_layers = [model[0].features_extractor.layer4[-1]]
-                self.cam = GradCAM(model=model, target_layers=target_layers, use_cuda=torch.cuda.is_available())
+                self.cam = GradCAM(model=model, target_layers=target_layers)
 
     def forward(self, x):
         return self.model(x)

{quadra-2.2.2 → quadra-2.2.3rc1}/quadra/tasks/classification.py

@@ -1138,7 +1138,6 @@ class ClassificationEvaluation(Evaluation[ClassificationDataModuleT]):
             self.cam = GradCAM(
                 model=self.deployment_model.model,
                 target_layers=target_layers,
-                use_cuda=(self.device != "cpu"),
             )
             for p in self.deployment_model.model.features_extractor.layer4[-1].parameters():
                 p.requires_grad = True

{quadra-2.2.2 → quadra-2.2.3rc1}/quadra/utils/models.py

@@ -131,7 +131,6 @@ def get_feature(
             cam = GradCAM(
                 model=feature_extractor,
                 target_layers=target_layers,
-                use_cuda=torch.cuda.is_available(),
             )
             for p in feature_extractor.features_extractor.layer4[-1].parameters():
                 p.requires_grad = True