replace broken ffmpeg

ai-dock · Dec 4, 2023 · bd274d9 · bd274d9
1 parent 5913507
commit bd274d9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/build/COPY_ROOT/opt/ai-dock/bin/build/layer0/amd.sh b/build/COPY_ROOT/opt/ai-dock/bin/build/layer0/amd.sh
@@ -13,9 +13,9 @@ python_lock=$(micromamba -n $MAMBA_DEFAULT_ENV run python -V|awk '{print $2}'|cu
 $MAMBA_INSTALL -n $MAMBA_DEFAULT_ENV \
     -c pytorch \
     -c conda-forge \
-    pytorch=${PYTORCH_VERSION} torchvision torchaudio \
-    python=${python_lock} \
-    --only-deps
+        pytorch=${PYTORCH_VERSION} torchvision torchaudio \
+        python=${python_lock} \
+        --only-deps
 # Now pip install...
 micromamba -n $MAMBA_DEFAULT_ENV run pip install \
     --no-cache-dir \

diff --git a/build/COPY_ROOT/opt/ai-dock/bin/build/layer0/common.sh b/build/COPY_ROOT/opt/ai-dock/bin/build/layer0/common.sh
@@ -4,5 +4,9 @@
 set -eo pipefail
 
 # For logic common to cpu, cuda & rocm
+$MAMBA_INSTALL -n $MAMBA_DEFAULT_ENV \
+    -c pytorch \
+    -c conda-forge \
+        ffmpeg">=4.3.1"
 
 exit 0
diff --git a/build/COPY_ROOT/opt/ai-dock/bin/build/layer0/cpu.sh b/build/COPY_ROOT/opt/ai-dock/bin/build/layer0/cpu.sh
@@ -10,6 +10,8 @@ python_lock=$(micromamba -n $MAMBA_DEFAULT_ENV run python -V|awk '{print $2}'|cu
 $MAMBA_INSTALL -n $MAMBA_DEFAULT_ENV \
     -c pytorch \
     -c conda-forge \
-    python=${python_lock} \
-    pytorch=${PYTORCH_VERSION} torchvision torchaudio cpuonly \
+        python=${python_lock} \
+        pytorch=${PYTORCH_VERSION} torchvision \
+        torchaudio \
+        cpuonly