Pre-install numpy for Python 3.10

2022-02-23 05:59:57 -08:00
parent 5377435bf3
commit 8272a3239e
1 changed files with 5 additions and 4 deletions
@@ -32,10 +32,6 @@ python -m pip install --upgrade pip
 version=$(python -V | cut -f 2 -d ' ' | cut -f 1,2 -d .)
 reqs_file='requirements.txt'

-if [ "$version" == "3.10" ]; then
-  (cd .dfl/DeepFaceLab; git checkout support-opencv45)
-fi
-
 version_suffix=''
 if [[ ! -z "$version" && -f "requirements_$version.txt" ]]; then
  version_suffix="_$version"
@@ -66,6 +62,11 @@ if is_arm64; then

  h5py_pkg="$(cat $reqs_file | grep -E 'h5py==.+')"
  HDF5_DIR="$(brew --prefix hdf5)" pip --no-cache-dir install --no-build-isolation "$h5py_pkg"
+elif [ "$version" == "3.10" ]; then
+  (cd .dfl/DeepFaceLab; git checkout support-opencv45)
+
+  numpy_pkg="$(cat $reqs_file | grep -E 'numpy==.+')"
+  pip install "$numpy_pkg"
 fi

 pip --no-cache-dir install -r $reqs_file