Skip to content

Commit f0086f5

Browse files
KenoKeno
authored
Merge pull request #34225 from JuliaLang/kf/win32hang
Fix CI hangs on win32
2 parents eb5410a + 5c96e67 commit f0086f5

File tree

159 files changed

+113
-81
lines changed
  • deps
    • Versions.make
    • blas.mk
    • checksums
      • OpenBLAS.v0.3.5-0.aarch64-linux-gnu-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.aarch64-linux-gnu-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.aarch64-linux-gnu-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.aarch64-linux-musl-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.aarch64-linux-musl-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.aarch64-linux-musl-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.arm-linux-gnueabihf-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.arm-linux-gnueabihf-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.arm-linux-gnueabihf-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.arm-linux-musleabihf-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.arm-linux-musleabihf-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.arm-linux-musleabihf-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.i686-linux-gnu-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.i686-linux-gnu-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.i686-linux-gnu-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.i686-linux-musl-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.i686-linux-musl-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.i686-linux-musl-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.i686-w64-mingw32-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.i686-w64-mingw32-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.i686-w64-mingw32-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.powerpc64le-linux-gnu-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.powerpc64le-linux-gnu-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.powerpc64le-linux-gnu-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-apple-darwin14-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-apple-darwin14-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-apple-darwin14-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-linux-gnu-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-linux-gnu-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-linux-gnu-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-linux-musl-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-linux-musl-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-linux-musl-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-unknown-freebsd11.1-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-unknown-freebsd11.1-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-unknown-freebsd11.1-gcc8.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-w64-mingw32-gcc4.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-w64-mingw32-gcc7.tar.gz
      • OpenBLAS.v0.3.5-0.x86_64-w64-mingw32-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.aarch64-linux-gnu-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.aarch64-linux-gnu-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.aarch64-linux-gnu-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.aarch64-linux-musl-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.aarch64-linux-musl-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.aarch64-linux-musl-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.arm-linux-gnueabihf-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.arm-linux-gnueabihf-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.arm-linux-gnueabihf-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.arm-linux-musleabihf-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.arm-linux-musleabihf-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.arm-linux-musleabihf-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.i686-linux-gnu-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.i686-linux-gnu-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.i686-linux-gnu-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.i686-linux-musl-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.i686-linux-musl-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.i686-linux-musl-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.i686-w64-mingw32-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.i686-w64-mingw32-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.i686-w64-mingw32-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.powerpc64le-linux-gnu-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.powerpc64le-linux-gnu-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.powerpc64le-linux-gnu-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-apple-darwin14-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-apple-darwin14-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-apple-darwin14-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-linux-gnu-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-linux-gnu-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-linux-gnu-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-linux-musl-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-linux-musl-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-linux-musl-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-unknown-freebsd11.1-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-unknown-freebsd11.1-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-unknown-freebsd11.1-gcc8.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-w64-mingw32-gcc4.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-w64-mingw32-gcc7.tar.gz
      • OpenBLAS.v0.3.5-2.x86_64-w64-mingw32-gcc8.tar.gz
    • patches

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+113
-81
lines changed

‎deps/Versions.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PCRE_BB_REL = 0
55
DSFMT_VER = 2.2.3
66
DSFMT_BB_REL = 0
77
OPENBLAS_VER = 0.3.5
8-
OPENBLAS_BB_REL = 2
8+
OPENBLAS_BB_REL = 0
99
LAPACK_VER = 3.5.0
1010
SUITESPARSE_VER = 5.4.0
1111
SUITESPARSE_BB_REL = 2

‎deps/blas.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,12 @@ $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-skylakexdgemm.patch-applied: $(BUILDDIR
9999
patch -p1 -f < $(SRCDIR)/patches/openblas-skylakexdgemm.patch
100100
echo 1 > $@
101101

102-
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-skylakexdgemm.patch-applied
102+
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-winexit.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/source-extracted
103+
cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && \
104+
patch -p1 -f < $(SRCDIR)/patches/openblas-winexit.patch
105+
echo 1 > $@
106+
107+
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-skylakexdgemm.patch-applied $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-winexit.patch-applied
103108
echo 1 > $@
104109

105110
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured
@@ -204,7 +209,7 @@ check-lapack: $(BUILDDIR)/lapack-$(LAPACK_VER)/build-checked
204209
else # USE_BINARYBUILDER_OPENBLAS
205210

206211

207-
OPENBLAS_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/OpenBLAS-v$(OPENBLAS_VER)-$(OPENBLAS_BB_REL)
212+
OPENBLAS_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/OpenBLAS_jll.jl/releases/download/OpenBLAS-v$(OPENBLAS_VER)+$(OPENBLAS_BB_REL)
208213
OPENBLAS_BB_NAME := OpenBLAS.v$(OPENBLAS_VER)
209214

210215
$(eval $(call bb-install,openblas,OPENBLAS,true))

‎deps/checksums/OpenBLAS.v0.3.5-0.aarch64-linux-gnu-gcc4.tar.gz/md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9bbf83fce2f15f717101ec7d0df2fa4f

‎deps/checksums/OpenBLAS.v0.3.5-0.aarch64-linux-gnu-gcc4.tar.gz/sha512

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
667f9036b2ae1e16feb2c59192561017d14b843f1f967e9a150f2b3190f3d14624a4bcab322fc4ebc9ba0281d721c1ecd326fc1cf663ed3b59f57a82ea6834fd

‎deps/checksums/OpenBLAS.v0.3.5-0.aarch64-linux-gnu-gcc7.tar.gz/md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1f4a939afe0bcb144e588b62be0b3d37

‎deps/checksums/OpenBLAS.v0.3.5-0.aarch64-linux-gnu-gcc7.tar.gz/sha512

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d203ee0b090d88fb9cf0c7639c638c6d57794c51c40489fd27c7d8bebdf5313882ba0c38860c2dd8c9ae3f8aad0731618e5fa03981db74ef2500a6b9140c6680

‎deps/checksums/OpenBLAS.v0.3.5-0.aarch64-linux-gnu-gcc8.tar.gz/md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2583fe7faf43fe4b24dfd8e3552bb565

‎deps/checksums/OpenBLAS.v0.3.5-0.aarch64-linux-gnu-gcc8.tar.gz/sha512

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
008ca412e9a01cb654d363be902b5b608b23831daa93190a3a1193176d620bd0b148fcd0dfcbc1ebe33fb966f4924372dc198f69d3ac5ec255ec56b2d3c92bb8

‎deps/checksums/OpenBLAS.v0.3.5-0.aarch64-linux-musl-gcc4.tar.gz/md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
996600c776b5beb7a3546dfd2d827891

‎deps/checksums/OpenBLAS.v0.3.5-0.aarch64-linux-musl-gcc4.tar.gz/sha512

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4f1356ba08aaeafe454c8c8d53bd4706bc32cd424c047b51d46a1b2b4a645a98b8f20adee7e30a255182bdc36e0b26b30a02fd9308aae18e0c08b34c419fdc53

0 commit comments

Comments
 (0)