chore(deps): bump the python-packages group across 1 directory with 3 updates

.github/workflows/maintests.yml

@@ -38,6 +38,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
+      - name: Find and delete '+cu124' from requirements.txt (github runner doesn't support cuda)
+        run: sed -i 's/+cu124//g' requirements.txt
       - name: Install tox and any other packages
         run: |
           python -m pip install --upgrade pip

.github/workflows/prtests.yml

@@ -45,6 +45,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
+      - name: Find and delete '+cu124' from requirements.txt (github runner doesn't support cuda)
+        run: sed -i 's/+cu124//g' requirements.txt
       - name: Install tox and any other packages
         run: |
           python -m pip install --upgrade pip

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

environment.yaml → environment.linux.yaml

@@ -8,4 +8,4 @@ dependencies:
   - nvidia::cuda-toolkit
   - git
   - pip
-  - python==3.10.12
+  - python==3.11.6

environment.windows.yaml

@@ -0,0 +1,14 @@
+name: ldm
+channels:
+  - nvidia
+  - conda-forge
+  - peterjc123
+  - defaults
+# 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
+  - git
+  - pip
+  - python==3.11.6
+  - vc
+  - vs2017_runtime

requirements.dev.txt

@@ -1,4 +1,4 @@
-pytest==8.3.1
+pytest==8.3.2
 mypy==1.11.0
 black==24.4.2
 ruff==0.5.4

requirements.rocm.txt

@@ -1,5 +1,5 @@
-numpy==1.26.4
-torch==2.3.1+rocm6.0
+numpy==2.0.1
+torch==2.4.0
 
 horde_sdk~=0.14.0
 horde_safety~=0.2.3

requirements.txt

@@ -1,10 +1,12 @@
-numpy==1.26.4
-torch>=2.3.1
-
-horde_sdk~=0.14.0
-horde_safety~=0.2.3
 horde_engine~=2.13.3
+horde_sdk>=0.14.0
 horde_model_reference>=0.8.1
+horde_safety~=0.2.3
+
+numpy==2.0.1
+torch==2.4.0
+
+mkl_fft
 
 python-dotenv
 ruamel.yaml

tox.ini

@@ -28,7 +28,8 @@ deps =
     pytest-sugar
     pytest-cov
     requests
-    -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cu121
+    numpy==1.26.4
+    -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cu124
 commands =
     pytest tests {posargs} --cov
 
@@ -41,6 +42,7 @@ deps =
     pytest-sugar
     pytest-cov
     requests
+    numpy==1.26.4
     -r requirements.txt
 commands =
     pytest tests {posargs} --ignore-glob=*api_calls.py --cov

update-runtime.cmd

@@ -33,7 +33,7 @@ if defined scribe (
   SET CONDA_ENVIRONMENT_FILE=environment_scribe.yaml
 
 ) else (
-  SET CONDA_ENVIRONMENT_FILE=environment.yaml
+  SET CONDA_ENVIRONMENT_FILE=environment.windows.yaml
 )
 
 Reg add "HKLM\SYSTEM\CurrentControlSet\Control\FileSystem" /v "LongPathsEnabled" /t REG_DWORD /d "1" /f 2>nul
@@ -49,14 +49,16 @@ micromamba.exe shell hook -s cmd.exe -p %MAMBA_ROOT_PREFIX% -v
 call "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat"
 call "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" activate windows
 
+python -s -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cu124 -U
+
 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 --extra-index-url https://download.pytorch.org/whl/cu124 -U
   )
 )
 call deactivate

update-runtime.sh

@@ -24,7 +24,7 @@ esac
 shift # past argument or value
 done
 
-CONDA_ENVIRONMENT_FILE=environment.yaml
+CONDA_ENVIRONMENT_FILE=environment.linux.yaml
 
 wget -qO- https://github.com/mamba-org/micromamba-releases/releases/latest/download/micromamba-linux-64.tar.bz2 | tar -xvj bin/micromamba
 if [ ! -f "conda/envs/linux/bin/python" ]; then
@@ -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