diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml deleted file mode 100644 index 8d18680..0000000 --- a/.github/workflows/dev-test.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: "Tinkering GitHub" - -on: - workflow_dispatch: - inputs: - cu: - description: 'cuda version' - required: true - type: string - default: "121" - - python_minor: - description: 'python minor version' - required: true - type: string - default: "11" - - python_patch: - description: 'python patch version' - required: true - type: string - default: "8" - -jobs: - package_comfyui: - permissions: - contents: "write" - packages: "write" - pull-requests: "read" - runs-on: windows-latest - steps: - - uses: actions/cache/restore@v4 - id: cache - with: - path: | - cu${{ inputs.cu }}_python_deps.tar - key: ${{ runner.os }}-build-cu${{ inputs.cu }}-${{ inputs.python_minor }} - - shell: bash - run: | - mv cu${{ inputs.cu }}_python_deps.tar ../ - cd .. - tar xf cu${{ inputs.cu }}_python_deps.tar - pwd - ls - git clone --depth=1 https://github.com/comfyanonymous/ComfyUI.git - cp -r ComfyUI ComfyUI_copy - curl https://www.python.org/ftp/python/3.${{ inputs.python_minor }}.${{ inputs.python_patch }}/python-3.${{ inputs.python_minor }}.${{ inputs.python_patch }}-embed-amd64.zip -o python_embeded.zip - unzip python_embeded.zip -d python_embeded - cd python_embeded - echo 'import site' >> ./python3${{ inputs.python_minor }}._pth - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - ./python.exe get-pip.py - rm ../cu${{ inputs.cu }}_python_deps/protobuf-5* - ./python.exe -s -m pip install ../cu${{ inputs.cu }}_python_deps/* diff --git a/.github/workflows/step1-deps.yml b/.github/workflows/step1-deps.yml index 0d53e00..d237b87 100644 --- a/.github/workflows/step1-deps.yml +++ b/.github/workflows/step1-deps.yml @@ -18,5 +18,5 @@ jobs: - uses: actions/cache/save@v4 with: path: | - cu121_python_deps.tar - key: Windows-build-cu121-cp311 + cp311_cu121_deps.tar + key: Windows-build-cp311-cu121 diff --git a/step1.sh b/step1.sh index d390c44..52bb9ab 100644 --- a/step1.sh +++ b/step1.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -eu git clone --depth=1 --no-tags --recurse-submodules --shallow-submodules \ https://github.com/MrForExample/ComfyUI-3D-Pack.git @@ -7,6 +8,7 @@ python -m pip wheel --no-cache-dir \ ./ComfyUI-3D-Pack/_Pre_Builds/_Wheels_win_py311_cu121/*.whl \ -w ./temp_wheel_dir +# Put everything together to resolve compatible versions python -m pip wheel --no-cache-dir \ xformers torchvision torchaudio \ -r requirements.txt \ @@ -16,8 +18,8 @@ python -m pip wheel --no-cache-dir \ --extra-index-url https://pypi.org/simple \ -w ./temp_wheel_dir -mv temp_wheel_dir cu121_python_deps +mv temp_wheel_dir cp311_cu121_deps -tar cf cu121_python_deps.tar cu121_python_deps +tar cf cp311_cu121_deps.tar cp311_cu121_deps -ls -lahF cu121_python_deps +ls -lahF cp311_cu121_deps