diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml index 8fab07bd268..e93b3e2d4ad 100644 --- a/.github/actions/deploy-windows/action.yml +++ b/.github/actions/deploy-windows/action.yml @@ -12,7 +12,7 @@ runs: echo Installing MSYS2 C:\msys64\usr\bin\bash -lc "pacman -S --needed --noconfirm pkg-config" C:\msys64\usr\bin\bash -lc "pacman -S --needed --noconfirm base-devel git tar unzip p7zip zip autoconf autoconf-archive automake libtool make patch gnupg" - C:\msys64\usr\bin\bash -lc "pacman -S --needed --noconfirm mingw-w64-x86_64-nasm mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-gcc mingw-w64-i686-gcc mingw-w64-x86_64-gcc-fortran mingw-w64-i686-gcc-fortran mingw-w64-x86_64-libwinpthread-git mingw-w64-i686-libwinpthread-git mingw-w64-x86_64-SDL2 mingw-w64-i686-SDL2 mingw-w64-x86_64-ragel mingw-w64-x86_64-vulkan-headers mingw-w64-i686-vulkan-headers mingw-w64-x86_64-vulkan-loader mingw-w64-i686-vulkan-loader" + C:\msys64\usr\bin\bash -lc "pacman -S --needed --noconfirm mingw-w64-x86_64-nasm mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-gcc mingw-w64-i686-gcc mingw-w64-x86_64-gcc-fortran mingw-w64-i686-gcc-fortran mingw-w64-x86_64-libwinpthread-git mingw-w64-i686-libwinpthread-git mingw-w64-x86_64-SDL2 mingw-w64-i686-SDL2 mingw-w64-x86_64-ragel mingw-w64-x86_64-vulkan-headers mingw-w64-i686-vulkan-headers mingw-w64-x86_64-vulkan-loader mingw-w64-i686-vulkan-loader libuv" set "PATH=C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\msys64\usr\bin;%PATH%" C:\msys64\usr\bin\bash -lc "pacman -Q" diff --git a/.github/workflows/pytorch.yml b/.github/workflows/pytorch.yml index c0916d62689..6a1afc07abd 100644 --- a/.github/workflows/pytorch.yml +++ b/.github/workflows/pytorch.yml @@ -62,7 +62,7 @@ jobs: key: ${{ github.workflow }}-${{ github.job }}${{ matrix.ext }}@${{ github.run_id }}-${{ github.run_attempt }} restore-keys: ${{ github.workflow }}-${{ github.job }}${{ matrix.ext }}@ path: ~/ccache/? - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions + - uses: HGuillemet/javacpp-presets/.github/actions/deploy-windows@hg_pytorch timeout-minutes: 350 redeploy: needs: [linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64] diff --git a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java index 2159c9ea6f0..e5debaeed52 100644 --- a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java +++ b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java @@ -59,7 +59,7 @@ @Platform( value = {"linux", "macosx", "windows"}, compiler = "cpp17", - define = {"SHARED_PTR_NAMESPACE std", "UNIQUE_PTR_NAMESPACE std", "USE_C10D_GLOO", "_WINSOCKAPI_"}, + define = {"SHARED_PTR_NAMESPACE std", "UNIQUE_PTR_NAMESPACE std", "USE_C10D_GLOO"}, include = { "torch/torch.h", "torch/script.h",