From cfff94115e64e816fdb7067e0bb639c9eea9d703 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Wed, 11 Dec 2024 14:31:44 +0100 Subject: [PATCH 01/23] Try updating upstream to 1.0 --- flame-blis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flame-blis b/flame-blis index 8137f660..49af2243 160000 --- a/flame-blis +++ b/flame-blis @@ -1 +1 @@ -Subproject commit 8137f660d8351c3a3c3b38f4606121578e128b70 +Subproject commit 49af2243c2a60ed8fedb44f237f4ec100465cd89 From a92cbe813e0996aa9aaa0f662c021903cb766706 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Wed, 11 Dec 2024 14:45:52 +0100 Subject: [PATCH 02/23] Enable azure-pipelines jsonl job --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c8a7e9ca..7a1d8011 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ trigger: jobs: - job: 'JSONL' # Manually enable for generating JSONL - condition: false + condition: true strategy: matrix: Python38Mac: From 0d306312096fb5c36dc821583b37c0da9e0527b3 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 13:02:19 +0100 Subject: [PATCH 03/23] Update python version in azure pipelines --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7a1d8011..74e03a9e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,12 +10,12 @@ jobs: condition: true strategy: matrix: - Python38Mac: + Python310Mac: imageName: 'macos-latest' - python.version: '3.8' - Python38Windows: + python.version: '3.10' + Python310Windows: imageName: 'windows-latest' - python.version: '3.8' + python.version: '3.10' maxParallel: 4 pool: vmImage: $(imageName) From 53e49122402e3808061b032e44d9307d4501f7a0 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 13:07:51 +0100 Subject: [PATCH 04/23] Add LLM-generated GHA translating from Azure Pipelines --- .github/workflows/generate_jsonl.yml | 96 ++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 .github/workflows/generate_jsonl.yml diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml new file mode 100644 index 00000000..e3253e0f --- /dev/null +++ b/.github/workflows/generate_jsonl.yml @@ -0,0 +1,96 @@ +name: Generate JSONL + +on: + push: + branches: ['*'] + pull_request: + branches: ['*'] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + generate-jsonl: + strategy: + matrix: + os: [macos-latest, windows-latest] + python-version: ['3.10'] + fail-fast: false + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v4 + with: + submodules: 'recursive' + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + architecture: 'x64' + + - name: Install LLVM (Windows) + if: runner.os == 'Windows' + uses: crazy-max/ghaction-chocolatey@v3 + with: + args: install llvm + + - name: Disable automatic CRLF conversion + run: git config --global core.autocrlf false + + - name: Install dependencies + run: | + python -m pip install --upgrade pip wheel setuptools + pip install -r requirements.txt + + - name: Generate JSONL (Windows) + if: runner.os == 'Windows' + shell: cmd + run: | + set PATH=C:\Program Files\LLVM\bin;%PATH% + set AR=llvm-ar + set AS=llvm-as + set CC=clang + set RANLIB=echo + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 + clang --version + bash -lc "./bin/generate-make-jsonl windows generic --export" + bash -lc "./bin/generate-make-jsonl windows x86_64 --export" + + - name: Generate JSONL (macOS) + if: runner.os == 'macOS' + run: | + export PATH="/usr/local/opt/llvm/bin:$PATH" + clang --version + chmod +x bin/generate-make-jsonl + bin/generate-make-jsonl darwin generic --export + bin/generate-make-jsonl darwin x86_64 --export + bin/generate-make-jsonl darwin x86_64_no_zen3 --export + bin/generate-make-jsonl darwin x86_64_no_zen2 --export + bin/generate-make-jsonl darwin x86_64_no_skx --export + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: jsonl-${{ runner.os }} + path: artifacts/ + retention-days: 5 + + # Optional: Automatically commit artifacts + # - name: Download all artifacts + # if: github.ref == 'refs/heads/main' && github.event_name == 'push' + # uses: actions/download-artifact@v4 + # with: + # path: downloaded-artifacts + # + # - name: Commit artifacts + # if: github.ref == 'refs/heads/main' && github.event_name == 'push' + # run: | + # git config --local user.email "github-actions[bot]@users.noreply.github.com" + # git config --local user.name "github-actions[bot]" + # cp -r downloaded-artifacts/* artifacts/ + # git add artifacts/ + # git commit -m "Update JSONL artifacts [skip ci]" || echo "No changes to commit" + # git push From 4fb7b04061c4bb9f75dd04cdf0de580e707b4342 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 13:27:10 +0100 Subject: [PATCH 05/23] Update submodule --- flame-blis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flame-blis b/flame-blis index 49af2243..bcfd034b 160000 --- a/flame-blis +++ b/flame-blis @@ -1 +1 @@ -Subproject commit 49af2243c2a60ed8fedb44f237f4ec100465cd89 +Subproject commit bcfd034ba346d0f68e3856632ac8522e8e725e7d From ac21554c6a8fa9474520f46a43ea64c0ce0bb4cf Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 13:31:06 +0100 Subject: [PATCH 06/23] Try to fix macos build for jsonl --- .github/workflows/generate_jsonl.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index e3253e0f..be647561 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -37,6 +37,14 @@ jobs: with: args: install llvm + + - name: Install dependencies (macOS) + if: runner.os == 'macOS' + run: | + brew install gettext + brew link gettext --force + brew install llvm + - name: Disable automatic CRLF conversion run: git config --global core.autocrlf false @@ -63,6 +71,7 @@ jobs: if: runner.os == 'macOS' run: | export PATH="/usr/local/opt/llvm/bin:$PATH" + export PATH="/usr/local/opt/gettext/bin:$PATH" clang --version chmod +x bin/generate-make-jsonl bin/generate-make-jsonl darwin generic --export From 4bc7f93c5fe46bc9200e8b389f372b01563c138c Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 13:58:01 +0100 Subject: [PATCH 07/23] Try to fix macos generate jsonl --- .github/workflows/generate_jsonl.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index be647561..d55e179d 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -29,7 +29,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - architecture: 'x64' - name: Install LLVM (Windows) if: runner.os == 'Windows' From 0ab66f5767efb6dce3fb9048aa9ee9e89ad83fdd Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 14:08:12 +0100 Subject: [PATCH 08/23] Try with x86 macos --- .github/workflows/generate_jsonl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index d55e179d..b9eca52d 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -14,7 +14,7 @@ jobs: generate-jsonl: strategy: matrix: - os: [macos-latest, windows-latest] + os: [macos-13, windows-latest] python-version: ['3.10'] fail-fast: false From f980eb2a57a2001c34cbf2d7a96247af8083e0e2 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 14:33:51 +0100 Subject: [PATCH 09/23] Upd submodule --- flame-blis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flame-blis b/flame-blis index bcfd034b..1bdac24e 160000 --- a/flame-blis +++ b/flame-blis @@ -1 +1 @@ -Subproject commit bcfd034ba346d0f68e3856632ac8522e8e725e7d +Subproject commit 1bdac24e09f49a287294a4873c264a812d7df94b From be6183a25d9148b700d839956b596f3be695a177 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 15:26:39 +0100 Subject: [PATCH 10/23] Try to fix windows build --- .github/workflows/generate_jsonl.yml | 33 +++++++++++++++++++--------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index b9eca52d..20fbc57d 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -30,11 +30,23 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Setup MSYS2 (Windows) + if: runner.os == 'Windows' + uses: msys2/setup-msys2@v2 + with: + msystem: MINGW64 + update: true + install: >- + mingw-w64-x86_64-gcc + mingw-w64-x86_64-make + make + git + - name: Install LLVM (Windows) if: runner.os == 'Windows' uses: crazy-max/ghaction-chocolatey@v3 with: - args: install llvm + args: install llvm --version=15.0.7 - name: Install dependencies (macOS) @@ -51,21 +63,22 @@ jobs: run: | python -m pip install --upgrade pip wheel setuptools pip install -r requirements.txt - - name: Generate JSONL (Windows) if: runner.os == 'Windows' shell: cmd run: | - set PATH=C:\Program Files\LLVM\bin;%PATH% - set AR=llvm-ar - set AS=llvm-as - set CC=clang - set RANLIB=echo + set "PATH=C:\msys64\mingw64\bin;C:\msys64\bin;%PATH%" + set "PATH=C:\Program Files\LLVM\bin;%PATH%" + set "AR=llvm-ar" + set "AS=llvm-as" + set "CC=clang" + set "RANLIB=echo" + set "LIBPTHREAD=" + set "CFLAGS=-Wno-macro-redefined" call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 clang --version - bash -lc "./bin/generate-make-jsonl windows generic --export" - bash -lc "./bin/generate-make-jsonl windows x86_64 --export" - + bash -lc "./bin/generate-make-jsonl windows generic --export --enable-arg-max-hack" + bash -lc "./bin/generate-make-jsonl windows x86_64 --export --enable-arg-max-hack" - name: Generate JSONL (macOS) if: runner.os == 'macOS' run: | From 53d9865e5647442d83e7990f46c5734f5d293076 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 15:30:51 +0100 Subject: [PATCH 11/23] Fix arg to chocolatey --- .github/workflows/generate_jsonl.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index 20fbc57d..ba20786f 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -46,9 +46,7 @@ jobs: if: runner.os == 'Windows' uses: crazy-max/ghaction-chocolatey@v3 with: - args: install llvm --version=15.0.7 - - + args: install llvm --version=15.0.7 --allow-downgrade - name: Install dependencies (macOS) if: runner.os == 'macOS' run: | From b12df84523ff9c68eb1321ae595bcdeb33590ca6 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 15:52:21 +0100 Subject: [PATCH 12/23] Try to fix windows build --- bin/generate-make-jsonl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/generate-make-jsonl b/bin/generate-make-jsonl index 3260369f..7118daab 100755 --- a/bin/generate-make-jsonl +++ b/bin/generate-make-jsonl @@ -7,17 +7,19 @@ ARCH="$2" EXPORT="$3" JSONL="blis/_src/make/$OS-$ARCH.jsonl" +mkdir -p include + cd flame-blis if [ ! -f $JSONL ]; then echo "Compile" if [[ "$OS" == "windows" ]]; then mingw32-make clean ./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --enable-arg-max-hack $ARCH - mingw32-make -j 4 > make.log + mingw32-make -j 4 V=1 | tee make.log else make clean ./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --export-shared=all $ARCH - make > make.log + make | tee make.log fi echo "Preprocess make log" cat make.log | python ../bin/munge_make_log.py $OS $ARCH > ../$JSONL From 8dbea64b535adf97c4961bf427866b774e9adf7a Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 15:52:37 +0100 Subject: [PATCH 13/23] Try to fix windows build --- .github/workflows/generate_jsonl.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index ba20786f..86dc5159 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -75,8 +75,10 @@ jobs: set "CFLAGS=-Wno-macro-redefined" call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 clang --version - bash -lc "./bin/generate-make-jsonl windows generic --export --enable-arg-max-hack" - bash -lc "./bin/generate-make-jsonl windows x86_64 --export --enable-arg-max-hack" + rm "blis/_src/make/windows-generic.jsonl" + rm "blis/_src/make/windows-x86_64.jsonl" + bash -lc "./bin/generate-make-jsonl windows generic --export" + bash -lc "./bin/generate-make-jsonl windows x86_64 --export" - name: Generate JSONL (macOS) if: runner.os == 'macOS' run: | From 29816a8c70aedd0983d363796c379727b678f4d3 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 16:12:28 +0100 Subject: [PATCH 14/23] Try to debug windows build --- bin/generate-make-jsonl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/generate-make-jsonl b/bin/generate-make-jsonl index 7118daab..6947f66d 100755 --- a/bin/generate-make-jsonl +++ b/bin/generate-make-jsonl @@ -13,10 +13,12 @@ cd flame-blis if [ ! -f $JSONL ]; then echo "Compile" if [[ "$OS" == "windows" ]]; then + echo "Build with mingw32-make" mingw32-make clean ./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --enable-arg-max-hack $ARCH - mingw32-make -j 4 V=1 | tee make.log + mingw32-make | tee make.log else + echo "Build with make" make clean ./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --export-shared=all $ARCH make | tee make.log From a731f18c62e22467f8d8cbc36e357bbd83d1b5f5 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 16:38:54 +0100 Subject: [PATCH 15/23] Try to debug build --- bin/generate-make-jsonl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/generate-make-jsonl b/bin/generate-make-jsonl index 6947f66d..451379dd 100755 --- a/bin/generate-make-jsonl +++ b/bin/generate-make-jsonl @@ -16,11 +16,13 @@ if [ ! -f $JSONL ]; then echo "Build with mingw32-make" mingw32-make clean ./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --enable-arg-max-hack $ARCH + echo "Compiling" mingw32-make | tee make.log else echo "Build with make" make clean ./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --export-shared=all $ARCH + echo "Compiling" make | tee make.log fi echo "Preprocess make log" From 3d16b246eb851b66212b7ed531ed50b4a91bb384 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 16:52:38 +0100 Subject: [PATCH 16/23] Try to fix generate jsonl for windows --- .github/workflows/generate_jsonl.yml | 31 +++++++--------------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index 86dc5159..378e418b 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -30,23 +30,11 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Setup MSYS2 (Windows) - if: runner.os == 'Windows' - uses: msys2/setup-msys2@v2 - with: - msystem: MINGW64 - update: true - install: >- - mingw-w64-x86_64-gcc - mingw-w64-x86_64-make - make - git - - - name: Install LLVM (Windows) - if: runner.os == 'Windows' - uses: crazy-max/ghaction-chocolatey@v3 - with: - args: install llvm --version=15.0.7 --allow-downgrade + - name: Preinstall (Windows) + shell: bash + if: startsWith(matrix.os, 'windows') + run: | + choco install llvm - name: Install dependencies (macOS) if: runner.os == 'macOS' run: | @@ -62,18 +50,13 @@ jobs: python -m pip install --upgrade pip wheel setuptools pip install -r requirements.txt - name: Generate JSONL (Windows) - if: runner.os == 'Windows' - shell: cmd + if: startsWith(matrix.os, 'windows') run: | - set "PATH=C:\msys64\mingw64\bin;C:\msys64\bin;%PATH%" set "PATH=C:\Program Files\LLVM\bin;%PATH%" set "AR=llvm-ar" set "AS=llvm-as" set "CC=clang" - set "RANLIB=echo" - set "LIBPTHREAD=" - set "CFLAGS=-Wno-macro-redefined" - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 + set RANLIB=echo clang --version rm "blis/_src/make/windows-generic.jsonl" rm "blis/_src/make/windows-x86_64.jsonl" From 5ac74214666b47e41cca9fe85d13d6ab47261cf8 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 17:03:23 +0100 Subject: [PATCH 17/23] Try to fix windows jsonl --- .github/workflows/generate_jsonl.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index 378e418b..0e9336b1 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -29,6 +29,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + architecture: x64 - name: Preinstall (Windows) shell: bash @@ -60,8 +61,10 @@ jobs: clang --version rm "blis/_src/make/windows-generic.jsonl" rm "blis/_src/make/windows-x86_64.jsonl" - bash -lc "./bin/generate-make-jsonl windows generic --export" - bash -lc "./bin/generate-make-jsonl windows x86_64 --export" + cd flame-blis + bash -lc "./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --enable-arg-max-hack generic" + echo "Compiling" + bash -lc "mingw32-make" - name: Generate JSONL (macOS) if: runner.os == 'macOS' run: | From d62783297a78c254e86bc0682833b502988b52b2 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 17:22:17 +0100 Subject: [PATCH 18/23] Try to fix windows jsonl --- .github/workflows/generate_jsonl.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index 0e9336b1..464cb63e 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -43,9 +43,6 @@ jobs: brew link gettext --force brew install llvm - - name: Disable automatic CRLF conversion - run: git config --global core.autocrlf false - - name: Install dependencies run: | python -m pip install --upgrade pip wheel setuptools @@ -62,9 +59,9 @@ jobs: rm "blis/_src/make/windows-generic.jsonl" rm "blis/_src/make/windows-x86_64.jsonl" cd flame-blis - bash -lc "./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --enable-arg-max-hack generic" + ./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --enable-arg-max-hack generic echo "Compiling" - bash -lc "mingw32-make" + mingw32-make - name: Generate JSONL (macOS) if: runner.os == 'macOS' run: | From 87cdbad378ae2559e7d6ff6ddd0a5c48c71c24f2 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 17:32:53 +0100 Subject: [PATCH 19/23] Try to fix windows jsonl --- .github/workflows/generate_jsonl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml index 464cb63e..3a5b866a 100644 --- a/.github/workflows/generate_jsonl.yml +++ b/.github/workflows/generate_jsonl.yml @@ -59,7 +59,7 @@ jobs: rm "blis/_src/make/windows-generic.jsonl" rm "blis/_src/make/windows-x86_64.jsonl" cd flame-blis - ./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --enable-arg-max-hack generic + bash -lc "./configure --disable-blas --disable-cblas --disable-shared --disable-threading --int-size=64 --enable-verbose-make --enable-arg-max-hack generic" echo "Compiling" mingw32-make - name: Generate JSONL (macOS) From 96b85f002cbd98d8678af0d1517abecff9fc744a Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 17:38:24 +0100 Subject: [PATCH 20/23] Disable jsonl job again --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 74e03a9e..fbce90a1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ trigger: jobs: - job: 'JSONL' # Manually enable for generating JSONL - condition: true + condition: false strategy: matrix: Python310Mac: From 4fbeeb372af35f6580b4cd46325437d554d08dae Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 12 Dec 2024 18:46:43 +0100 Subject: [PATCH 21/23] Set version to v1.1.0a0 --- blis/about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blis/about.py b/blis/about.py index e874efd4..17e1789d 100644 --- a/blis/about.py +++ b/blis/about.py @@ -5,7 +5,7 @@ # https://github.com/pypa/warehouse/blob/master/warehouse/__about__.py __name__ = "blis" -__version__ = "1.0.2" +__version__ = "1.1.0a0" __summary__ = ( "The Blis BLAS-like linear algebra library, as a self-contained C-extension." ) From e542378e17908c0d4885bc183a3b15c3bb1d0489 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Fri, 13 Dec 2024 12:22:18 +0100 Subject: [PATCH 22/23] Set version to v1.1.0 --- blis/about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blis/about.py b/blis/about.py index 17e1789d..15510bc8 100644 --- a/blis/about.py +++ b/blis/about.py @@ -5,7 +5,7 @@ # https://github.com/pypa/warehouse/blob/master/warehouse/__about__.py __name__ = "blis" -__version__ = "1.1.0a0" +__version__ = "1.1.0" __summary__ = ( "The Blis BLAS-like linear algebra library, as a self-contained C-extension." ) From 0e5ce489f9ad2bce06faac41afc4b954b7bb2234 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Fri, 13 Dec 2024 12:23:52 +0100 Subject: [PATCH 23/23] Disable generate jsonl github action --- .../workflows/{generate_jsonl.yml => generate_jsonl.yml.disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{generate_jsonl.yml => generate_jsonl.yml.disabled} (100%) diff --git a/.github/workflows/generate_jsonl.yml b/.github/workflows/generate_jsonl.yml.disabled similarity index 100% rename from .github/workflows/generate_jsonl.yml rename to .github/workflows/generate_jsonl.yml.disabled