From 550d2ba47018e58fd57f285ae8c4990762d2b05f Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 12:17:50 -0700 Subject: [PATCH 01/57] Appveyor get prebuild url --- appveyor.yml | 43 +++++++++++++++++++++++++++++++++ appveyor/gdrive.py | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 appveyor.yml create mode 100644 appveyor/gdrive.py diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..2076d32 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,43 @@ +environment: + matrix: + # - ARCH: "OpenCLSSE" + # - ARCH: "CUDA9.2SSE" + # - ARCH: "CUDA10.1SSE" + - ARCH: "CUDA10.1AVX" + +version: '{branch}-{build}' + +#os: Visual Studio 2017 + +install: + # Download the latest prebuilt exe + - URL=$(python ./appveyor/gdrive.py $ARCH) + - echo $URL + +build: off + +#test_script: +# # Put your test command here. +# # If you don't need to build C extensions on 64-bit Python 3.3 or 3.4, +# # you can remove "build.cmd" from the front of the command, as it's +# # only needed to support those cases. +# # Note that you must use the environment variable %PYTHON% to refer to +# # the interpreter you're using - Appveyor does not do anything special +# # to put the Python version you want to use on PATH. +# - '%PYTHON%\\python.exe setup.py test' + +#after_test: +# # This step builds your wheels. +# # Again, you only need build.cmd if you're building C extensions for +# # 64-bit Python 3.3/3.4. And you need to use %PYTHON% to get the correct +# # interpreter +# - '%PYTHON%\python.exe setup.py bdist_wheel' + +#artifacts: +# # bdist_wheel puts your built wheel in the dist directory +# - path: dist\* + +#on_success: +# You can use this step to upload your artifacts to a public website. +# See Appveyor's documentation for more details. Or you can simply +# access your wheels from the Appveyor "artifacts" tab for your build. diff --git a/appveyor/gdrive.py b/appveyor/gdrive.py new file mode 100644 index 0000000..409e4cd --- /dev/null +++ b/appveyor/gdrive.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python +import sys +from operator import itemgetter +import requests +import re +import datetime +import os + +FOLDER_ID = os.environ['FOLDER_ID'] +API_KEY = os.environ['API_KEY'] + +p = re.compile(r'DeepFaceLab([\w.]+)_build_(\d\d)_(\d\d)_(\d\d\d\d)\.exe') + + +def get_folder_url(folder_id): + return "https://www.googleapis.com/drive/v3/files?q='" + folder_id + "'+in+parents&key=" + API_KEY + + +def get_builds(): + url = get_folder_url(FOLDER_ID) + r = requests.get(url) + files = r.json()['files'] + builds = [] + for file in files: + if file['mimeType'] == 'application/x-msdownload': + filename = file['name'] + m = p.match(filename) + if m: + file['arch'], month, day, year = m.groups() + file['date'] = datetime.date(int(year), int(month), int(day)) + builds.append(file) + else: + # print('Not parsed: ', filename) + pass + return builds + + +def get_latest_build(arch): + builds = get_builds() + arch_builds = [build for build in builds if build['arch'] == arch] + arch_builds.sort(key=itemgetter('date')) + return arch_builds[-1] + + +def get_download_url(file_id): + return "https://www.googleapis.com/drive/v3/files/" + file_id + "?alt=media&key=" + API_KEY + + +def main(): + arch = sys.argv[1] + print(arch) + latest_build = get_latest_build(arch) + # print(latest_build) + download_url = get_download_url(latest_build['id']) + print(download_url) + + +if __name__ == "__main__": + main() From b7429d48d29bb22b68a460893b6ea72796473e35 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 12:18:42 -0700 Subject: [PATCH 02/57] comment out log line --- appveyor/gdrive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor/gdrive.py b/appveyor/gdrive.py index 409e4cd..af49ee7 100644 --- a/appveyor/gdrive.py +++ b/appveyor/gdrive.py @@ -48,7 +48,7 @@ def get_download_url(file_id): def main(): arch = sys.argv[1] - print(arch) + # print(arch) latest_build = get_latest_build(arch) # print(latest_build) download_url = get_download_url(latest_build['id']) From 6e4126ee02d46d6efbf21c17d555c010760ea50c Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 12:22:13 -0700 Subject: [PATCH 03/57] windows command fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2076d32..2fdf503 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ version: '{branch}-{build}' install: # Download the latest prebuilt exe - - URL=$(python ./appveyor/gdrive.py $ARCH) + - set URL=$(python ./appveyor/gdrive.py $ARCH) - echo $URL build: off From 845705a0ebb94a4c3f96f0d53ccacc3856b39673 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 12:25:11 -0700 Subject: [PATCH 04/57] download --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2fdf503..b9ce693 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,8 @@ version: '{branch}-{build}' install: # Download the latest prebuilt exe - set URL=$(python ./appveyor/gdrive.py $ARCH) - - echo $URL + - cd .. + - wget $URL build: off From 279d57c18f28c087b23b249ca6f73b06bc5e3905 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 12:41:03 -0700 Subject: [PATCH 05/57] download and expand --- appveyor.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b9ce693..1fd3a78 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,9 +11,11 @@ version: '{branch}-{build}' install: # Download the latest prebuilt exe - - set URL=$(python ./appveyor/gdrive.py $ARCH) - - cd .. - - wget $URL + - ps: Set-Variable -Name "URL" -Value $(python ./appveyor/gdrive.py $ARCH) + - ps: Write-Output $URL + - cmd: cd %home% + - ps: wget $URL -OutFile prebuilt.zip + - cmd: 7z e prebuilt.zip -y > nul build: off From ecffcec53c2bd2db3cfd5e9882967cd328543e62 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 12:44:45 -0700 Subject: [PATCH 06/57] install requests --- appveyor.yml | 3 ++- appveyor/requirements.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 appveyor/requirements.txt diff --git a/appveyor.yml b/appveyor.yml index 1fd3a78..0346bc3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,8 @@ version: '{branch}-{build}' install: # Download the latest prebuilt exe - - ps: Set-Variable -Name "URL" -Value $(python ./appveyor/gdrive.py $ARCH) + - ps: pip install -r appveyor/requirements.txt + - ps: Set-Variable -Name "URL" -Value $(python appveyor/gdrive.py $ARCH) - ps: Write-Output $URL - cmd: cd %home% - ps: wget $URL -OutFile prebuilt.zip diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt new file mode 100644 index 0000000..f229360 --- /dev/null +++ b/appveyor/requirements.txt @@ -0,0 +1 @@ +requests From d2247740bd52037fb4f7b25b28058e301f337385 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 12:48:10 -0700 Subject: [PATCH 07/57] try to fix pip error --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0346bc3..a3e350e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ version: '{branch}-{build}' install: # Download the latest prebuilt exe - - ps: pip install -r appveyor/requirements.txt + - ps: python -m pip install -r appveyor/requirements.txt - ps: Set-Variable -Name "URL" -Value $(python appveyor/gdrive.py $ARCH) - ps: Write-Output $URL - cmd: cd %home% From 3409e243bc023d9bceea0ac1bc86dfef9a63d9b6 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 12:51:11 -0700 Subject: [PATCH 08/57] upgrade pip --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a3e350e..af8456e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,10 +11,11 @@ version: '{branch}-{build}' install: # Download the latest prebuilt exe - - ps: python -m pip install -r appveyor/requirements.txt + - ps: pip install --user --upgrade pip + - ps: pip install --user -r appveyor/requirements.txt - ps: Set-Variable -Name "URL" -Value $(python appveyor/gdrive.py $ARCH) - ps: Write-Output $URL - - cmd: cd %home% + - cmd: cd .. - ps: wget $URL -OutFile prebuilt.zip - cmd: 7z e prebuilt.zip -y > nul From 82d4af469973ff1a5edea7a45c1f2ad0e26c8dea Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 12:58:43 -0700 Subject: [PATCH 09/57] change python version to 3.6 --- appveyor.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index af8456e..26704c6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,18 +1,22 @@ environment: + global: + PYTHON: "C:\\Python36-x64" matrix: # - ARCH: "OpenCLSSE" # - ARCH: "CUDA9.2SSE" # - ARCH: "CUDA10.1SSE" - ARCH: "CUDA10.1AVX" + version: '{branch}-{build}' #os: Visual Studio 2017 install: # Download the latest prebuilt exe - - ps: pip install --user --upgrade pip - - ps: pip install --user -r appveyor/requirements.txt + - cmd: SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + - ps: python -m pip install --upgrade pip + - ps: python -m pip install -r appveyor/requirements.txt - ps: Set-Variable -Name "URL" -Value $(python appveyor/gdrive.py $ARCH) - ps: Write-Output $URL - cmd: cd .. From 643a853f622101d4dc5ed4529582bd20df72b36e Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:00:27 -0700 Subject: [PATCH 10/57] backslashes --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 26704c6..6286b6b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: global: - PYTHON: "C:\\Python36-x64" + PYTHON: "C:\Python36-x64" matrix: # - ARCH: "OpenCLSSE" # - ARCH: "CUDA9.2SSE" @@ -14,7 +14,7 @@ version: '{branch}-{build}' install: # Download the latest prebuilt exe - - cmd: SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" - ps: python -m pip install --upgrade pip - ps: python -m pip install -r appveyor/requirements.txt - ps: Set-Variable -Name "URL" -Value $(python appveyor/gdrive.py $ARCH) From 5f380857635087f8c4da77e7d25f7d09be28f905 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:02:50 -0700 Subject: [PATCH 11/57] fix backslashes --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6286b6b..a712de1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: global: - PYTHON: "C:\Python36-x64" + PYTHON: "C:\\Python36-x64" matrix: # - ARCH: "OpenCLSSE" # - ARCH: "CUDA9.2SSE" From 68fcccc830cb9c4914c1e438a16301e3812f95f0 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:14:00 -0700 Subject: [PATCH 12/57] capture script output --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a712de1..b93f9f1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,11 +15,13 @@ version: '{branch}-{build}' install: # Download the latest prebuilt exe - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" + - cmd: python --version - ps: python -m pip install --upgrade pip - ps: python -m pip install -r appveyor/requirements.txt - - ps: Set-Variable -Name "URL" -Value $(python appveyor/gdrive.py $ARCH) - - ps: Write-Output $URL - cmd: cd .. + - cmd: python %home%/appveyor/gdrive.py %ARCH% > Output + - cmd: set /p URL= nul From 1e61e247e5bff362046b147842ef1614922996b0 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:14:36 -0700 Subject: [PATCH 13/57] fix typo --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b93f9f1..297a0e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,13 +15,13 @@ version: '{branch}-{build}' install: # Download the latest prebuilt exe - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" - - cmd: python --version + - ps: python --version - ps: python -m pip install --upgrade pip - ps: python -m pip install -r appveyor/requirements.txt - cmd: cd .. - cmd: python %home%/appveyor/gdrive.py %ARCH% > Output - cmd: set /p URL= nul From b44d6eba9b71e35694372fcd028e5ffcdb1756f6 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:17:51 -0700 Subject: [PATCH 14/57] fix path --- appveyor.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 297a0e5..efae318 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,9 +2,9 @@ environment: global: PYTHON: "C:\\Python36-x64" matrix: - # - ARCH: "OpenCLSSE" - # - ARCH: "CUDA9.2SSE" - # - ARCH: "CUDA10.1SSE" + #- ARCH: "OpenCLSSE" + #- ARCH: "CUDA9.2SSE" + #- ARCH: "CUDA10.1SSE" - ARCH: "CUDA10.1AVX" @@ -16,12 +16,13 @@ install: # Download the latest prebuilt exe - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" - ps: python --version - - ps: python -m pip install --upgrade pip + #- ps: python -m pip install --upgrade pip - ps: python -m pip install -r appveyor/requirements.txt - cmd: cd .. - - cmd: python %home%/appveyor/gdrive.py %ARCH% > Output + - cmd: echo %cd% + - cmd: python %home%\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= nul From a4611abea655aee3150df598d5ed8cac2244bd3b Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:19:29 -0700 Subject: [PATCH 15/57] pip upgrade --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index efae318..88fdb19 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,7 @@ install: # Download the latest prebuilt exe - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" - ps: python --version - #- ps: python -m pip install --upgrade pip + - ps: python -m pip install --upgrade pip - ps: python -m pip install -r appveyor/requirements.txt - cmd: cd .. - cmd: echo %cd% From a3dd21a32e465ea4c0e4eee7c84271d359853bff Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:20:44 -0700 Subject: [PATCH 16/57] fix path 2 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 88fdb19..470c6f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ install: - ps: python -m pip install -r appveyor/requirements.txt - cmd: cd .. - cmd: echo %cd% - - cmd: python %home%\appveyor\gdrive.py %ARCH% > Output + - cmd: python %home%\DeepFaceLab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= Date: Tue, 10 Sep 2019 13:25:08 -0700 Subject: [PATCH 17/57] debugging file location --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 470c6f9..edf717d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,6 +20,10 @@ install: - ps: python -m pip install -r appveyor/requirements.txt - cmd: cd .. - cmd: echo %cd% + - cmd: dir + - cmd: dir %home% + - cmd: dir %home%\DeepFaceLab + - cmd: dir %home%\DeepFaceLab\appveyor - cmd: python %home%\DeepFaceLab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= Date: Tue, 10 Sep 2019 13:27:21 -0700 Subject: [PATCH 18/57] fix dir name in path --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index edf717d..f4985d7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,9 +22,9 @@ install: - cmd: echo %cd% - cmd: dir - cmd: dir %home% - - cmd: dir %home%\DeepFaceLab - - cmd: dir %home%\DeepFaceLab\appveyor - - cmd: python %home%\DeepFaceLab\appveyor\gdrive.py %ARCH% > Output + - cmd: dir %home%\deepfacelab + - cmd: dir %home%\deepfacelab\appveyor + - cmd: python %home%\deepfacelab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= Date: Tue, 10 Sep 2019 13:33:17 -0700 Subject: [PATCH 19/57] fix path? --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f4985d7..fc97dc1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,9 +22,9 @@ install: - cmd: echo %cd% - cmd: dir - cmd: dir %home% - - cmd: dir %home%\deepfacelab - - cmd: dir %home%\deepfacelab\appveyor - - cmd: python %home%\deepfacelab\appveyor\gdrive.py %ARCH% > Output + #- cmd: dir %home%\deepfacelab + #- cmd: dir %home%\deepfacelab\appveyor + - cmd: python deepfacelab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= Date: Tue, 10 Sep 2019 13:37:47 -0700 Subject: [PATCH 20/57] wget --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fc97dc1..5bb5e7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,16 +18,16 @@ install: - ps: python --version - ps: python -m pip install --upgrade pip - ps: python -m pip install -r appveyor/requirements.txt - - cmd: cd .. - - cmd: echo %cd% - - cmd: dir - - cmd: dir %home% + #- cmd: cd .. + #- cmd: echo %cd% + #- cmd: dir + #- cmd: dir %home% #- cmd: dir %home%\deepfacelab #- cmd: dir %home%\deepfacelab\appveyor - cmd: python deepfacelab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= nul build: off From bb62c1cbccb0ed0351639a2681f2a86fd92ad657 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:39:32 -0700 Subject: [PATCH 21/57] fix dir --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5bb5e7d..3d6981f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ install: - ps: python --version - ps: python -m pip install --upgrade pip - ps: python -m pip install -r appveyor/requirements.txt - #- cmd: cd .. + - cmd: cd .. #- cmd: echo %cd% #- cmd: dir #- cmd: dir %home% From fe678badfcc294b4a20955720273a6aefbeb3e88 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:42:49 -0700 Subject: [PATCH 22/57] echo URL --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3d6981f..3da866a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ install: #- cmd: dir %home%\deepfacelab\appveyor - cmd: python deepfacelab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= nul From 8932f1419d803cef9dfc49f861f3fc06df99d3ab Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:46:31 -0700 Subject: [PATCH 23/57] wget --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3da866a..d3b76d0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,8 +26,8 @@ install: #- cmd: dir %home%\deepfacelab\appveyor - cmd: python deepfacelab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= nul build: off From a53ebdcae571ae8c1f34bed79399843f2662df23 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 13:52:38 -0700 Subject: [PATCH 24/57] powershell --- appveyor.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d3b76d0..da91bc7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,8 +26,11 @@ install: #- cmd: dir %home%\deepfacelab\appveyor - cmd: python deepfacelab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= nul build: off From c14a1e1df028997a27746348a8cd9ea37db75382 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 14:28:15 -0700 Subject: [PATCH 25/57] artifact --- appveyor.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index da91bc7..601da70 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,19 +19,14 @@ install: - ps: python -m pip install --upgrade pip - ps: python -m pip install -r appveyor/requirements.txt - cmd: cd .. - #- cmd: echo %cd% - #- cmd: dir - #- cmd: dir %home% - #- cmd: dir %home%\deepfacelab - #- cmd: dir %home%\deepfacelab\appveyor - cmd: python deepfacelab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= nul + - cmd: dir DeepFaceLab* + - cmd: xcopy deepfacelab DeepFaceLab*\_internal\deepfacelab /O /X /E /H /K + - cmd: 7z a DeepFaceLab%ARCH%.zip DeepFaceLab\ build: off @@ -52,9 +47,8 @@ build: off # # interpreter # - '%PYTHON%\python.exe setup.py bdist_wheel' -#artifacts: -# # bdist_wheel puts your built wheel in the dist directory -# - path: dist\* +artifacts: + - path: DeepFaceLab%ARCH%.zip #on_success: # You can use this step to upload your artifacts to a public website. From 834788b587e50b5a3b6084a42049bf25c220a53f Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 14:30:44 -0700 Subject: [PATCH 26/57] artiface --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 601da70..f6568e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,11 +22,11 @@ install: - cmd: python deepfacelab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= nul - - cmd: dir DeepFaceLab* + #- cmd: dir DeepFaceLab* - cmd: xcopy deepfacelab DeepFaceLab*\_internal\deepfacelab /O /X /E /H /K - - cmd: 7z a DeepFaceLab%ARCH%.zip DeepFaceLab\ + - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab\ build: off From 9edfc0bfaf6e22edde5e701cec0663eb963c5501 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 14:36:54 -0700 Subject: [PATCH 27/57] xcopy --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f6568e8..9a902f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ install: #- cmd: 7z l prebuilt.zip - cmd: 7z e prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - - cmd: xcopy deepfacelab DeepFaceLab*\_internal\deepfacelab /O /X /E /H /K + - cmd: xcopy deepfacelab DeepFaceLab*\_internal\* /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab\ build: off From 2d00a4ec916c965fad55ff769793cc74f88733eb Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 14:40:20 -0700 Subject: [PATCH 28/57] overwrite all --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9a902f8..13203e3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ install: #- cmd: 7z l prebuilt.zip - cmd: 7z e prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - - cmd: xcopy deepfacelab DeepFaceLab*\_internal\* /O /X /E /H /K + - cmd: xcopy "deepfacelab\*" "DeepFaceLab*\_internal\" /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab\ build: off From 455179fef1ecaa19eff5bf6cb33397316ce41b35 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 14:45:14 -0700 Subject: [PATCH 29/57] xcopy 2 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 13203e3..094bd6f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ install: #- cmd: 7z l prebuilt.zip - cmd: 7z e prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - - cmd: xcopy "deepfacelab\*" "DeepFaceLab*\_internal\" /Y /O /X /E /H /K + - cmd: xcopy deepfacelab\* DeepFaceLab*\_internal\deepfacelab /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab\ build: off From d5a970ddc357493f09048d15c66c1fd0b5b58f21 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 14:46:35 -0700 Subject: [PATCH 30/57] fix 7z archive command --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 094bd6f..bc63d46 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ install: - cmd: 7z e prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - cmd: xcopy deepfacelab\* DeepFaceLab*\_internal\deepfacelab /Y /O /X /E /H /K - - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab\ + - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ build: off From 2bc8955e68daaac430268aec91c647719abb9879 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 14:50:04 -0700 Subject: [PATCH 31/57] it's a directory --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index bc63d46..f0669fd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ install: #- cmd: 7z l prebuilt.zip - cmd: 7z e prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - - cmd: xcopy deepfacelab\* DeepFaceLab*\_internal\deepfacelab /Y /O /X /E /H /K + - cmd: xcopy deepfacelab\* DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ build: off From eca0e0b19b8194595b416be75853079ef572230d Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 15:03:39 -0700 Subject: [PATCH 32/57] xcopy 3 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f0669fd..d6287c8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ install: #- cmd: 7z l prebuilt.zip - cmd: 7z e prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - - cmd: xcopy deepfacelab\* DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K + - cmd: xcopy deepfacelab DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ build: off From a42d70913bee3103b5cc4430be7583ef545532fd Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 15:09:17 -0700 Subject: [PATCH 33/57] xcopy 4 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d6287c8..47fe9f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ install: #- cmd: 7z l prebuilt.zip - cmd: 7z e prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - - cmd: xcopy deepfacelab DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K + - cmd: xcopy .\deepfacelab .\DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ build: off From 44a3ac717216447e8fa14450dfc4eb8746df5d24 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 15:11:39 -0700 Subject: [PATCH 34/57] xcopy 5 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 47fe9f0..81205b4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ install: #- cmd: 7z l prebuilt.zip - cmd: 7z e prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - - cmd: xcopy .\deepfacelab .\DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K + - cmd: xcopy \deepfacelab \DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ build: off From 9ccb53d0a461b3d580addcc67af3c7a51cd98d84 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 15:26:01 -0700 Subject: [PATCH 35/57] dir --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 81205b4..ecadd32 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,6 +25,7 @@ install: #- cmd: 7z l prebuilt.zip - cmd: 7z e prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* + - cmd: dir - cmd: xcopy \deepfacelab \DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ From 6fe852430dceaacf04e59b09d8c378fff21b1909 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 15:35:00 -0700 Subject: [PATCH 36/57] 7z extract --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ecadd32..4ec7371 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,7 @@ install: - cmd: set /p URL= nul + - cmd: 7z x prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - cmd: dir - cmd: xcopy \deepfacelab \DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K From 2052308bb4703cbc74009ddd35259b80a209a767 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 15:43:42 -0700 Subject: [PATCH 37/57] fix path --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4ec7371..0b4e3a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,9 @@ install: - cmd: 7z x prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - cmd: dir - - cmd: xcopy \deepfacelab \DeepFaceLab*\_internal\deepfacelab\ /Y /O /X /E /H /K + - cmd: dir \deepfacelab + - cmd: dir \DeepFaceLab*\_internal\DeepFaceLab + - cmd: xcopy \deepfacelab \DeepFaceLab*\_internal\DeepFaceLab\ /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ build: off From b8f53cba02bd61d7608883102dd125f63acb9e27 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 15:47:08 -0700 Subject: [PATCH 38/57] path --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0b4e3a0..9c4fa76 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,9 +26,9 @@ install: - cmd: 7z x prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - cmd: dir - - cmd: dir \deepfacelab - - cmd: dir \DeepFaceLab*\_internal\DeepFaceLab - - cmd: xcopy \deepfacelab \DeepFaceLab*\_internal\DeepFaceLab\ /Y /O /X /E /H /K + - cmd: dir %home%\deepfacelab + - cmd: dir %home%\DeepFaceLab*\_internal\DeepFaceLab + - cmd: xcopy %home%\deepfacelab %home%\DeepFaceLab*\_internal\DeepFaceLab\ /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ build: off From f05ada5690a6dfcdcefef987b5cdd5aba3f5c495 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 15:55:34 -0700 Subject: [PATCH 39/57] paths 2 --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9c4fa76..bbd97e2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,9 +26,9 @@ install: - cmd: 7z x prebuilt.zip -y > nul #- cmd: dir DeepFaceLab* - cmd: dir - - cmd: dir %home%\deepfacelab - - cmd: dir %home%\DeepFaceLab*\_internal\DeepFaceLab - - cmd: xcopy %home%\deepfacelab %home%\DeepFaceLab*\_internal\DeepFaceLab\ /Y /O /X /E /H /K + - cmd: dir .\deepfacelab + - cmd: dir .\DeepFaceLab*\_internal\DeepFaceLab + - cmd: xcopy .\deepfacelab .\DeepFaceLab*\_internal\DeepFaceLab\ /Y /O /X /E /H /K - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ build: off From 4efec4bd98eea6c69805932ac93186378e437097 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 16:08:34 -0700 Subject: [PATCH 40/57] paths paths paths --- appveyor.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bbd97e2..9990f1a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,9 +27,12 @@ install: #- cmd: dir DeepFaceLab* - cmd: dir - cmd: dir .\deepfacelab - - cmd: dir .\DeepFaceLab*\_internal\DeepFaceLab - - cmd: xcopy .\deepfacelab .\DeepFaceLab*\_internal\DeepFaceLab\ /Y /O /X /E /H /K - - cmd: 7z a DeepFaceLab%ARCH%.7z -r DeepFaceLab*\ + - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab + - cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K + - cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) + - cmd: set /p ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% + - cmd: echo %ARCHIVE_NAME% + - cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab*\ build: off From 7d4cd84049cd6f15802b40392cb56782cca7c0aa Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 16:17:08 -0700 Subject: [PATCH 41/57] remove original directory (otherwise may cause issues) --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 9990f1a..2d43938 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,6 +28,7 @@ install: - cmd: dir - cmd: dir .\deepfacelab - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab + - cmd: rmdir /q/ s .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K - cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) - cmd: set /p ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% From 24de26c0ced5568dea5b754d5074248247fe9711 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 16:38:11 -0700 Subject: [PATCH 42/57] archive 2 --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2d43938..044d0f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,8 @@ install: - cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) - cmd: set /p ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% - cmd: echo %ARCHIVE_NAME% - - cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab*\ + - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab + - cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab%ARCH% build: off From a55b3ec3a0baccbd56c852f1f470138a3d070d9e Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 16:42:52 -0700 Subject: [PATCH 43/57] check paths --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 044d0f9..d149ad9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,9 +22,7 @@ install: - cmd: python deepfacelab\appveyor\gdrive.py %ARCH% > Output - cmd: set /p URL= nul - #- cmd: dir DeepFaceLab* - cmd: dir - cmd: dir .\deepfacelab - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab @@ -33,8 +31,9 @@ install: - cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) - cmd: set /p ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% - cmd: echo %ARCHIVE_NAME% + - cmd: dir .\DeepFaceLab%ARCH%\_internal - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - - cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab%ARCH% + #- cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab%ARCH% build: off From 808ff65a9d9f2c361e2c46755537f78bcb290b82 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 16:51:39 -0700 Subject: [PATCH 44/57] debug --- appveyor.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d149ad9..378ad60 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,8 +13,10 @@ version: '{branch}-{build}' #os: Visual Studio 2017 install: - # Download the latest prebuilt exe - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" + - cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) + - cmd: set /p ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% + - cmd: echo %ARCHIVE_NAME% - ps: python --version - ps: python -m pip install --upgrade pip - ps: python -m pip install -r appveyor/requirements.txt @@ -23,16 +25,13 @@ install: - cmd: set /p URL= nul - - cmd: dir - - cmd: dir .\deepfacelab - - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - - cmd: rmdir /q/ s .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - - cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K - - cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) - - cmd: set /p ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% - - cmd: echo %ARCHIVE_NAME% - - cmd: dir .\DeepFaceLab%ARCH%\_internal - - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab + #- cmd: dir + #- cmd: dir .\deepfacelab + #- cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab + #- cmd: rmdir /q/ s .\DeepFaceLab%ARCH%\_internal\DeepFaceLab + #- cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K + #- cmd: dir .\DeepFaceLab%ARCH%\_internal + #- cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab #- cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab%ARCH% build: off From ef7fd0395486d6d56d9b55b045d8e97a7c80cd4a Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 17:15:35 -0700 Subject: [PATCH 45/57] comment out date line --- appveyor.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 378ad60..c83b7ae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,8 @@ version: '{branch}-{build}' install: - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" - - cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) + #- cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) + - cmd: set /p mydate=2019-09-11 - cmd: set /p ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% - cmd: echo %ARCHIVE_NAME% - ps: python --version @@ -25,14 +26,14 @@ install: - cmd: set /p URL= nul - #- cmd: dir - #- cmd: dir .\deepfacelab - #- cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - #- cmd: rmdir /q/ s .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - #- cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K - #- cmd: dir .\DeepFaceLab%ARCH%\_internal - #- cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - #- cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab%ARCH% + - cmd: dir + - cmd: dir .\deepfacelab + - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab + - cmd: rmdir /q/ s .\DeepFaceLab%ARCH%\_internal\DeepFaceLab + - cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K + - cmd: dir .\DeepFaceLab%ARCH%\_internal + - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab + - cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab%ARCH% build: off From 90b52171ea00a3e1f73148d87330c54d42dc4b58 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 17:19:00 -0700 Subject: [PATCH 46/57] rm /p --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c83b7ae..f12034a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,8 @@ version: '{branch}-{build}' install: - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" #- cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) - - cmd: set /p mydate=2019-09-11 - - cmd: set /p ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% + - cmd: set mydate=2019-09-11 + - cmd: set ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% - cmd: echo %ARCHIVE_NAME% - ps: python --version - ps: python -m pip install --upgrade pip From 3d74a8219bf5acc57524329f2392c746b78e39d6 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 17:24:07 -0700 Subject: [PATCH 47/57] fix path --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f12034a..6032ade 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ install: - cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K - cmd: dir .\DeepFaceLab%ARCH%\_internal - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - - cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab%ARCH% + - cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab%ARCH%\ build: off From 04145250111739569945e8501a8b4ac1c015c715 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 17:26:52 -0700 Subject: [PATCH 48/57] rm branch name --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6032ade..05a8bcb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,7 @@ install: - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" #- cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) - cmd: set mydate=2019-09-11 - - cmd: set ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER% + - cmd: set ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_BUILD_NUMBER% - cmd: echo %ARCHIVE_NAME% - ps: python --version - ps: python -m pip install --upgrade pip From 1c4676e8191c9289b2b770325aec31ce43299a69 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 17:41:34 -0700 Subject: [PATCH 49/57] speed up compression --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 05a8bcb..0c5bdbb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ install: - cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K - cmd: dir .\DeepFaceLab%ARCH%\_internal - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - - cmd: 7z a %ARCHIVE_NAME%.7z -r DeepFaceLab%ARCH%\ + - cmd: 7z a %ARCHIVE_NAME%.7z -tzip -mx=1 -r DeepFaceLab%ARCH%\ build: off From 9683f80a7cc7ea42a4e7b699c90b502d9f94bb6c Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 17:48:35 -0700 Subject: [PATCH 50/57] fix artifact --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0c5bdbb..3bfb5ba 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,7 +55,7 @@ build: off # - '%PYTHON%\python.exe setup.py bdist_wheel' artifacts: - - path: DeepFaceLab%ARCH%.zip + - path: %ARCHIVE_NAME%.7z #on_success: # You can use this step to upload your artifacts to a public website. From d5e0fdd2cd85b6681e438c179169b50393cbc66a Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 17:51:33 -0700 Subject: [PATCH 51/57] add date back in --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3bfb5ba..b08e932 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,8 +14,8 @@ version: '{branch}-{build}' install: - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" - #- cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) - - cmd: set mydate=2019-09-11 + - cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) + #- cmd: set mydate=2019-09-11 - cmd: set ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_BUILD_NUMBER% - cmd: echo %ARCHIVE_NAME% - ps: python --version From d69b823c3386f2c502ce68f547ab0c281c1aac1a Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 17:58:32 -0700 Subject: [PATCH 52/57] zip --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b08e932..f0d11bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ install: - cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K - cmd: dir .\DeepFaceLab%ARCH%\_internal - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - - cmd: 7z a %ARCHIVE_NAME%.7z -tzip -mx=1 -r DeepFaceLab%ARCH%\ + - cmd: 7z a %ARCHIVE_NAME%.zip -tzip -mx=1 -r DeepFaceLab%ARCH%\ build: off @@ -55,7 +55,7 @@ build: off # - '%PYTHON%\python.exe setup.py bdist_wheel' artifacts: - - path: %ARCHIVE_NAME%.7z + - path: %ARCHIVE_NAME%.zip #on_success: # You can use this step to upload your artifacts to a public website. From d76a25c3ce6798acd89ac9ef89ada2bd82317a71 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 18:00:54 -0700 Subject: [PATCH 53/57] fix artifact --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f0d11bb..bf1eeb2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ install: - cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K - cmd: dir .\DeepFaceLab%ARCH%\_internal - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - - cmd: 7z a %ARCHIVE_NAME%.zip -tzip -mx=1 -r DeepFaceLab%ARCH%\ + - cmd: 7z a %ARCHIVE_NAME%.7z -tzip -mx=1 -r DeepFaceLab%ARCH%\ build: off @@ -55,7 +55,7 @@ build: off # - '%PYTHON%\python.exe setup.py bdist_wheel' artifacts: - - path: %ARCHIVE_NAME%.zip + - path: "%ARCHIVE_NAME%.7z" #on_success: # You can use this step to upload your artifacts to a public website. From af602fe82b312d6ebe280bb88478872f51b20892 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 18:09:53 -0700 Subject: [PATCH 54/57] looking for artifact --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index bf1eeb2..ede1f7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,6 +34,7 @@ install: - cmd: dir .\DeepFaceLab%ARCH%\_internal - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - cmd: 7z a %ARCHIVE_NAME%.7z -tzip -mx=1 -r DeepFaceLab%ARCH%\ + - cmd: dir build: off @@ -55,7 +56,7 @@ build: off # - '%PYTHON%\python.exe setup.py bdist_wheel' artifacts: - - path: "%ARCHIVE_NAME%.7z" + - path: "..\%ARCHIVE_NAME%.7z" #on_success: # You can use this step to upload your artifacts to a public website. From cbf9c52c730378390ee698d835bfc22de6c9ad48 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 18:17:58 -0700 Subject: [PATCH 55/57] artifacts --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ede1f7d..01be5a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -56,7 +56,7 @@ build: off # - '%PYTHON%\python.exe setup.py bdist_wheel' artifacts: - - path: "..\%ARCHIVE_NAME%.7z" + - path: ..\%ARCHIVE_NAME%.7z #on_success: # You can use this step to upload your artifacts to a public website. From b83cea0df167b7514b8071eacb2180fce279ea33 Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 18:22:40 -0700 Subject: [PATCH 56/57] build artifact in project directory --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 01be5a0..f9d3d02 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ install: - cmd: xcopy .\deepfacelab .\DeepFaceLab%ARCH%\_internal\DeepFaceLab\ /Y /O /X /E /H /K - cmd: dir .\DeepFaceLab%ARCH%\_internal - cmd: dir .\DeepFaceLab%ARCH%\_internal\DeepFaceLab - - cmd: 7z a %ARCHIVE_NAME%.7z -tzip -mx=1 -r DeepFaceLab%ARCH%\ + - cmd: 7z a .\deepfacelab\%ARCHIVE_NAME%.7z -tzip -mx=1 -r DeepFaceLab%ARCH%\ - cmd: dir build: off @@ -56,7 +56,7 @@ build: off # - '%PYTHON%\python.exe setup.py bdist_wheel' artifacts: - - path: ..\%ARCHIVE_NAME%.7z + - path: .\%ARCHIVE_NAME%.7z #on_success: # You can use this step to upload your artifacts to a public website. From f551971d7f9c0760cedfd00f06216df867fd2dfe Mon Sep 17 00:00:00 2001 From: jh Date: Tue, 10 Sep 2019 18:37:50 -0700 Subject: [PATCH 57/57] Enable for all architectures --- appveyor.yml | 51 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f9d3d02..2307c94 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,21 +2,28 @@ environment: global: PYTHON: "C:\\Python36-x64" matrix: - #- ARCH: "OpenCLSSE" - #- ARCH: "CUDA9.2SSE" - #- ARCH: "CUDA10.1SSE" + - ARCH: "OpenCLSSE" + - ARCH: "CUDA9.2SSE" + - ARCH: "CUDA10.1SSE" - ARCH: "CUDA10.1AVX" version: '{branch}-{build}' -#os: Visual Studio 2017 +#os: Visual Studio 2015 + +## build cache to preserve files/folders between builds +#cache: +# - packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified +# - projectA\libs +# - node_modules # local npm modules +# - '%LocalAppData%\NuGet\Cache' # NuGet < v3 +# - '%LocalAppData%\NuGet\v3-cache' # NuGet v3 install: - cmd: SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%" - cmd: For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) - #- cmd: set mydate=2019-09-11 - - cmd: set ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-%APPVEYOR_BUILD_NUMBER% + - cmd: set ARCHIVE_NAME=DeepFaceLab-%ARCH%-%mydate%-BUILD-%APPVEYOR_BUILD_NUMBER% - cmd: echo %ARCHIVE_NAME% - ps: python --version - ps: python -m pip install --upgrade pip @@ -36,24 +43,14 @@ install: - cmd: 7z a .\deepfacelab\%ARCHIVE_NAME%.7z -tzip -mx=1 -r DeepFaceLab%ARCH%\ - cmd: dir -build: off +build: false #test_script: # # Put your test command here. -# # If you don't need to build C extensions on 64-bit Python 3.3 or 3.4, -# # you can remove "build.cmd" from the front of the command, as it's -# # only needed to support those cases. -# # Note that you must use the environment variable %PYTHON% to refer to -# # the interpreter you're using - Appveyor does not do anything special -# # to put the Python version you want to use on PATH. -# - '%PYTHON%\\python.exe setup.py test' +# - test #after_test: -# # This step builds your wheels. -# # Again, you only need build.cmd if you're building C extensions for -# # 64-bit Python 3.3/3.4. And you need to use %PYTHON% to get the correct -# # interpreter -# - '%PYTHON%\python.exe setup.py bdist_wheel' +# after test artifacts: - path: .\%ARCHIVE_NAME%.7z @@ -62,3 +59,19 @@ artifacts: # You can use this step to upload your artifacts to a public website. # See Appveyor's documentation for more details. Or you can simply # access your wheels from the Appveyor "artifacts" tab for your build. + +#---------------------------------# +# deployment configuration # +#---------------------------------# + +# providers: Local, FTP, WebDeploy, AzureCS, AzureBlob, S3, NuGet, Environment +# provider names are case-sensitive! +#deploy: +# # Deploy to GitHub Releases +# - provider: GitHub +# artifact: /.*\.nupkg/ # upload all NuGet packages to release assets +# draft: false +# prerelease: false +# on: +# branch: master # release from master branch only +# APPVEYOR_REPO_TAG: true # deploy on tag push only