Merge pull request #89 from crystian/dev

AMD fix

__init__.py

@@ -2,7 +2,7 @@
 @author: Crystian
 @title: Crystools
 @nickname: Crystools
-@version: 1.15.0
+@version: 1.15.1
 @project: "https://github.com/crystian/ComfyUI-Crystools",
 @description: Plugins for multiples uses, mainly for debugging, you need them! IG: https://www.instagram.com/crystian.ia
 """

core/version.py

@@ -1 +1 @@
-version = "1.15.0"
+version = "1.15.1"

general/gpu.py

@@ -43,6 +43,18 @@ def __init__(self):
 
         self.anygpuLoaded = self.pynvmlLoaded or self.pyamdLoaded
 
+        try:
+            self.torchDevice = comfy.model_management.get_torch_device_name(comfy.model_management.get_torch_device())
+        except Exception as e:
+            logger.error('Could not pick default device.' + str(e))
+
+        # ZLUDA Check, self.torchDevice has 'ZLUDA' in it.
+        if 'zluda' in self.torchDevice or 'ZLUDA' in self.torchDevice or 'Zluda' in self.torchDevice:
+            logger.warn('ZLUDA detected. GPU monitoring will be disabled.')
+            self.anygpuLoaded = False
+            self.pyamdLoaded = False
+            self.pynvmlLoaded = False
+
         if self.anygpuLoaded and self.deviceGetCount() > 0:
             self.cudaDevicesFound = self.deviceGetCount()
 
@@ -73,11 +85,6 @@ def __init__(self):
         else:
             logger.warn('No GPU with CUDA detected.')
 
-        try:
-            self.torchDevice = comfy.model_management.get_torch_device_name(comfy.model_management.get_torch_device())
-        except Exception as e:
-            logger.error('Could not pick default device.' + str(e))
-
         self.cudaDevice = 'cpu' if self.torchDevice == 'cpu' else 'cuda'
         self.cudaAvailable = torch.cuda.is_available()
 

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-crystools"
 description = "With this suit, you can see the resources monitor, progress bar & time elapsed, metadata and compare between two images, compare between two JSONs, show any value to console/display, pipes, and more!\nThis provides better nodes to load/save images, previews, etc, and see \"hidden\" data without loading a new workflow."
-version = "1.15.0"
+version = "1.15.1"
 license = "LICENSE"
 dependencies = ["deepdiff", "torch", "numpy", "Pillow>=9.5.0", "pynvml", "py-cpuinfo>=9.0.0", "pyrsmi"]
 

requirements.txt

@@ -4,5 +4,6 @@ numpy
 Pillow>=9.5.0
 pynvml
 py-cpuinfo>=9.0.0
-pyrsmi
 piexif
+--extra-index-url https://test.pypi.org/simple
+pyrsmi==0.0.6

version

@@ -1 +1 @@
-1.15.0
+1.15.1