Merge pull request #6 from ins-amu/develop

Develop

Dockerfile

@@ -25,4 +25,4 @@ RUN pip install --no-cache-dir hatchling setuptools wheel && \
 ARG GPU_SUPPORT=false
 RUN if [ "$GPU_SUPPORT" = "true" ]; then pip install cupy; fi
 
-CMD ["python", "-c", "from vbi.utils import test_imports; test_imports()"]
+CMD ["python", "-c", "from vbi.utils import test_imports; test_imports()"]

README.md

@@ -28,9 +28,6 @@ To use the Docker image, you can pull it from the GitHub Container Registry and
 
 ```bash
     docker run --rm -it ghcr.io/ins-amu/vbi:main python3 -c 'from vbi.utils import test_imports; test_imports()'
-
-    # if gpu available:
-    docker run --rm -it --gpus all -e GPU_SUPPORT=true ghcr.io/ins-amu/vbi:main python3 -c 'from vbi.utils import test_imports; test_imports()'
 ```
 
 

vbi/feature_extraction/features.py

@@ -924,12 +924,12 @@ def fc_stat(
     info, ts = prepare_input_ts(ts)
     if not info:
         if verbose:
-            print("Error in fc_stat")
-        return [np.nan], ["fc_stat_0"]
+            print("Error in fc_")
+        return [np.nan], ["fc_0"]
 
     nn = ts.shape[0]
     if nn < 2:
-        return [np.nan], ["fc_stat_0"]
+        return [np.nan], ["fc_0"]
 
     if masks is None:
         masks = {"full": np.ones((nn, nn))}
@@ -953,7 +953,7 @@ def fc_stat(
             eigenvalues=eigenvalues,
             pca_num_components=pca_num_components,
         )
-        labels = [f"fc_stat_{key}_{label}" for label in labels]
+        labels = [f"fc_{key}_{label}" for label in labels]
         Values.extend(values)
         Labels.extend(labels)
 

vbi/feature_extraction/features_utils.py

@@ -781,7 +781,7 @@ def matrix_stat(
         for f in features:
             v = eval(f)(np.real(eigen_vals_A[:-1]))
             values.append(v)
-            labels.append(f"full_{f}")
+            labels.append(f"eig_{f}")
 
     for f in features:
         v = eval(f)(A_ut)

vbi/utils.py

@@ -353,14 +353,14 @@ def test_imports():
     try:
         import torch
         print(f"torch: {torch.__version__}")
-        print(f"GPU available: {torch.cuda.is_available()}")
+        print(f"GPU available: {torch.cuda.is_available()=}")
     except ImportError:
         print("torch not found")
 
     try:
         import cupy
         print(f"cupy: {cupy.__version__}")
-        print(f"GPU available: {cupy.cuda.is_available()}")
+        print(f"GPU available: {cupy.cuda.is_available()=}")
     except ImportError:
         print("cupy not found")