Merge branch 'main' of github.com:CERES-Sorbonne/Panoptic

CERES-Sorbonne · Jan 17, 2025 · 0c68bd7 · 0c68bd7
2 parents d0042a8 + 9afaf65
commit 0c68bd7
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 344 deletions.
diff --git a/install/panoptic_uv.exe b/install/panoptic_uv.exe
diff --git a/install/windows/panoptic.exe b/install/windows/panoptic.exe
diff --git a/install/windows/panoptic.ico b/install/windows/panoptic.ico
diff --git a/install/windows/panoptic_launcher.py b/install/windows/panoptic_launcher.py
diff --git a/install/windows/panoptic_launcher_uv.bat b/install/windows/panoptic_launcher_uv.bat
diff --git a/install/windows/panoptic_launcher_uv.py b/install/windows/panoptic_launcher_uv.py
@@ -39,6 +39,10 @@ def run_command(command, check=False, capture_output=False, shell=True):
 # Vérifier si panoptic est installé, sinon l'installer
 if run_command("uv pip show panoptic", capture_output=True).returncode != 0:
     run_command("uv pip install panoptic")
+    with_cuda = input(
+        "Si vous possédez une carte graphique NVIDIA vous pouvez également installer une version optimisée mais plus lourde du programme: (O/N").strip().lower()
+    if with_cuda == 'o':
+        run_command("uv pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121")
 
 # Vérifier si panoptic est obsolète
 outdated = run_command("uv pip list --outdated", capture_output=True).stdout
@@ -49,7 +53,12 @@ def run_command(command, check=False, capture_output=False, shell=True):
 else:
     print("La dernière version de panoptic est déjà installée.")
 
+
+run_command("uv run panoptic")
+
 # Activer l'environnement virtuel et lancer panoptic
-venv_activate = panoptic_dir / ".venv" / "Scripts" / "activate"
-panoptic_exe = panoptic_dir / ".venv" / "Scripts" / "panoptic"
-subprocess.run(f"call {venv_activate} & call {panoptic_exe}", shell=True)
+# venv_activate = panoptic_dir / ".venv" / "Scripts" / "activate"
+# panoptic_exe = panoptic_dir / ".venv" / "Scripts" / "panoptic"
+# subprocess.run(f"call {venv_activate} & call {panoptic_exe}", shell=True)
+
+# pyinstaller --onefile --noconsole --icon=panoptic.ico panoptic_launcher_uv.py
diff --git a/install/windows/panoptic_uv.exe b/install/windows/panoptic_uv.exe
diff --git a/install/windows/start_panoptic_windows.cmd b/install/windows/start_panoptic_windows.cmd
diff --git a/install/windows/start_panoptic_windows.ps1 b/install/windows/start_panoptic_windows.ps1