build: use py 3.11 and cuda 12.4 by default

Haidra-Org · Jul 25, 2024 · 6f4498e · 6f4498e
1 parent 0fc1954
commit 6f4498e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/README_advanced.md b/README_advanced.md
@@ -39,7 +39,7 @@
 ### Get worker files and install dependencies
 - `git clone https://github.com/Haidra-Org/horde-worker-reGen.git`
 - `cd .\horde-worker-reGen\`
-- `pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cu121`
+- `pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cu124`
 
 ### Run worker
 - Set your config now, copying `bridgeData_template.yaml` to `bridgeData.yaml`, being sure to set an API key and worker name at a minimum

diff --git a/environment.linux.yaml b/environment.linux.yaml
@@ -8,4 +8,4 @@ dependencies:
   - nvidia::cuda-toolkit
   - git
   - pip
-  - python==3.10.12
+  - python==3.11.6
diff --git a/environment.windows.yaml b/environment.windows.yaml
@@ -6,7 +6,6 @@ channels:
 # These should only contain the minimal essentials to get the binaries going, everything else is managed in requirements.txt to keep it universal.
 dependencies:
   - nvidia::cuda-toolkit
-  - anaconda::vs2015_runtime
   - git
   - pip
-  - python==3.10.12
+  - python==3.11.6
diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,11 @@
+horde_engine~=2.13.3
+horde_sdk>=0.14.0
+horde_model_reference>=0.8.1
+horde_safety~=0.2.3
+
 numpy==1.26.4
 torch>=2.3.1
 
-horde_sdk~=0.14.0
-horde_safety~=0.2.3
-horde_engine~=2.13.3
-horde_model_reference>=0.8.1
 
 python-dotenv
 ruamel.yaml

diff --git a/tox.ini b/tox.ini
@@ -28,7 +28,7 @@ deps =
     pytest-sugar
     pytest-cov
     requests
-    -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cu121
+    -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cu124
 commands =
     pytest tests {posargs} --cov
 

diff --git a/update-runtime.cmd b/update-runtime.cmd
@@ -51,12 +51,12 @@ call "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" activate windows
 
 if defined hordelib (
   python -s -m pip uninstall -y hordelib horde_engine horde_model_reference
-  python -s -m pip install horde_engine horde_model_reference --extra-index-url https://download.pytorch.org/whl/cu121
+  python -s -m pip install horde_engine horde_model_reference --extra-index-url https://download.pytorch.org/whl/cu124
 ) else (
   if defined scribe (
     python -s -m pip install -r requirements-scribe.txt
   ) else (
-    python -s -m pip install -r requirements.txt -U --extra-index-url https://download.pytorch.org/whl/cu121
+    python -s -m pip install -r requirements.txt -U --extra-index-url https://download.pytorch.org/whl/cu124 -U
   )
 )
 call deactivate

diff --git a/update-runtime.sh b/update-runtime.sh
@@ -34,7 +34,7 @@ bin/micromamba create --no-shortcuts -r conda -n linux -f ${CONDA_ENVIRONMENT_FI
 
 if [ "$hordelib" = true ]; then
  bin/micromamba run -r conda -n linux python -s -m pip uninstall -y hordelib horde_engine horde_sdk horde_model_reference
- bin/micromamba run -r conda -n linux python -s -m pip install horde_engine horde_model_reference --extra-index-url https://download.pytorch.org/whl/cu121
+ bin/micromamba run -r conda -n linux python -s -m pip install horde_engine horde_model_reference --extra-index-url https://download.pytorch.org/whl/cu124
 else
- bin/micromamba run -r conda -n linux python -s -m pip install -r requirements.txt -U --extra-index-url https://download.pytorch.org/whl/cu121
+ bin/micromamba run -r conda -n linux python -s -m pip install -r requirements.txt -U --extra-index-url https://download.pytorch.org/whl/cu124 -U
 fi