From 83d95f75c53044a74bbf6423f767c391ee7171fb Mon Sep 17 00:00:00 2001 From: Oleksandr Chychkan Date: Tue, 2 Nov 2021 17:08:26 -0700 Subject: [PATCH 1/8] Add requirements file for Python 10 --- requirements_3.10.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 requirements_3.10.txt diff --git a/requirements_3.10.txt b/requirements_3.10.txt new file mode 100644 index 0000000..0e5beb3 --- /dev/null +++ b/requirements_3.10.txt @@ -0,0 +1,11 @@ +numpy==1.19.5 +opencv-contrib-python-headless==4.5.1.48 +scipy==1.7.1 +tensorflow==2.6.0 +colorama==0.4.4 +tqdm==4.62.3 +ffmpeg-python==0.2.0 +Pillow==8.4.0 +scikit-image==0.18.3 +h5py==3.1.0 +PyQt5==5.15.4 -- 2.52.0 From ca15476303f1181ec4cec4d28b324ba6769995dc Mon Sep 17 00:00:00 2001 From: Oleksandr Chychkan Date: Tue, 2 Nov 2021 17:14:44 -0700 Subject: [PATCH 2/8] Add Python 3.10 to GitHub Actions --- .github/workflows/verify-setup-catalina.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-setup-catalina.yml b/.github/workflows/verify-setup-catalina.yml index e7502b1..6a454f8 100644 --- a/.github/workflows/verify-setup-catalina.yml +++ b/.github/workflows/verify-setup-catalina.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 -- 2.52.0 From a8438d3d3a2171fbf75d5ec5291cff2cec345eb7 Mon Sep 17 00:00:00 2001 From: Oleksandr Chychkan Date: Tue, 2 Nov 2021 17:39:40 -0700 Subject: [PATCH 3/8] Upgrade opencv-contrib-python-headless to 4.5.4.58 for Python 10 --- requirements_3.10.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_3.10.txt b/requirements_3.10.txt index 0e5beb3..efe6335 100644 --- a/requirements_3.10.txt +++ b/requirements_3.10.txt @@ -1,5 +1,5 @@ numpy==1.19.5 -opencv-contrib-python-headless==4.5.1.48 +opencv-contrib-python-headless==4.5.4.58 scipy==1.7.1 tensorflow==2.6.0 colorama==0.4.4 -- 2.52.0 From 88830b93d0b8ec03d745d45aca275935ad017ecf Mon Sep 17 00:00:00 2001 From: Oleksandr Chychkan Date: Tue, 9 Nov 2021 19:35:12 -0800 Subject: [PATCH 4/8] Upgrade scipy to 1.7.2 for Python 3.10 --- requirements_3.10.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_3.10.txt b/requirements_3.10.txt index efe6335..54f3c18 100644 --- a/requirements_3.10.txt +++ b/requirements_3.10.txt @@ -1,6 +1,6 @@ numpy==1.19.5 opencv-contrib-python-headless==4.5.4.58 -scipy==1.7.1 +scipy==1.7.2 tensorflow==2.6.0 colorama==0.4.4 tqdm==4.62.3 -- 2.52.0 From d0a4d0f1842a4d7dcf7a4424f8c9a70febdd3b40 Mon Sep 17 00:00:00 2001 From: Oleksandr Chychkan Date: Tue, 22 Feb 2022 22:09:02 -0800 Subject: [PATCH 5/8] Upgrade multiple deps --- requirements_3.10.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/requirements_3.10.txt b/requirements_3.10.txt index 54f3c18..b5e7dd8 100644 --- a/requirements_3.10.txt +++ b/requirements_3.10.txt @@ -1,11 +1,12 @@ -numpy==1.19.5 +numpy==1.22.2 +numexpr==2.8.1 opencv-contrib-python-headless==4.5.4.58 -scipy==1.7.2 -tensorflow==2.6.0 +scipy==1.8.0 +tensorflow==2.8.0 colorama==0.4.4 tqdm==4.62.3 ffmpeg-python==0.2.0 Pillow==8.4.0 -scikit-image==0.18.3 -h5py==3.1.0 +scikit-image==0.19.2 +h5py==3.6.0 PyQt5==5.15.4 -- 2.52.0 From 5377435bf3a2a1e53b37963fed99a89c8efb9099 Mon Sep 17 00:00:00 2001 From: Oleksandr Chychkan Date: Tue, 22 Feb 2022 22:10:07 -0800 Subject: [PATCH 6/8] Use custom DFL branch for python 3.10 --- scripts/0_setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/0_setup.sh b/scripts/0_setup.sh index 54b5d31..c3ede23 100755 --- a/scripts/0_setup.sh +++ b/scripts/0_setup.sh @@ -32,6 +32,10 @@ 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" -- 2.52.0 From 8272a3239ec06da47d9e54ddb69112383ceb6d3a Mon Sep 17 00:00:00 2001 From: Oleksandr Chychkan Date: Wed, 23 Feb 2022 05:59:57 -0800 Subject: [PATCH 7/8] Pre-install numpy for Python 3.10 --- scripts/0_setup.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/0_setup.sh b/scripts/0_setup.sh index c3ede23..dea6d70 100755 --- a/scripts/0_setup.sh +++ b/scripts/0_setup.sh @@ -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 -- 2.52.0 From 1aeb4fc7b62ba52b2b495d68416e1841fd0ed185 Mon Sep 17 00:00:00 2001 From: Oleksandr Chychkan Date: Wed, 23 Feb 2022 06:22:09 -0800 Subject: [PATCH 8/8] Switch to opencv-python --- requirements_3.10.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_3.10.txt b/requirements_3.10.txt index b5e7dd8..bea7808 100644 --- a/requirements_3.10.txt +++ b/requirements_3.10.txt @@ -1,6 +1,6 @@ numpy==1.22.2 numexpr==2.8.1 -opencv-contrib-python-headless==4.5.4.58 +opencv-python==4.5.5.62 scipy==1.8.0 tensorflow==2.8.0 colorama==0.4.4 -- 2.52.0